添加通过播放器拉流，保存原始数据到Document目录

Change-Id: I16151cc7e22e439f3d56119603c47a7cf2c4ed8a

Author: tonychanchen

Podfile.lock

@@ -113,7 +113,7 @@ PODS:
   - nanopb/decode (1.30906.0)
   - nanopb/encode (1.30906.0)
   - PromisesObjC (1.2.12)
-  - Protobuf (3.17.0)
+  - Protobuf (3.18.0)
   - QCloudCore (5.5.2)
   - QCloudCOSXML/Transfer (5.5.2):
     - QCloudCore (= 5.5.2)
@@ -136,11 +136,11 @@ PODS:
   - TIoTLinkKit_IJKPlayer (1.0.2)
   - TIoTLinkKit_TPNS (1.0.1)
   - TIoTLinkKit_WechatOpenSDK (1.0.1)
-  - TIoTLinkThirdPartyKit/XP2P-iOS (2.2.1)
+  - TIoTLinkKit_XP2P (2.2.0)
   - TIoTLinkVideo (1.0.0):
     - CocoaLumberjack (= 3.7.2)
     - TIoTLinkKit_Faac (= 2.0.5)
-    - TIoTLinkThirdPartyKit/XP2P-iOS (= 2.2.1)
+    - TIoTLinkKit_XP2P (= 2.2.0)
   - TrueTime (5.0.3)
   - TXLiteAVSDK_TRTC (8.0.9644)
   - TZImagePickerController (3.2.1)
@@ -212,7 +212,7 @@ SPEC REPOS:
     - TIoTLinkKit_IJKPlayer
     - TIoTLinkKit_TPNS
     - TIoTLinkKit_WechatOpenSDK
-    - TIoTLinkThirdPartyKit
+    - TIoTLinkKit_XP2P
     - TrueTime
     - TXLiteAVSDK_TRTC
     - TZImagePickerController
@@ -251,7 +251,7 @@ SPEC CHECKSUMS:
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
   nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
   PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
-  Protobuf: 7327d4444215b5f18e560a97f879ff5503c4581c
+  Protobuf: 1a37ebea1338949e9ac35a3f06e80b3f536eec8d
   QCloudCore: b91a762d280f0a80cc6f537fd186ac43a4a3025e
   QCloudCOSXML: a30ab17f45b0cbbcbb218a3677298498e8748a22
   SDWebImage: 624d6e296c69b244bcede364c72ae0430ac14681
@@ -262,8 +262,8 @@ SPEC CHECKSUMS:
   TIoTLinkKit_IJKPlayer: e47c3fed6b204e7544f84a24310cab7a372854d1
   TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968
   TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614
-  TIoTLinkThirdPartyKit: 097ce7631d6bb13bcb90a0319d4ac5ca360ee012
-  TIoTLinkVideo: e17a950ec65815269b5695f239e7f245fb27b375
+  TIoTLinkKit_XP2P: 81481cd6d1b16e156cd3a96300601bde8737a341
+  TIoTLinkVideo: 2e2632095bae0cb7c03d764bddd5d4827906a6f8
   TrueTime: b49551ffafb28a9dee04e51b226f42a416010842
   TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d
   TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d

Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m

@@ -77,6 +77,7 @@ @interface TIoTDemoPreviewDeviceVC ()<UITableViewDelegate,UITableViewDataSource>
 @property (nonatomic, assign) CFTimeInterval startIpcP2P;
 @property (nonatomic, assign) CFTimeInterval endIpcP2P;
 
+@property (nonatomic, assign) BOOL is_ijkPlayer_stream; //通过播放器 还是 通过裸流拉取数据
 @end
 
 @implementation TIoTDemoPreviewDeviceVC
@@ -85,6 +86,7 @@ - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
 
+    _is_ijkPlayer_stream = YES;
     //关闭日志
 //    [TIoTCoreXP2PBridge sharedInstance].logEnable = NO;
 
