Support output arbitrary size and fix iphone4 1920*720 crash

Author: chenliming

LFLiveKit.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate

@@ -84,7 +84,9 @@
 /** The reconnectCount control reconnect count (重连次数) *.*/
 @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 *.*/
+/*** 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.
+ *.*/
 @property (nonatomic, strong) UIView *warterMarkView;
 
 #pragma mark - Initializer

LFLiveKit/LFLiveSession.h

@@ -16,8 +16,8 @@ @interface LFVideoCapture ()
 @property (nonatomic, strong) GPUImageVideoCamera *videoCamera;
 @property (nonatomic, weak) LFGPUImageBeautyFilter *beautyFilter;
 @property (nonatomic, strong) GPUImageOutput<GPUImageInput> *filter;
-@property (nonatomic, strong) GPUImageOutput<GPUImageInput> *output;
 @property (nonatomic, strong) GPUImageCropFilter *cropfilter;
+@property (nonatomic, strong) GPUImageOutput<GPUImageInput> *output;
 @property (nonatomic, strong) GPUImageView *gpuImageView;
 @property (nonatomic, strong) LFLiveVideoConfiguration *configuration;
 
@@ -37,10 +37,6 @@ @implementation LFVideoCapture
 - (instancetype)initWithVideoConfiguration:(LFLiveVideoConfiguration *)configuration {
     if (self = [super init]) {
         _configuration = configuration;
-        if([self pixelBufferImageSize].width < configuration.videoSize.width || [self pixelBufferImageSize].height < configuration.videoSize.height){
-            @throw [NSException exceptionWithName:@"当前videoSize大小出错" reason:@"LFLiveVideoConfiguration videoSize error" userInfo:nil];
-            return nil;
-        }
 
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willEnterBackground:) name:UIApplicationWillResignActiveNotification object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willEnterForeground:) name:UIApplicationDidBecomeActiveNotification object:nil];
@@ -260,67 +256,75 @@ - (void)processVideo:(GPUImageOutput *)output {
     @autoreleasepool {
         GPUImageFramebuffer *imageFramebuffer = output.framebufferForOutput;
         CVPixelBufferRef pixelBuffer = [imageFramebuffer pixelBuffer];
-
+        if(!CGSizeEqualToSize(_self.configuration.videoSize, imageFramebuffer.size)){
+            _self.configuration.videoSize = imageFramebuffer.size;
+        }
         if (pixelBuffer && _self.delegate && [_self.delegate respondsToSelector:@selector(captureOutput:pixelBuffer:)]) {
             [_self.delegate captureOutput:_self pixelBuffer:pixelBuffer];
         }
     }
 }
 
