添加采集相机positon初始值

Change-Id: I24b5609c1e751ca8ae754cd628986a2ced7976f4

Author: tonychanchen

Podfile

@@ -29,7 +29,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.7-beta.202206211138'
+  pod 'TIoTLinkKit_IJKPlayer', '~> 1.0.7-beta.202207121233'
   pod 'Bugly', '2.5.91'
 end
 
@@ -41,5 +41,5 @@ target 'LinkSDKDemo' do
   pod 'TIoTLinkKit/LinkRTC', :path => './'
 
   pod 'TIoTLinkVideo', :path => './'
-  pod 'TIoTLinkKit_IJKPlayer', '~> 1.0.7-beta.202206211138'
+  pod 'TIoTLinkKit_IJKPlayer', '~> 1.0.7-beta.202207121233'
 end

Podfile.lock

@@ -30,7 +30,7 @@ PODS:
     - TXLiteAVSDK_TRTC (= 8.0.9644)
     - YYModel (= 1.0.4)
   - TIoTLinkKit_FLV (2.2.3)
-  - TIoTLinkKit_IJKPlayer (1.0.7-beta.202206211138)
+  - TIoTLinkKit_IJKPlayer (1.0.7-beta.202207121233)
   - TIoTLinkKit_TPNS (1.0.1)
   - TIoTLinkKit_WechatOpenSDK (1.0.1)
   - TIoTLinkKit_XP2P (2.4.26-beta.202205260939)
@@ -60,7 +60,7 @@ DEPENDENCIES:
   - Tencent-MapSDK (= 4.3.9)
   - TIoTLinkKit (from `./`)
   - TIoTLinkKit/LinkRTC (from `./`)
-  - TIoTLinkKit_IJKPlayer (~> 1.0.7-beta.202206211138)
+  - TIoTLinkKit_IJKPlayer (~> 1.0.7-beta.202207121233)
   - TIoTLinkKit_TPNS (= 1.0.1)
   - TIoTLinkKit_WechatOpenSDK (= 1.0.1)
   - TIoTLinkVideo (from `./`)
@@ -119,7 +119,7 @@ SPEC CHECKSUMS:
   Tencent-MapSDK: 6dfbee53b46131deb4c4bb02b3edc5ce7fb630dc
   TIoTLinkKit: 0386fb583c61765a02ad5cca810c7661d5a0bc53
   TIoTLinkKit_FLV: aec2b2ec9664990ec6c5b9f760fc1a9043d5a9a5
-  TIoTLinkKit_IJKPlayer: 43997107b78adb9393bc35e5e55d1bf2bb1ba5ac
+  TIoTLinkKit_IJKPlayer: 0956f2e09012c6b050ac33e3a66fbe71d5442617
   TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968
   TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614
   TIoTLinkKit_XP2P: 2c0d8b66ab3e075d8cda1cf5608b425593101346
@@ -129,6 +129,6 @@ SPEC CHECKSUMS:
   TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d
   YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
 
-PODFILE CHECKSUM: 3164ad3c557c083ea71289327529c22f4aa70f9c
+PODFILE CHECKSUM: 6739ce81e9a22e68a26f72ece75f92211b352595
 
 COCOAPODS: 1.9.3

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

@@ -620,7 +620,7 @@ - (void)startAVCapture {
     if (self.callType == TIoTTRTCSessionCallType_audio) {
         [[TIoTCoreXP2PBridge sharedInstance] sendVoiceToServer:self.deviceName?:@"" channel:@"channel=0" audioConfig:FLVAudioType withLocalPreviewView:nil];
     }else {
-        [[TIoTCoreXP2PBridge sharedInstance] sendVoiceToServer:self.deviceName?:@"" channel:@"channel=0" audioConfig:FLVAudioType withLocalPreviewView:self.previewBottomView];
+        [[TIoTCoreXP2PBridge sharedInstance] sendVoiceToServer:self.deviceName?:@"" channel:@"channel=0" audioConfig:FLVAudioType withLocalPreviewView:self.previewBottomView videoPosition:AVCaptureDevicePositionFront];
     }
 }
 