@@ -1133,17 +1135,12 @@ - (void)stopPlayMovie {
 }
 
 - (void)configVideo {
-    if ([TIoTCoreXP2PBridge sharedInstance].writeFile) {
-        UILabel *fileTip = [[UILabel alloc] initWithFrame:self.imageView.bounds];
-        fileTip.text = @"数据帧写文件中...";
-        fileTip.textAlignment = NSTextAlignmentCenter;
-        fileTip.textColor = [UIColor whiteColor];
-        [self.imageView addSubview:fileTip];
-        if (self.isNVR == NO) {
-            [[TIoTCoreXP2PBridge sharedInstance] startAvRecvService:self.deviceName?:@"" cmd:@"action=live"];
-        }
-        
-    }else {
+
+    // 1.通过播放器发起的拉流
+    if (_is_ijkPlayer_stream) {
+        [TIoTCoreXP2PBridge sharedInstance].writeFile = YES;
+        [TIoTCoreXP2PBridge recordstream:self.deviceName]; //保存到 document 目录 video.data 文件，需打开writeFile开关
+
         [self stopPlayMovie];
 #ifdef DEBUG
         [IJKFFMoviePlayerController setLogReport:YES];
@@ -1169,12 +1166,26 @@ - (void)configVideo {
         [self.imageView addSubview:self.player.view];
         [self.player resetHubFrame:self.player.view.frame];
 
-//        [self.player setOptionIntValue:10 * 1000 forKey:@"analyzeduration" ofCategory:kIJKFFOptionCategoryFormat];
+        //        [self.player setOptionIntValue:10 * 1000 forKey:@"analyzeduration" ofCategory:kIJKFFOptionCategoryFormat];
         [self.player setOptionIntValue:25 * 1024 forKey:@"probesize" ofCategory:kIJKFFOptionCategoryFormat];
         [self.player setOptionIntValue:0 forKey:@"packet-buffering" ofCategory:kIJKFFOptionCategoryPlayer];
         [self.player setOptionIntValue:1 forKey:@"start-on-prepared" ofCategory:kIJKFFOptionCategoryPlayer];
         [self.player setOptionIntValue:1 forKey:@"threads" ofCategory:kIJKFFOptionCategoryCodec];
         [self.player setOptionIntValue:0 forKey:@"sync-av-start" ofCategory:kIJKFFOptionCategoryPlayer];
+        
+    }else {
+        // 2.通过裸流服务拉流
+        [TIoTCoreXP2PBridge sharedInstance].writeFile = YES; //是否保存到 document 目录 video.data 文件
+        
+        UILabel *fileTip = [[UILabel alloc] initWithFrame:self.imageView.bounds];
+        fileTip.text = @"数据帧写文件中...";
+        fileTip.textAlignment = NSTextAlignmentCenter;
+        fileTip.textColor = [UIColor whiteColor];
+        [self.imageView addSubview:fileTip];
+        if (self.isNVR == NO) {
+            [[TIoTCoreXP2PBridge sharedInstance] startAvRecvService:self.deviceName?:@"" cmd:@"action=live"];
+        }
+        
     }
 }
 

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h

@@ -9,35 +9,81 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol TIoTCoreXP2PBridgeDelegate <NSObject>
+
+/*
+ * 裸流接口使用方式:
+ * 通过 startAvRecvService 和 stopAvRecvService 接口，可以启动和停止裸流传输
+ * 客户端拉取到的裸流数据对应 data 参数
+ */
 - (void)getVideoPacket:(uint8_t *)data len:(size_t)len;
 @end
 
 
 @interface TIoTCoreXP2PBridge : NSObject
 @property (nonatomic, weak)id<TIoTCoreXP2PBridgeDelegate> delegate;
-@property (nonatomic, assign)BOOL writeFile; //是否将数据帧写入文档
-@property (nonatomic, assign)BOOL logEnable; //log 开关，默认打开
 
+/*
+ * 开关是否将数据帧写入 Document 目录的 video.data 文件 （后缀可导出后改动）
+ */
+@property (nonatomic, assign)BOOL writeFile;
+
+/*
+ * 是否打印 SDK Log，默认打开
+ */
+@property (nonatomic, assign)BOOL logEnable;
+
+/*
+ * 获取版本号
+ */
 + (NSString *)getSDKVersion;
 + (instancetype)sharedInstance ;
 
-// 调试SDK功能可以使用此接口，OEM请使用下面的start xp2pinfo, 以防止sec_id ,sec_key泄露
+/*
+ * 调试SDK功能可以使用此接口，OEM请使用下面的start xp2pinfo, 以防止sec_id ,sec_key泄露
+ */
 - (void)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_id:(NSString *)pro_id dev_name:(NSString *)dev_name ;
 
-// OEM 版本推荐使用此接口，sec_id, sec_key 传@""即可。 此接口需传从自建服务获取到的 xp2pinfo .
+/*
+ * OEM 版本推荐使用此接口，sec_id, sec_key 传@""即可。 此接口需传从自建服务获取到的 xp2pinfo
+ */
 - (void)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_id:(NSString *)pro_id dev_name:(NSString *)dev_name xp2pinfo:(NSString *)xp2pinfo;
 
-
+/*
+ * 使用播放器播放时，需先等待 SDK 初始化完成，ready事件(xp2preconnect 通知)之后，即可获取到 http-url
+ */
 - (NSString *)getUrlForHttpFlv:(NSString *)dev_name;
+
+/*
+ * 与设备信令交互接口
+ * 1.设备端回复 app 的消息没有限制
+ * 2.app 发送给设备的信令，要求不带&符号，信令长度不超过3000个字节
+ *
+ * 事例 cmd 参数（action=inner_define&cmd=get_nvr_list）
+ */
 - (void)getCommandRequestWithAsync:(NSString *)dev_name cmd:(NSString *)cmd timeout:(uint64_t)timeout completion:(void (^ __nullable)(NSString * jsonList))completion;
 
+/*
+ * 开始停止裸流传输接口，通过代理 getVideoPacket 返回裸流数据
+ */
 - (void)startAvRecvService:(NSString *)dev_name cmd:(NSString *)cmd;
 - (void)stopAvRecvService:(NSString *)dev_name;
 
+/*
+ * 语音对讲开始结束接口
+ */
 - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_number;
 - (void)stopVoiceToServer;
 
+/*
+ * 退出 SDK 服务
+ */
 - (void)stopService:(NSString *)dev_name;
+
+/*
+ * 调试接口，录制通过播放器拉取的数据流并行保存到 Document 目录的 video.data 文件
+ * 需提前打开 writeFile 开关
+ */
++ (void)recordstream:(NSString *)dev_name;
 @end
 
 NS_ASSUME_NONNULL_END

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm

@@ -211,4 +211,8 @@ - (void)capture:(uint8_t *)data len:(size_t)size {
 + (NSString *)getSDKVersion {    
     return [NSString stringWithUTF8String:VIDEOSDKVERSION];
 }
+
++ (void)recordstream:(NSString *)dev_name {
+    startRecordPlayerStream(dev_name.UTF8String);
+}
 @end

TIoTLinkVideo.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.source_files  = 'Source/SDK/LinkVideo/**/*.{h,m,c,mm}'
-  s.dependency 'TIoTLinkThirdPartyKit/XP2P-iOS', '2.2.1'
+  s.dependency 'TIoTLinkKit_XP2P', '2.2.0'
   s.dependency 'TIoTLinkKit_Faac', '2.0.5'
   s.dependency 'CocoaLumberjack', '3.7.2'
   s.pod_target_xcconfig = {