优化双向音视频编码器

tapd: http://tapd.oa.com/20393192/prong/stories/view/1020393192868332011
Change-Id: Iedad5d5d9e4391b4fc0ebe8d190ea35e27701690
(cherry picked from commit b5dfc4b)

Author: tonychanchen

Podfile.lock

@@ -135,11 +135,11 @@ PODS:
   - TIoTLinkKit_IJKPlayer (1.0.2)
   - TIoTLinkKit_TPNS (1.0.1)
   - TIoTLinkKit_WechatOpenSDK (1.0.1)
-  - TIoTLinkKit_XP2P (2.4.2-beta.202112231310)
+  - TIoTLinkKit_XP2P (2.4.3-beta.202201111002)
   - TIoTLinkVideo (1.0.0):
     - CocoaAsyncSocket (= 7.6.5)
     - TIoTLinkKit_FLV (= 2.2.3)
-    - TIoTLinkKit_XP2P (= 2.4.2-beta.202112231310)
+    - TIoTLinkKit_XP2P (~> 2.4.3-beta.1)
   - TrueTime (5.0.3)
   - TXLiteAVSDK_TRTC (8.0.9644)
   - TZImagePickerController (3.2.1)
@@ -258,8 +258,8 @@ SPEC CHECKSUMS:
   TIoTLinkKit_IJKPlayer: e47c3fed6b204e7544f84a24310cab7a372854d1
   TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968
   TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614
-  TIoTLinkKit_XP2P: b62f5c1e25c973d309ab45b3f65e5f1ed2d88e0a
-  TIoTLinkVideo: c6f592694d6b817ce5e0cd84913f3e90e6a2ac27
+  TIoTLinkKit_XP2P: fcec02f312445e15cdf77e7ff714874a0e1e0753
+  TIoTLinkVideo: 5934f2e0d052e8612f76bdefce6759bc241df6e1
   TrueTime: b49551ffafb28a9dee04e51b226f42a416010842
   TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d
   TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d

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