+
 - (void)reloadFilter{
     [self.filter removeAllTargets];
-    [self.cropfilter removeAllTargets];
     [self.blendFilter removeAllTargets];
     [self.uiElementInput removeAllTargets];
     [self.videoCamera removeAllTargets];
-   
+    [self.output removeAllTargets];
+    [self.cropfilter removeAllTargets];
 
     if (self.beautyFace) {
         self.output = [[LFGPUImageEmptyFilter alloc] init];
         self.filter = [[LFGPUImageBeautyFilter alloc] init];
         self.beautyFilter = self.filter;
-        __weak typeof(self) _self = self;
-        [self.output setFrameProcessingCompletionBlock:^(GPUImageOutput *output, CMTime time) {
-            [_self processVideo:output];
-        }];
     } else {
+        self.output = [[LFGPUImageEmptyFilter alloc] init];
         self.filter = [[LFGPUImageEmptyFilter alloc] init];
         self.beautyFilter = nil;
-        __weak typeof(self) _self = self;
-        [self.filter setFrameProcessingCompletionBlock:^(GPUImageOutput *output, CMTime time) {
-            [_self processVideo:output];
-        }];
     }
 
-    CGSize imageSize = [self pixelBufferImageSize];
-    CGFloat cropLeft = (imageSize.width - self.configuration.videoSize.width)/2.0/imageSize.width;
-    CGFloat cropTop = (imageSize.height - self.configuration.videoSize.height)/2.0/imageSize.height;
-    
-    if(cropLeft == 0 && cropTop == 0){
-        [self.videoCamera addTarget:_filter];
-    }else{
-        self.cropfilter = [[GPUImageCropFilter alloc] initWithCropRegion:CGRectMake(cropLeft, cropTop, 1 - cropLeft*2, 1 - cropTop*2)];
+    //< 480*640 比例为4:3  强制转换为16:9
+    if([self.configuration.avSessionPreset isEqualToString:AVCaptureSessionPreset640x480]){
+        CGRect cropRect = self.configuration.landscape ? CGRectMake(0, 0.125, 1, 0.75) : CGRectMake(0.125, 0, 0.75, 1);
+        self.cropfilter = [[GPUImageCropFilter alloc] initWithCropRegion:cropRect];
         [self.videoCamera addTarget:self.cropfilter];
         [self.cropfilter addTarget:self.filter];
+    }else{
+        [self.videoCamera addTarget:self.filter];
     }
 
+    //< 添加水印
     if(self.warterMarkView){
         [self.filter addTarget:self.blendFilter];
         [self.uiElementInput addTarget:self.blendFilter];
         [self.blendFilter addTarget:self.gpuImageView];
-        if(self.beautyFace){
-            [self.filter addTarget:self.output];
-        }
+        [self.filter addTarget:self.output];
         [self.uiElementInput update];
     }else{
-        if (self.beautyFace) {
-            [self.filter addTarget:self.output];
-            [self.output addTarget:self.gpuImageView];
-        } else {
-            [self.filter addTarget:self.gpuImageView];
-        }
+        [self.filter addTarget:self.output];
+        [self.output addTarget:self.gpuImageView];
+    }
+    
+    //< 输出大小自适应
+    if(self.configuration.videoSizeRespectingAspectRatio){
+        [self.filter forceProcessingAtSizeRespectingAspectRatio:self.configuration.videoSize];
+        [self.output forceProcessingAtSizeRespectingAspectRatio:self.configuration.videoSize];
+        [self.blendFilter forceProcessingAtSizeRespectingAspectRatio:self.configuration.videoSize];
+        [self.uiElementInput forceProcessingAtSizeRespectingAspectRatio:self.configuration.videoSize];
+    }else{
+        [self.filter forceProcessingAtSize:self.configuration.videoSize];
+        [self.output forceProcessingAtSize:self.configuration.videoSize];
+        [self.blendFilter forceProcessingAtSize:self.configuration.videoSize];
+        [self.uiElementInput forceProcessingAtSize:self.configuration.videoSize];
     }
 
+    //< 输出数据
+    __weak typeof(self) _self = self;
+    [self.output setFrameProcessingCompletionBlock:^(GPUImageOutput *output, CMTime time) {
+        [_self processVideo:output];
+    }];
+    
 }
 
 #pragma mark Notification
@@ -356,34 +360,4 @@ - (void)statusBarChanged:(NSNotification *)notification {
     }
 }
 
-#pragma mark -- 
-- (CGSize)pixelBufferImageSize{
-    CGSize videoSize = CGSizeZero;
-    switch (self.configuration.sessionPreset) {
-        case LFCaptureSessionPreset360x640:
-        {
-            videoSize = CGSizeMake(480, 640);
-        }
-            break;
-        case LFCaptureSessionPreset540x960:
-        {
-            videoSize = CGSizeMake(540, 960);
-        }
-            break;
-        case LFCaptureSessionPreset720x1280:
-        {
-            videoSize = CGSizeMake(720, 1280);
-        }
-            break;
-            
-        default:
-            break;
-    }
-    
-    if(self.configuration.landscape){
-        return CGSizeMake(videoSize.height, videoSize.width);
-    }
-    return videoSize;
-}
-
 @end

LFLiveKit/capture/LFVideoCapture.m

