update waterMark postion and set outVideoSize

Author: chenliming

LFLiveKit/LFLiveSession.h

@@ -85,7 +85,7 @@
 @property (nonatomic, assign) NSUInteger reconnectCount;
 
 /*** The warterMarkView control whether the watermark is displayed or not ,if set ni,will remove watermark,otherwise add. 
- set alpha represent mix.Position relative to preview.
+ set alpha represent mix.Position relative to outVideoSize.
  *.*/
 @property (nonatomic, strong) UIView *warterMarkView;
 

LFLiveKit/capture/LFVideoCapture.m

@@ -102,8 +102,7 @@ - (void)setRunning:(BOOL)running {
 - (void)setPreView:(UIView *)preView {
     if (self.gpuImageView.superview) [self.gpuImageView removeFromSuperview];
     [preView insertSubview:self.gpuImageView atIndex:0];
-    self.gpuImageView.bounds = preView.bounds;
-    self.waterMarkContentView.bounds = preView.bounds;
+    self.gpuImageView.frame = CGRectMake(0, 0, preView.frame.size.width, preView.frame.size.height);
 }
 
 - (UIView *)preView {
@@ -257,7 +256,12 @@ - (void)processVideo:(GPUImageOutput *)output {
         GPUImageFramebuffer *imageFramebuffer = output.framebufferForOutput;
         CVPixelBufferRef pixelBuffer = [imageFramebuffer pixelBuffer];
         if(!CGSizeEqualToSize(_self.configuration.videoSize, imageFramebuffer.size)){
-            _self.configuration.videoSize = imageFramebuffer.size;
+            NSInteger width = ceil(imageFramebuffer.size.width);
+            NSInteger height = ceil(imageFramebuffer.size.height);
+            if(width %2 != 0) width = width + 1;
+            if(height %2 != 0) height = height + 1;
+            _self.configuration.videoSize = CGSizeMake(width, height);
+            _self.waterMarkContentView.frame = CGRectMake(0, 0,_self.configuration.videoSize.width, _self.configuration.videoSize.height);
         }
         if (pixelBuffer && _self.delegate && [_self.delegate respondsToSelector:@selector(captureOutput:pixelBuffer:)]) {
             [_self.delegate captureOutput:_self pixelBuffer:pixelBuffer];

LFLiveKit/configuration/LFLiveVideoConfiguration.h

@@ -57,7 +57,7 @@ typedef NS_ENUM (NSUInteger, LFLiveVideoQuality){
 ///=============================================================================
 /// @name Attribute
 ///=============================================================================
-/// 视频的分辨率，宽高务必设定为 2 的倍数，否则解码播放时可能出现绿边
+/// 视频的分辨率，宽高务必设定为 2 的倍数，否则解码播放时可能出现绿边(这个videoSizeRespectingAspectRatio设置为YES则可能会改变)
 @property (nonatomic, assign) CGSize videoSize;
 
 /// 输出图像是否等比例,默认为YES

LFLiveKitDemo/LFLiveKitDemo/LFLivePreview.m

@@ -207,17 +207,17 @@ - (LFLiveSession *)session {
            audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
 
            LFLiveVideoConfiguration *videoConfiguration = [LFLiveVideoConfiguration new];
-           videoConfiguration.videoSize = CGSizeMake(500, 700);
+           videoConfiguration.videoSize = CGSizeMake(720, 1280);
            videoConfiguration.videoBitRate = 800*1024;
            videoConfiguration.videoMaxBitRate = 1000*1024;
            videoConfiguration.videoMinBitRate = 500*1024;
            videoConfiguration.videoFrameRate = 15;
            videoConfiguration.videoMaxKeyframeInterval = 30;
            videoConfiguration.landscape = NO;
-           videoConfiguration.sessionPreset = LFCaptureSessionPreset720x1280;
+           videoConfiguration.sessionPreset = LFCaptureSessionPreset360x640;
 
            _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration videoConfiguration:videoConfiguration];
-        */
+         */
 
 
         /**    自己定制高质量音频128K 分辨率设置为720*1280 方向横屏  */
@@ -229,14 +229,14 @@ - (LFLiveSession *)session {
            audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
 
            LFLiveVideoConfiguration *videoConfiguration = [LFLiveVideoConfiguration new];
-           videoConfiguration.videoSize = CGSizeMake(720, 1280);
+           videoConfiguration.videoSize = CGSizeMake(1280, 720);
            videoConfiguration.videoBitRate = 800*1024;
            videoConfiguration.videoMaxBitRate = 1000*1024;
            videoConfiguration.videoMinBitRate = 500*1024;
            videoConfiguration.videoFrameRate = 15;
            videoConfiguration.videoMaxKeyframeInterval = 30;
-           videoConfiguration.landscape = NO;
-           videoConfiguration.sessionPreset = LFCaptureSessionPreset360x640;
+           videoConfiguration.landscape = YES;
+           videoConfiguration.sessionPreset = LFCaptureSessionPreset720x1280;
 
            _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration videoConfiguration:videoConfiguration];
         */
@@ -247,7 +247,7 @@ - (LFLiveSession *)session {
 
         UIImageView *imageView = [[UIImageView alloc] init];
         imageView.alpha = 0.8;
-        imageView.frame = CGRectMake(320-29, 100, 29, 29);
+        imageView.frame = CGRectMake(100, 100, 29, 29);
         imageView.image = [UIImage imageNamed:@"ios-29x29"];
         _session.warterMarkView = imageView;