11#import " CameraPlugin.h"
22#import < AVFoundation/AVFoundation.h>
3- #import < libkern/OSAtomic.h>
43#import < Accelerate/Accelerate.h>
4+ #import < libkern/OSAtomic.h>
55
66@interface NSError (FlutterError)
77@property (readonly , nonatomic ) FlutterError *flutterError;
@@ -22,7 +22,7 @@ @interface FLTSavePhotoDelegate : NSObject <AVCapturePhotoCaptureDelegate>
2222- initWithPath : (NSString *)filename result : (FlutterResult)result ;
2323@end
2424
25- @interface FLTByteStreamHandler : NSObject <FlutterStreamHandler>
25+ @interface FLTByteStreamHandler : NSObject <FlutterStreamHandler>
2626@property (readonly , nonatomic ) FlutterEventSink eventSink;
2727@end
2828
@@ -153,7 +153,7 @@ - (instancetype)initWithCameraName:(NSString *)cameraName
153153
154154 _captureVideoOutput = [AVCaptureVideoDataOutput new ];
155155 _captureVideoOutput.videoSettings =
156- @{(NSString *)kCVPixelBufferPixelFormatTypeKey : @(videoFormat) };
156+ @{(NSString *)kCVPixelBufferPixelFormatTypeKey : @(videoFormat)};
157157 [_captureVideoOutput setAlwaysDiscardsLateVideoFrames: YES ];
158158 [_captureVideoOutput setSampleBufferDelegate: self queue: dispatch_get_main_queue ()];
159159
@@ -355,12 +355,14 @@ - (CVPixelBufferRef)convertYUVImageTOBGRA:(CVPixelBufferRef)pixelBuffer {
355355 pixelRange.CbCrMax = 240 ;
356356 pixelRange.CbCrMin = 16 ;
357357
358- vImageConvert_YpCbCrToARGB_GenerateConversion (kvImage_YpCbCrToARGBMatrix_ITU_R_601_4, &pixelRange, &infoYpCbCrToARGB, kvImage420Yp8_CbCr8, kvImageARGB8888, kvImageNoFlags);
358+ vImageConvert_YpCbCrToARGB_GenerateConversion (kvImage_YpCbCrToARGBMatrix_ITU_R_601_4, &pixelRange,
359+ &infoYpCbCrToARGB, kvImage420Yp8_CbCr8,
360+ kvImageARGB8888, kvImageNoFlags);
359361
360362 vImage_Buffer sourceLumaBuffer;
361363 sourceLumaBuffer.data = CVPixelBufferGetBaseAddressOfPlane (pixelBuffer, 0 );
362364 sourceLumaBuffer.height = CVPixelBufferGetHeightOfPlane (pixelBuffer, 0 );
363- sourceLumaBuffer.width = CVPixelBufferGetWidthOfPlane (pixelBuffer, 0 );;
365+ sourceLumaBuffer.width = CVPixelBufferGetWidthOfPlane (pixelBuffer, 0 );
364366 sourceLumaBuffer.rowBytes = CVPixelBufferGetBytesPerRowOfPlane (pixelBuffer, 0 );
365367
366368 vImage_Buffer sourceChromaBuffer;
@@ -369,20 +371,30 @@ - (CVPixelBufferRef)convertYUVImageTOBGRA:(CVPixelBufferRef)pixelBuffer {
369371 sourceChromaBuffer.width = CVPixelBufferGetWidthOfPlane (pixelBuffer, 1 );
370372 sourceChromaBuffer.rowBytes = CVPixelBufferGetBytesPerRowOfPlane (pixelBuffer, 1 );
371373
372- if (!destinationBuffer.height ) vImageBuffer_Init (&destinationBuffer, sourceLumaBuffer.height , sourceLumaBuffer.width , 32 , kvImageNoFlags);
374+ if (!destinationBuffer.height ) {
375+ vImageBuffer_Init (&destinationBuffer, sourceLumaBuffer.height , sourceLumaBuffer.width , 32 ,
376+ kvImageNoFlags);
377+ }
373378
374- vImageConvert_420Yp8_CbCr8ToARGB8888 (&sourceLumaBuffer, &sourceChromaBuffer, &destinationBuffer, &infoYpCbCrToARGB, NULL , 255 , kvImagePrintDiagnosticsToConsole);
379+ vImageConvert_420Yp8_CbCr8ToARGB8888 (&sourceLumaBuffer, &sourceChromaBuffer, &destinationBuffer,
380+ &infoYpCbCrToARGB, NULL , 255 ,
381+ kvImagePrintDiagnosticsToConsole);
375382
376383 CVPixelBufferUnlockBaseAddress (pixelBuffer, kCVPixelBufferLock_ReadOnly );
377384 CVPixelBufferRelease (pixelBuffer);
378385
379- if (!conversionBuffer.height ) vImageBuffer_Init (&conversionBuffer, sourceLumaBuffer.height , sourceLumaBuffer.width , 32 , kvImageNoFlags);
386+ if (!conversionBuffer.height ) {
387+ vImageBuffer_Init (&conversionBuffer, sourceLumaBuffer.height , sourceLumaBuffer.width , 32 ,
388+ kvImageNoFlags);
389+ }
380390
381- const uint8_t map[4 ] = { 3 , 2 , 1 , 0 };
391+ const uint8_t map[4 ] = {3 , 2 , 1 , 0 };
382392 vImagePermuteChannels_ARGB8888 (&destinationBuffer, &conversionBuffer, map, kvImageNoFlags);
383393
384394 CVPixelBufferRef newPixelBuffer = NULL ;
385- CVPixelBufferCreateWithBytes (NULL , conversionBuffer.width , conversionBuffer.height , kCVPixelFormatType_32BGRA , conversionBuffer.data , conversionBuffer.rowBytes , NULL , NULL , NULL , &newPixelBuffer);
395+ CVPixelBufferCreateWithBytes (NULL , conversionBuffer.width , conversionBuffer.height ,
396+ kCVPixelFormatType_32BGRA , conversionBuffer.data ,
397+ conversionBuffer.rowBytes , NULL , NULL , NULL , &newPixelBuffer);
386398
387399 return newPixelBuffer;
388400}
0 commit comments