移除0.5延时启动vocie & 修改ijk audiosession

Change-Id: I771b66b7fee1eef855595512e7f33cbd5dad233a

Author: tonychanchen

Podfile

@@ -32,7 +32,7 @@ target 'LinkApp' do
   pod 'CocoaAsyncSocket', '7.6.5'
   pod 'TIoTLinkKit_TPNS', '1.0.1'
   pod 'TIoTLinkKit_WechatOpenSDK', '1.0.1'
-  pod 'TIoTLinkKit_IJKPlayer', '1.0.3'
+  pod 'TIoTLinkKit_IJKPlayer', '1.0.5'
 end
 
 
@@ -43,5 +43,5 @@ target 'LinkSDKDemo' do
   pod 'TIoTLinkKit/LinkRTC', :path => './'
 
   pod 'TIoTLinkVideo', :path => './'
-  pod 'TIoTLinkKit_IJKPlayer', '1.0.3'
+  pod 'TIoTLinkKit_IJKPlayer', '1.0.5'
 end

Podfile.lock

@@ -135,10 +135,10 @@ PODS:
   - TIoTLinkKit_IJKPlayer (1.0.3)
   - TIoTLinkKit_TPNS (1.0.1)
   - TIoTLinkKit_WechatOpenSDK (1.0.1)
-  - TIoTLinkKit_XP2P (2.4.5-beta.202201190337)
+  - TIoTLinkKit_XP2P (2.4.20)
   - TIoTLinkVideo (1.0.0):
     - TIoTLinkKit_FLV (= 2.2.3)
-    - TIoTLinkKit_XP2P (= 2.4.5-beta.202201190337)
+    - TIoTLinkKit_XP2P (= 2.4.20)
   - TrueTime (5.0.3)
   - TXLiteAVSDK_TRTC (8.0.9644)
   - TZImagePickerController (3.2.1)
@@ -257,8 +257,8 @@ SPEC CHECKSUMS:
   TIoTLinkKit_IJKPlayer: 68e5627c9b403fe0137b2f7ee950a9eed23a9941
   TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968
   TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614
-  TIoTLinkKit_XP2P: 135edcb466ba2389dcf7f4d4f62b95723379e23a
-  TIoTLinkVideo: 279fa0b3114dfb7b4d999ca07727f8e654e6117e
+  TIoTLinkKit_XP2P: 8ab9aabd50a5445514fd31521dceb23dbccfd59c
+  TIoTLinkVideo: aa2401600951e068aba7b5b035aa8fdac7a593c1
   TrueTime: b49551ffafb28a9dee04e51b226f42a416010842
   TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d
   TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d

Source/LinkApp/Classes/Module/EquipmentPanel/Controller/TIoTAVP2PPlayCaptureVC.m

@@ -404,32 +404,29 @@ - (void)deviceP2PVideoReport:(NSNotification *)reportInfo {
         if (self.isStart == NO) {
 
             self.topView.hidden = YES;
-//            if (self.isCallIng == NO) {
-                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                    NSString *urlString = [[TIoTCoreXP2PBridge sharedInstance] getUrlForHttpFlv:self.deviceName]?:@"";
-
-                    self.videoUrl = [NSString stringWithFormat:@"%@ipc.flv?action=live",urlString];
-
-                    [self configVideo];
-                    [self.player prepareToPlay];
-                    [self.player play];
-
-                    self.startPlayer = CACurrentMediaTime();
-                });
-//            }
-           
-            self.isStart = YES;
-
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker error:nil];
-                [[AVAudioSession sharedInstance] setActive:YES error:nil];
+            //            if (self.isCallIng == NO) {
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                NSString *urlString = [[TIoTCoreXP2PBridge sharedInstance] getUrlForHttpFlv:self.deviceName]?:@"";
 
-//                [[TIoTTRTCUIManage sharedManager] acceptAppCallingOrCalledEnterRoom];
+                self.videoUrl = [NSString stringWithFormat:@"%@ipc.flv?action=live",urlString];
 