@@ -60,6 +60,9 @@ typedef NS_ENUM (NSUInteger, LFLiveVideoQuality){
 /// 视频的分辨率，宽高务必设定为 2 的倍数，否则解码播放时可能出现绿边
 @property (nonatomic, assign) CGSize videoSize;
 
+/// 输出图像是否等比例,默认为YES
+@property (nonatomic, assign) BOOL videoSizeRespectingAspectRatio;
+
 /// 视频输出方向
 @property (nonatomic, assign) BOOL landscape;
 

LFLiveKit/configuration/LFLiveVideoConfiguration.h

@@ -9,9 +9,11 @@
 #import "LFLiveVideoConfiguration.h"
 #import <AVFoundation/AVFoundation.h>
 
+
 @implementation LFLiveVideoConfiguration
 
 #pragma mark -- LifeCycle
+
 + (instancetype)defaultConfiguration {
     LFLiveVideoConfiguration *configuration = [LFLiveVideoConfiguration defaultConfigurationForQuality:LFLiveVideoQuality_Default];
     return configuration;
@@ -148,6 +150,13 @@ + (instancetype)defaultConfigurationForQuality:(LFLiveVideoQuality)videoQuality
     return configuration;
 }
 
+- (instancetype)init{
+    if(self = [super init]){
+        _videoSizeRespectingAspectRatio = YES;
+    }
+    return self;
+}
+
 #pragma mark -- Setter Getter
 - (NSString *)avSessionPreset {
     NSString *avSessionPreset = nil;
@@ -175,6 +184,7 @@ - (NSString *)avSessionPreset {
     return avSessionPreset;
 }
 
+
 - (void)setVideoMaxBitRate:(NSUInteger)videoMaxBitRate {
     if (videoMaxBitRate <= _videoBitRate) return;
     _videoMaxBitRate = videoMaxBitRate;
@@ -195,11 +205,28 @@ - (void)setVideoMinFrameRate:(NSUInteger)videoMinFrameRate {
     _videoMinFrameRate = videoMinFrameRate;
 }
 
+- (void)setSessionPreset:(LFLiveVideoSessionPreset)sessionPreset{
+    _sessionPreset = sessionPreset;
+    _sessionPreset = [self supportSessionPreset:sessionPreset];
+}
+
 #pragma mark -- Custom Method
 - (LFLiveVideoSessionPreset)supportSessionPreset:(LFLiveVideoSessionPreset)sessionPreset {
     NSString *avSessionPreset = [self avSessionPreset];
     AVCaptureSession *session = [[AVCaptureSession alloc] init];
-
+    AVCaptureDevice *inputCamera;
+    NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
+    for (AVCaptureDevice *device in devices){
+        if ([device position] == AVCaptureDevicePositionFront){
+            inputCamera = device;
+        }
+    }
+    AVCaptureDeviceInput *videoInput = [[AVCaptureDeviceInput alloc] initWithDevice:inputCamera error:nil];
+    
+    if ([session canAddInput:videoInput]){
+        [session addInput:videoInput];
+    }
+    
     if (![session canSetSessionPreset:avSessionPreset]) {
         if (sessionPreset == LFCaptureSessionPreset720x1280) {
             sessionPreset = LFCaptureSessionPreset540x960;

LFLiveKit/configuration/LFLiveVideoConfiguration.m

@@ -156,7 +156,7 @@ - (LFLiveSession *)session {
 
 
         /***   默认分辨率368 ＊ 640  音频：44.1 iphone6以上48  双声道  方向竖屏 ***/
-        _session = [[LFLiveSession alloc] initWithAudioConfiguration:[LFLiveAudioConfiguration defaultConfiguration] videoConfiguration:[LFLiveVideoConfiguration defaultConfigurationForQuality:LFLiveVideoQuality_Medium3 landscape:NO]];
+        _session = [[LFLiveSession alloc] initWithAudioConfiguration:[LFLiveAudioConfiguration defaultConfiguration] videoConfiguration:[LFLiveVideoConfiguration defaultConfigurationForQuality:LFLiveVideoQuality_Low2 landscape:NO]];
 
         /**    自己定制单声道  */
         /*
@@ -207,17 +207,17 @@ - (LFLiveSession *)session {
            audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
 
            LFLiveVideoConfiguration *videoConfiguration = [LFLiveVideoConfiguration new];
-           videoConfiguration.videoSize = CGSizeMake(720, 1280);
+           videoConfiguration.videoSize = CGSizeMake(500, 700);
            videoConfiguration.videoBitRate = 800*1024;
            videoConfiguration.videoMaxBitRate = 1000*1024;
            videoConfiguration.videoMinBitRate = 500*1024;
            videoConfiguration.videoFrameRate = 15;
            videoConfiguration.videoMaxKeyframeInterval = 30;
-           videoConfiguration.orientation = UIInterfaceOrientationPortrait;
+           videoConfiguration.landscape = NO;
            videoConfiguration.sessionPreset = LFCaptureSessionPreset720x1280;
 
            _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration videoConfiguration:videoConfiguration];
-         */
+        */
 
 
         /**    自己定制高质量音频128K 分辨率设置为720*1280 方向横屏  */
@@ -229,27 +229,28 @@ - (LFLiveSession *)session {
            audioConfiguration.audioSampleRate = LFLiveAudioSampleRate_44100Hz;
 
            LFLiveVideoConfiguration *videoConfiguration = [LFLiveVideoConfiguration new];
-           videoConfiguration.videoSize = CGSizeMake(1280, 720);
+           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 = YES;
-           videoConfiguration.sessionPreset = LFCaptureSessionPreset720x1280;
+           videoConfiguration.landscape = NO;
+           videoConfiguration.sessionPreset = LFCaptureSessionPreset360x640;
 
            _session = [[LFLiveSession alloc] initWithAudioConfiguration:audioConfiguration videoConfiguration:videoConfiguration];
-         */
+        */
 
         _session.delegate = self;
         _session.showDebugInfo = NO;
         _session.preView = self;
 
         UIImageView *imageView = [[UIImageView alloc] init];
         imageView.alpha = 0.8;
-        imageView.frame = CGRectMake(100, 100, 29, 29);
+        imageView.frame = CGRectMake(320-29, 100, 29, 29);
         imageView.image = [UIImage imageNamed:@"ios-29x29"];
         _session.warterMarkView = imageView;
+        
     }
     return _session;
 }