summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlishu <[email protected]>2018-12-11 22:26:23 +0800
committerlishu <[email protected]>2018-12-11 22:26:23 +0800
commitc22fbc45ba1db4f343297e8ae5c0a07be5dd2bf4 (patch)
tree7a1a311960f9c91aaa90ba1d52b59b196a73449b
parentae7b03a22c3e9997d030de91e4e184fed0e16973 (diff)
对摘要的mediatype进行转换
-rw-r--r--src/AV_sendback.h1
-rw-r--r--src/AV_sendback_in.h12
-rw-r--r--src/frag_send.c14
-rw-r--r--src/main.c7
4 files changed, 30 insertions, 4 deletions
diff --git a/src/AV_sendback.h b/src/AV_sendback.h
index e14bb7e..07de83b 100644
--- a/src/AV_sendback.h
+++ b/src/AV_sendback.h
@@ -96,6 +96,7 @@
#define MEDIA_TYPE_AUDIO_G729 0x84
#define MEDIA_TYPE_AUDIO_VIVOX 0x85
+
/*ָ����Ϣ��ѡ������*/
/*ָ����Ϣ��ѡ������-VOIPѡ������*/
#define OPT_SIP_SEND_RATE_INFO 0x71 /*VOIP���������Ϣ*/
diff --git a/src/AV_sendback_in.h b/src/AV_sendback_in.h
index 0ba170c..3d4410d 100644
--- a/src/AV_sendback_in.h
+++ b/src/AV_sendback_in.h
@@ -97,6 +97,18 @@
#define RTSP_RDT_TYPE 0x92
#define RTSP_RTP_TYPE 0x91
+/*ý������:�ļ�ժҪ*/
+#define FILE_CONTENT 0x03
+#define FILE_DOC 0xF0
+#define FILE_DOCX 0xF1
+#define FILE_XLS 0xF2
+#define FILE_XLSX 0xF3
+#define FILE_PPT 0xF4
+#define FILE_PPTX 0xF5
+#define FILE_PDF 0xF6
+#define FILE_EXE 0xF7
+#define FILE_APK 0xF8
+
typedef struct msg_map_s
{
uint8_t nodeA;
diff --git a/src/frag_send.c b/src/frag_send.c
index d94d3a3..f13b68d 100644
--- a/src/frag_send.c
+++ b/src/frag_send.c
@@ -103,9 +103,21 @@ msg_map_t g_av_mediatype_map[AV_MEDAI_TYPE_MAXNUM] =
{MMS_TYPE, MEDIA_TYPE_MMS},
{RTSP_RDT_TYPE, MEDIA_TYPE_RTSP_RDT},
- {RTSP_RTP_TYPE, MEDIA_TYPE_RTSP_RTP}
+ {RTSP_RTP_TYPE, MEDIA_TYPE_RTSP_RTP},
+
+ {FILE_CONTENT, FILE_CONTENT},
+ {FILE_DOC, FILE_DOC},
+ {FILE_DOCX, FILE_DOCX},
+ {FILE_XLS, FILE_XLS},
+ {FILE_XLSX, FILE_XLSX},
+ {FILE_PPT, FILE_PPT},
+ {FILE_PPTX, FILE_PPTX},
+ {FILE_PDF, FILE_PDF},
+ {FILE_EXE, FILE_EXE},
+ {FILE_APK, FILE_APK},
};
+
/*
msg_map_t g_av_mediatype_map[AV_MEDAI_TYPE_MAXNUM] =
{
diff --git a/src/main.c b/src/main.c
index b8bc47d..7276787 100644
--- a/src/main.c
+++ b/src/main.c
@@ -42,8 +42,8 @@ const char* frag_rssb_version = "2018-08-13T09:00:00";
const char* frag_rssb_version_time = "2018-08-13T09:00:00";
const char* frag_rssb_version_des = "MESA@iie rssb_maskey";
-int FRAG_RSSB_VERSION_1_0_20181210 = 0;
-const char* frag_rssb_version_time_in = "2018-12-10";
+int FRAG_RSSB_VERSION_1_0_20181211 = 0;
+const char* frag_rssb_version_time_in = "2018-12-11";
const char* frag_rssb_version_des_in = "unixsocket recv survey";
void frag_rssb_history()
{
@@ -224,7 +224,8 @@ void frag_rssb_history()
//2018.11.05 v4.0//alter voip save_media frg_len>headerlen
//2018.11.07 v4.0//alter json_log opt name for k
//2018.12.07 v4.0//unixsocket set bufsize timeout in configure
- //2018.12.10 v4.0//1.recv_msg_fd not unix 2.MsgPort
+ //2018.12.10 v4.0//1.recv_msg_fd not unix 2.MsgPort
+ //2018.12.11 v4.0//1.file mediatype
}
frag_rssb_parameter_t g_frag_run;