+                [self configVideo];
+                [self.player prepareToPlay];
+                [self.player play];
+                
+                self.startPlayer = CACurrentMediaTime();
+                //            }
+                
+                self.isStart = YES;
+                
+                [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker error:nil];
+                [[AVAudioSession sharedInstance] setActive:YES error:nil];
+                                
                 [[TIoTP2PCommunicateUIManage sharedManager] setStatusManager];
                 [[TIoTP2PCommunicateUIManage sharedManager] p2pCommunicateAcceptAppCallingOrCalledEnterRoom];
 
                 [self startAVCapture];
+                
             });
         }
     }
@@ -592,7 +589,6 @@ - (void)configVideo {
 #pragma mark 事件
 - (void)startAVCapture {
 
-    self.isStart = YES;
     if (self.callType == TIoTTRTCSessionCallType_audio) {
         [[TIoTCoreXP2PBridge sharedInstance] sendVoiceToServer:self.deviceName?:@"" channel:@"channel=0" audioConfig:TIoTAVCaptionFLVAudio_8 withLocalPreviewView:nil];
     }else {

Source/LinkApp/Classes/Module/EquipmentPanel/Controller/TIoTPanelVC.m

@@ -3776,19 +3776,13 @@ - (void)refushVideo:(NSNotification *)notify {
 
 - (void)responseP2PdisConnect:(NSNotification *)notify {
     NSString *DeviceName = [notify.userInfo objectForKey:@"id"];
-    NSString *selectedName = self.deviceName?:@"";
-    
-    if (![DeviceName isEqualToString:selectedName]) {
-        return;
-    }
+//    NSString *selectedName = self.deviceName?:@"";
 
-    [MBProgressHUD showError:@"通道断开，正在重连"];
-    [HXYNotice postP2PVIdeoExit];
-    [[TIoTCoreXP2PBridge sharedInstance] stopService: DeviceName];
-    [[TIoTCoreXP2PBridge sharedInstance] startAppWith:@""
-                                              sec_key:@""
-                                               pro_id:self.productId?:@""
-                                             dev_name:DeviceName?:@""];
+//    if (![DeviceName isEqualToString:selectedName]) {
+//        return;
+//    }
+    NSString *error_message = [NSString stringWithFormat:@"%@通道已断开，请重新拨打",DeviceName];
+    [MBProgressHUD showError:error_message];
 
 }
 @end

Source/SDK/LinkVideo/FLV/TIoTAACEncoder.m

@@ -168,9 +168,9 @@ - (void) encodeSampleBuffer:(CMSampleBufferRef)sampleBuffer completionBlock:(voi
             error = [NSError errorWithDomain:NSOSStatusErrorDomain code:status userInfo:nil];
         }
         if (completionBlock) {
-            dispatch_async(_callbackQueue, ^{
+//            dispatch_async(_callbackQueue, ^{
                 completionBlock(data, error);
-            });
+//            });
         }
         CFRelease(sampleBuffer);
         CFRelease(blockBuffer);

Source/SDK/LinkVideo/FLV/TIoTAVCaptionFLV.mm

@@ -16,7 +16,7 @@
 __weak static TIoTAVCaptionFLV *tAVCaptionFLV = nil;
 static flv_muxer_t* flvMuxer = nullptr;
 dispatch_queue_t muxerQueue;
-NSFileHandle *_fileHandle;
+//NSFileHandle *_fileHandle;
 
 @interface TIoTAVCaptionFLV ()<AVCaptureVideoDataOutputSampleBufferDelegate,AVCaptureAudioDataOutputSampleBufferDelegate,H264EncoderDelegate>
 // 负责输如何输出设备之间的数据传递
@@ -216,8 +216,8 @@ - (void)gotEncodedData:(NSData*)data isKeyFrame:(BOOL)isKeyFrame {
 
 //    NSLog(@"Video data (%lu):%@", (unsigned long)data.length,data.description);
 
-    if (_fileHandle != NULL)
-    {
+//    if (_fileHandle != NULL)
+//    {
         const char bytes[] = "\x00\x00\x00\x01";
         size_t length = (sizeof bytes) - 1; //string literals have implicit trailing '\0'
         NSData *ByteHeader = [NSData dataWithBytes:bytes length:length];
@@ -229,7 +229,7 @@ - (void)gotEncodedData:(NSData*)data isKeyFrame:(BOOL)isKeyFrame {
         NSMutableData *fullH264 = [NSMutableData dataWithData:ByteHeader];
         [fullH264 appendData:data];
         encodeFlvData(1, fullH264);
-    }
+//    }
 
 }
 
@@ -258,8 +258,8 @@ static int flv_onwrite(void *param, const struct flv_vec_t* vec, int n) {
         offset += vec[i].len;
     }
 
-    NSData *ByteHeader = [NSData dataWithBytes:bytes length:total_size];
-    [_fileHandle writeData:ByteHeader];
+//    NSData *ByteHeader = [NSData dataWithBytes:bytes length:total_size];
+//    [_fileHandle writeData:ByteHeader];
 
     [tAVCaptionFLV.delegate capture:(uint8_t *)bytes len:total_size];
 
@@ -313,10 +313,10 @@ -(BOOL) startCapture {
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
     NSString *documentsDirectory = [paths firstObject];
 
-    self.h264File = [documentsDirectory stringByAppendingPathComponent:@"lyh.h264.flv"];
-    [fileManager removeItemAtPath:self.h264File error:nil];
-    [fileManager createFileAtPath:self.h264File contents:nil attributes:nil];
-    _fileHandle = [NSFileHandle fileHandleForWritingAtPath:self.h264File];
+//    self.h264File = [documentsDirectory stringByAppendingPathComponent:@"lyh.h264.flv"];
+//    [fileManager removeItemAtPath:self.h264File error:nil];
+//    [fileManager createFileAtPath:self.h264File contents:nil attributes:nil];
+//    _fileHandle = [NSFileHandle fileHandleForWritingAtPath:self.h264File];
 
     flv_init_load();
 
@@ -341,8 +341,8 @@ - (void) stopCarmera
 //    [_h264Encoder End];
     [_session stopRunning];
 
-    [_fileHandle closeFile];
-    _fileHandle = NULL;
+//    [_fileHandle closeFile];
+//    _fileHandle = NULL;
 //
     // 获取程序Documents目录路径
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory,NSUserDomainMask, YES);

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm

@@ -100,6 +100,7 @@ void XP2PDataMsgHandle(const char *idd, uint8_t* recv_buf, size_t recv_len) {
 @interface TIoTCoreXP2PBridge ()<TIoTAVCaptionFLVDelegate>
 @property (nonatomic, strong) NSString *dev_name;
 @property (nonatomic, assign) BOOL isSending;
+@property (nonatomic, assign) long v_index;
 @end
 
 @implementation TIoTCoreXP2PBridge {
@@ -124,7 +125,7 @@ - (instancetype)init {
     if (self) {
         //默认打开log开关
         _logEnable = YES;
-        
+        _v_index = 0;
         NSString *logFile = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject] stringByAppendingPathComponent:@"TIoTXP2P.log"];
         [[NSFileManager defaultManager] removeItemAtPath:logFile error:nil];
         [[NSFileManager defaultManager] createFileAtPath:logFile contents:nil attributes:nil];
@@ -269,7 +270,7 @@ - (void)stopService:(NSString *)dev_name {
 #pragma mark -AWAVCaptureDelegate
 - (void)capture:(uint8_t *)data len:(size_t)size {
     if (self.isSending) {
-//        NSLog(@"vide stream data:%s  size:%zu",data,size);
+//        printf("vide stream data index:%ld, time:%f, size:%zu\n",_v_index++,[[NSDate date] timeIntervalSince1970],size);
         dataSend(self.dev_name.UTF8String, data, size);
 //        NSData *dataTag = [NSData dataWithBytes:data length:size];
 //        [fileHandle writeData:dataTag];

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.5-beta.202201190337' #~> 2.4.3-beta.1  2.4.4     2.4.3-beta.202201111002       2.4.4-beta.202201170801  2.4.5-beta.202201190337
+  s.dependency 'TIoTLinkKit_XP2P', '2.4.20' #~> 2.4.3-beta.1
   s.dependency 'TIoTLinkKit_FLV', '2.2.3'
 
   s.pod_target_xcconfig = {