优化protocol选中机制

Change-Id: If4ed82c2d41637549204763920a163b59e981d2b
tencentyun · Dec 15, 2023 · 0006780 · 0006780
1 parent c33b6d4
commit 0006780
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m
@@ -1302,6 +1302,9 @@ - (void)configVideo {
         [TIoTCoreXP2PBridge recordstream:self.deviceName]; //保存到 document 目录 video.data 文件，需打开writeFile开关
 
         [self stopPlayMovie];
+
+        [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker error:nil];
+        [[AVAudioSession sharedInstance] setActive:YES error:nil];
 #ifdef DEBUG
         [IJKFFMoviePlayerController setLogReport:YES];
         [IJKFFMoviePlayerController setLogLevel:k_IJK_LOG_DEBUG];
@@ -1339,6 +1342,8 @@ - (void)configVideo {
         [self.player setOptionIntValue:1 forKey:@"videotoolbox" ofCategory:kIJKFFOptionCategoryPlayer];//iformat_name
 //        [self.player setOptionValue:@"8000" forKey:@"ar" ofCategory:kIJKFFOptionCategoryCodec];
 //        [self.player setOptionValue:@"1" forKey:@"ac" ofCategory:kIJKFFOptionCategoryCodec];
+//        [self.player setOptionIntValue:0 forKey:@"seek-at-start" ofCategory:kIJKFFOptionCategoryPlayer];
+//        [self.player setOptionIntValue:25 * 1024 forKey:@"max-buffer-size" ofCategory:kIJKFFOptionCategoryPlayer];
 
         [self.player setAudioSpeed:1.5f];
         [self.player setMaxPacketNum:2];

diff --git a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h
@@ -77,7 +77,7 @@ extern NSNotificationName const TIoTCoreXP2PBridgeNotificationStreamEnd;
  * sensor_timeout: 探测失败切换tcp的超时时间,最小3s，默认5s
  */
 - (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name;
-- (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name sensor_timeout:(int)sensor_timeout;
+- (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name type:(XP2PProtocolType)type;
 
 /*
  * 此接口慎重：需注意 正式版app发布时候不需要传入secretid和secretkey，避免将这两个参数放置在app中，防止账号泄露，此处仅为演示功能

diff --git a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm
@@ -211,29 +211,39 @@ - (XP2PErrCode)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_i
     return [self startAppWith:sec_id sec_key:sec_key pro_id:pro_id dev_name:dev_name xp2pinfo:@""];
 }
 - (XP2PErrCode)startAppWith:(NSString *)sec_id sec_key:(NSString *)sec_key pro_id:(NSString *)pro_id dev_name:(NSString *)dev_name xp2pinfo:(NSString *)xp2pinfo {
+    NSString *fileName = @"stun.txt";
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString *documentDirectory = paths.firstObject;
+    NSString *saveFilePath = [documentDirectory stringByAppendingPathComponent:fileName];
+    setStunServerToXp2p(saveFilePath.UTF8String, 20002);
     //注册回调
     setUserCallbackToXp2p(XP2PDataMsgHandle, XP2PMsgHandle, XP2PReviceDeviceCustomMsgHandle);
 
     //1.配置IOT_P2P SDK
     self.dev_name = dev_name;
     setQcloudApiCred([sec_id UTF8String], [sec_key UTF8String]); //正式版app发布时候需要去掉，避免泄露secretid和secretkey，此处仅为演示
-    int ret = startService(dev_name.UTF8String, pro_id.UTF8String, dev_name.UTF8String, 5);
+    int ret = startService(dev_name.UTF8String, pro_id.UTF8String, dev_name.UTF8String, XP2P_PROTOCOL_AUTO);
     setDeviceXp2pInfo(dev_name.UTF8String, xp2pinfo.UTF8String);
     return (XP2PErrCode)ret;
 }
 
 
 - (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name {
-    return [self startAppWith:pro_id dev_name:dev_name sensor_timeout:5];
+    return [self startAppWith:pro_id dev_name:dev_name type:XP2P_PROTOCOL_AUTO];
 }
-- (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name sensor_timeout:(int)sensor_timeout{
+- (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name type:(XP2PProtocolType)type{
 //    setStunServerToXp2p("11.11.11.11", 111);
+    NSString *fileName = @"stun.txt";
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString *documentDirectory = paths.firstObject;
+    NSString *saveFilePath = [documentDirectory stringByAppendingPathComponent:fileName];
+    setStunServerToXp2p(saveFilePath.UTF8String, 20002);
     //注册回调
     setUserCallbackToXp2p(XP2PDataMsgHandle, XP2PMsgHandle, XP2PReviceDeviceCustomMsgHandle);
 
     //1.配置IOT_P2P SDK
     self.dev_name = dev_name;
-    int ret = startService(dev_name.UTF8String, pro_id.UTF8String, dev_name.UTF8String, sensor_timeout);
+    int ret = startService(dev_name.UTF8String, pro_id.UTF8String, dev_name.UTF8String, type);
     return (XP2PErrCode)ret;
 }
 

diff --git a/TIoTLinkVideo.podspec b/TIoTLinkVideo.podspec
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
 
   s.source_files  = 'Source/SDK/LinkVideo/**/*.{h,m,c,mm}'
 
-  s.dependency 'TIoTLinkKit_XP2P', '2.4.41-beta.202311171404'
+  s.dependency 'TIoTLinkKit_XP2P', '2.4.41-beta.202312130924'
   s.dependency 'TIoTLinkKit_FLV', '2.2.3'
   s.dependency 'CocoaAsyncSocket', '7.6.5'
   s.dependency 'TIoTLinkKit_SoundTouch', '1.0.0'