Source/SDK/LinkVideo/FLV/TIoTAVCaptionFLV.h

@@ -16,6 +16,7 @@ typedef NS_ENUM(NSInteger, TIoTAVCaptionFLVAudioType) {
 @property (nonatomic, weak) id<TIoTAVCaptionFLVDelegate> delegate;
 @property (nonatomic, assign)UIView *videoLocalView;
 @property (nonatomic, assign)BOOL isEchoCancel;
+@property (nonatomic, assign)AVCaptureDevicePosition devicePosition;
 -(instancetype) initWithAudioConfig:(TIoTAVCaptionFLVAudioType)audioSampleRate;
 
 - (void)preStart;

Source/SDK/LinkVideo/FLV/TIoTAVCaptionFLV.mm

@@ -51,6 +51,7 @@ -(instancetype) initWithAudioConfig:(TIoTAVCaptionFLVAudioType)audioSampleRate {
         tAVCaptionFLV = self;
         _audioRate = audioSampleRate;
         _isEchoCancel = NO;
+        _devicePosition = AVCaptureDevicePositionBack;
         [self onInit];
     }
     return self;
@@ -284,9 +285,9 @@ - (void)setupVideoCapture {
 
     NSError *error = nil;
     //获得一个采集设备, 例如前置/后置摄像头
-    AVCaptureDevice *videoDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
+//    AVCaptureDevice *videoDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
 
-//    videoDevice = [self cameraWithPosition:AVCaptureDevicePositionBack];
+    AVCaptureDevice *videoDevice = [self cameraWithPosition:self.devicePosition];
     //用设备初始化一个采集的输入对象
     AVCaptureDeviceInput *videoInput = [AVCaptureDeviceInput deviceInputWithDevice:videoDevice error:&error];
     self.deviceInput = videoInput;

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h

@@ -109,6 +109,8 @@ extern NSNotificationName const TIoTCoreXP2PBridgeNotificationStreamEnd;
 - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_number audioConfig:(TIoTAVCaptionFLVAudioType)audio_rate;
 //音视频采样
 - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_number audioConfig:(TIoTAVCaptionFLVAudioType)audio_rate withLocalPreviewView:(UIView *)localView;
+- (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_number audioConfig:(TIoTAVCaptionFLVAudioType)audio_rate withLocalPreviewView:(UIView *)localView videoPosition:(AVCaptureDevicePosition)videoPosition;
+
 - (XP2PErrCode)stopVoiceToServer;
 - (void)changeCameraPositon;
 

Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm

@@ -315,6 +315,10 @@ - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_numbe
 }
 
 - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_number audioConfig:(TIoTAVCaptionFLVAudioType)audio_rate withLocalPreviewView:(UIView *)localView {
+    [self sendVoiceToServer:dev_name channel:channel_number audioConfig:audio_rate withLocalPreviewView:localView videoPosition:AVCaptureDevicePositionBack];
+}
+
+- (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_number audioConfig:(TIoTAVCaptionFLVAudioType)audio_rate withLocalPreviewView:(UIView *)localView videoPosition:(AVCaptureDevicePosition)videoPosition {
     NSString *audioFile = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject] stringByAppendingPathComponent:@"testVideoStreamfile.flv"];
     [[NSFileManager defaultManager] removeItemAtPath:audioFile error:nil];
     [[NSFileManager defaultManager] createFileAtPath:audioFile contents:nil attributes:nil];
@@ -332,7 +336,7 @@ - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_numbe
         systemAvCapture.videoLocalView = localView;
         systemAvCapture.isEchoCancel = YES;
     }
-    
+    systemAvCapture.devicePosition = videoPosition;
     systemAvCapture.videoLocalView = localView;
     [systemAvCapture setResolutionRatio:self.resolution];
     [systemAvCapture preStart];//配置声音和视频