@@ -642,22 +642,22 @@ - (void)changeVideoDefinitaion {
         TIoTDemoCustomSheetView *definitaionSheet = [[TIoTDemoCustomSheetView alloc]init];
         NSArray *actionTitleArray = @[@"超清 1080P",@"高清 720P",@"标清 360P",@"取消"];
         ChooseFunctionBlock superDefinitaionBlock = ^(TIoTDemoCustomSheetView *view){
-            self.qualityString = quality_super;
-            [self resetVideoPlayerWithQuality:self.qualityString];
+            weakSelf.qualityString = quality_super;
+            [weakSelf resetVideoPlayerWithQuality:weakSelf.qualityString];
             [weakSelf.definitionBtn setTitle:@"超清" forState:UIControlStateNormal];
             [definitaionSheet removeFromSuperview];
         };
 
         ChooseFunctionBlock highDefinitionBlock = ^(TIoTDemoCustomSheetView *view){
-            self.qualityString = quality_high;
-            [self resetVideoPlayerWithQuality:self.qualityString];
+            weakSelf.qualityString = quality_high;
+            [weakSelf resetVideoPlayerWithQuality:weakSelf.qualityString];
             [weakSelf.definitionBtn setTitle:@"高清" forState:UIControlStateNormal];
             [definitaionSheet removeFromSuperview];
         };
 
         ChooseFunctionBlock standardDefinitionBlock = ^(TIoTDemoCustomSheetView *view){
-            self.qualityString = quality_standard;
-            [self resetVideoPlayerWithQuality:self.qualityString];
+            weakSelf.qualityString = quality_standard;
+            [weakSelf resetVideoPlayerWithQuality:weakSelf.qualityString];
             [weakSelf.definitionBtn setTitle:@"标清" forState:UIControlStateNormal];
             [definitaionSheet removeFromSuperview];
         };

Source/SDK/LinkVideo/FLV/TIoTAVCaptionFLV.mm

@@ -112,6 +112,7 @@ - (void)setupVideoCapture {
     self.h264Encoder = [TIoTH264Encoder new];
     [self.h264Encoder initWithConfiguration];
     [self.h264Encoder initEncode:480 height:640];
+//    [self.h264Encoder start:480 height:640];
     self.h264Encoder.delegate = self;
 
     if ([_session canSetSessionPreset:AVCaptureSessionPreset1280x720]) {
@@ -178,12 +179,12 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CM
         [self.aacEncoder encodeSampleBuffer:sampleBuffer completionBlock:^(NSData *encodedData, NSError *error) {
 
             if (encodedData) {
-                NSLog(@"Audio data (%lu):%@", (unsigned long)encodedData.length,encodedData.description);
+//                NSLog(@"Audio data (%lu):%@", (unsigned long)encodedData.length,encodedData.description);
 
                 [self.data appendData:encodedData];
                 encodeFlvData(0, encodedData);
             }else {
-                NSLog(@"Error encoding AAC: %@", error);
+//                NSLog(@"Error encoding AAC: %@", error);
             }
         }];
     }
@@ -210,7 +211,7 @@ - (void)gotSpsPps:(NSData*)sps pps:(NSData*)pps {
 }
 - (void)gotEncodedData:(NSData*)data isKeyFrame:(BOOL)isKeyFrame {
 
-    NSLog(@"Video data (%lu):%@", (unsigned long)data.length,data.description);
+//    NSLog(@"Video data (%lu):%@", (unsigned long)data.length,data.description);
 
     if (_fileHandle != NULL)
     {
@@ -236,7 +237,7 @@ void flv_init_load() {
 
 static int flv_onmuxer(void* flv, int type, const void* data, size_t bytes, uint32_t timestamp)
 {
-    NSLog(@"========= flv_onmuxer type: %d, size: %zu", type,bytes);
+//    NSLog(@"========= flv_onmuxer type: %d, size: %zu", type,bytes);
     return flv_writer_input(flv, type, data, bytes, timestamp);
 }
 
@@ -247,7 +248,7 @@ static int flv_onwrite(void *param, const struct flv_vec_t* vec, int n) {
         total_size += vec[i].len;
     }
 
-    NSLog(@"========= flv_onmuxer total size: %d", total_size);
+//    NSLog(@"========= flv_onmuxer total size: %d", total_size);
     char* bytes = new char[total_size];
     for(int i = 0, offset = 0; i < n; i++) {
         memcpy(bytes + offset, vec[i].ptr, vec[i].len);
@@ -277,7 +278,7 @@ int encodeFlvData(int type, NSData *packetData) {
 
     const void *c_data = packetData.bytes;
     NSUInteger len = packetData.length;
-    NSLog(@"===========================------------ %ld, pts: %u", len, pts);
+//    NSLog(@"===========================------------ %ld, pts: %u", len, pts);
 
     int ret = 0;
     if (type == 0) { //audio

Source/SDK/LinkVideo/FLV/TIoTH264Encoder.h

@@ -12,7 +12,7 @@
 @interface TIoTH264Encoder : NSObject
 
 - (void) initWithConfiguration;
-- (void) start:(int)width  height:(int)height;
+//- (void) start:(int)width  height:(int)height;
 - (void) initEncode:(int)width  height:(int)height;
 - (void) encode:(CMSampleBufferRef )sampleBuffer;
 - (void) End;

Source/SDK/LinkVideo/FLV/TIoTH264Encoder.m

@@ -102,7 +102,7 @@ void didCompressH264(void *outputCallbackRefCon, void *sourceFrameRefCon, OSStat
 
 }
 
-- (void) start:(int)width  height:(int)height
+/*- (void) start:(int)width  height:(int)height
 {
     int frameSize = (width * height * 1.5);
     
@@ -241,7 +241,7 @@ - (void) start:(int)width  height:(int)height
     });
     
     
-}
+}*/
 - (void) initEncode:(int)width  height:(int)height
 {
     dispatch_sync(aQueue, ^{
@@ -262,9 +262,33 @@ - (void) initEncode:(int)width  height:(int)height
         }
 
         // Set the properties
+        // 设置实时编码输出（避免延迟）
         VTSessionSetProperty(EncodingSession, kVTCompressionPropertyKey_RealTime, kCFBooleanTrue);
-        VTSessionSetProperty(EncodingSession, kVTCompressionPropertyKey_ProfileLevel, kVTProfileLevel_H264_Main_AutoLevel);
+        VTSessionSetProperty(EncodingSession, kVTCompressionPropertyKey_ProfileLevel, kVTProfileLevel_H264_Baseline_AutoLevel);
+
+        //关闭B帧
+        VTSessionSetProperty(EncodingSession, kVTCompressionPropertyKey_AllowFrameReordering, kCFBooleanFalse);
+        
+        // 设置关键帧（GOPsize)间隔
+        int frameInterval = 10;
+        CFNumberRef  frameIntervalRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &frameInterval);
+        VTSessionSetProperty(EncodingSession, kVTCompressionPropertyKey_MaxKeyFrameInterval, frameIntervalRef);
+        
+        // 设置期望帧率
+        int fps = 10;
+        CFNumberRef  fpsRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &fps);
+        VTSessionSetProperty(EncodingSession, kVTCompressionPropertyKey_ExpectedFrameRate, fpsRef);
+        
+        
+        //设置码率，均值，单位是byte
+        int bitRate = width * height * 3 * 4 * 8;
+        CFNumberRef bitRateRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &bitRate);
+        VTSessionSetProperty(EncodingSession, kVTCompressionPropertyKey_AverageBitRate, bitRateRef);
 
+        //设置码率，上限，单位是bps
+        int bitRateLimit = width * height * 3 * 4;
+        CFNumberRef bitRateLimitRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &bitRateLimit);
+        VTSessionSetProperty(EncodingSession, kVTCompressionPropertyKey_DataRateLimits, bitRateLimitRef);
 
         // Tell the encoder to start encoding
         VTCompressionSessionPrepareToEncodeFrames(EncodingSession);

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm

@@ -300,10 +300,10 @@ - (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);
+//        NSLog(@"vide stream data:%s  size:%zu",data,size);
         dataSend(self.dev_name.UTF8String, data, size);
-        NSData *dataTag = [NSData dataWithBytes:data length:size];
-        [fileHandle writeData:dataTag];
+//        NSData *dataTag = [NSData dataWithBytes:data length:size];
+//        [fileHandle writeData:dataTag];
     }
 }
 

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 'TIoTLinkKit_XP2P', '~> 2.4.3-beta.1'
   s.dependency 'TIoTLinkKit_FLV', '2.2.3'
   s.dependency 'CocoaAsyncSocket', '7.6.5'