Merge branch 'master' of https://github.com/tencentyun/iot-thirdparty-ios

Author: eagleychen

Source/IJKPlayer-iOS/IJKMediaFramework.framework/IJKMediaFramework

@@ -21,7 +21,7 @@ extern "C" {
 
 #define MAX_SIZE_OF_PARAMS 3000
 
-static const char * VIDEOSDKVERSION = "2.4.x+git.fb841851";
+static const char * VIDEOSDKVERSION = "2.4.x+git.889200c8";
 
 typedef enum
 {
@@ -42,6 +42,7 @@ typedef enum
     XP2PTypeCmdNOReturn      = 1007,  // 设备未返回app自定义信令
     XP2PTypeStreamEnd        = 1008,  // 设备停止推流，或者由于达到设备最大连接数，拒绝推流
     XP2PTypeDownloadEnd      = 1009,  // 设备停止推流，下载结束
+    XP2PTypeStreamRefush     = 1010,  // 设备拒绝推流，请求的devicename不一致
     XP2PTypeSaveFileOn       = 8000,  //获取保存音视频流开关状态
     XP2PTypeSaveFileUrl      = 8001   //获取音视频流保存路径
 } XP2PType;
@@ -78,6 +79,11 @@ typedef enum
     XP2P_ERR_CLIENT_NULL = -1020      //从map中取出的client为空
 } XP2PErrCode;
 
+typedef struct {
+  unsigned char* report_buf;
+  size_t   report_size;
+} data_report_t;
+
 typedef const char *(*msg_handle_t)(const char *id, XP2PType type, const char *msg);
 typedef void (*av_recv_handle_t)(const char *id, uint8_t *recv_buf, size_t recv_len);
 typedef char *(*device_data_recv_handle_t)(const char *id, uint8_t *recv_buf, size_t recv_len);
@@ -294,7 +300,7 @@ IPCLIBRARY_API size_t getStreamBufSize(const char *id);
 IPCLIBRARY_API void setStunServerToXp2p(const char *server, uint16_t port);
 
 IPCLIBRARY_API void setContentDetail(const char *content, const char *detail);
-IPCLIBRARY_API const char* getContentData();
+IPCLIBRARY_API data_report_t getContentData();
 IPCLIBRARY_API const char* getUserID();
 #ifdef __cplusplus
 }