Changeset 1368:ac122ded501e in mediastreamer2

Timestamp:

May 6, 2011 10:46:19 AM (2 years ago)

Author:

Guillaume Beraudo <guillaume.beraudo@…>

Branch:

default

Message:

Mac camera: plannar + incompatible format + leaks

• Handle plannar pixels formats
• Convert from incompatible hardware pixel formats to YUV420P
• Fix pool memory leaks
• Add an option to force output buffers from camera to a specific pixel format

File:

• src/qtcapture.m (modified) (14 diffs)

src/qtcapture.m

@@ -11 +11 @@
 
 struct v4mState;
+
+// Define != NULL to have QT Framework convert hardware device pixel format to another one.
+//static OSType forcedPixelFormat=kCVPixelFormatType_420YpCbCr8Planar;
+static OSType forcedPixelFormat=0;
 
 static MSPixFmt ostype_to_pix_fmt(OSType pixelFormat, bool printFmtName){
@@ -35 +39 @@
 @interface NsMsWebCam :NSObject
 {
-        NSAutoreleasePool *globalPool;
         QTCaptureDeviceInput *input;
         QTCaptureDecompressedVideoOutput * output;
@@ -85 +88 @@
                 mblk_t *yuv_block = ms_yuv_buf_alloc(&pict, w, h);
 
-                //memset(pict.planes[0], 0, (w*h*3)/2);
                 int p;
                 for (p=0; p < numberOfPlanes; p++) {
@@ -93 +95 @@
                         uint8_t *dst_plane = pict.planes[p];
                         uint8_t *src_plane = CVPixelBufferGetBaseAddressOfPlane(frame, p);
-                        ms_message("CVPixelBuffer %ix%i; Plane %i %ix%i (%i)", w, h, p, plane_width, plane_height, fullrow_width);
+//                      ms_message("CVPixelBuffer %ix%i; Plane %i %ix%i (%i)", w, h, p, plane_width, plane_height, fullrow_width);
                         int l;
                         for (l=0; l<plane_height; l++) {
@@ -122 +124 @@
         qinit(&rq);
         ms_mutex_init(&mutex,NULL);
-        
-        globalPool = [[NSAutoreleasePool alloc] init];
         session = [[QTCaptureSession alloc] init];
         output = [[QTCaptureDecompressedVideoOutput alloc] init];
@@ -129 +129 @@
         [output setDelegate: self];
         
-        
         return self;
 }
@@ -136 +135 @@
         [self stop];
         
-        if(session)
-        {               
+        if (session) {          
                 [session release];
                 session = nil;
         }
                 
-        if(input)
-        {
+        if (input) {
                 [input release];
                 input = nil;
         }
         
-        if(output)
-        {
+        if (output) {
                 [output release];
                 output = nil;
@@ -156 +152 @@
         flushq(&rq,0);
 
-        [globalPool drain];
         ms_mutex_destroy(&mutex);
 
@@ -176 +171 @@
 }
 
--(int) getPixFmt{
-        
+-(int) getPixFmt {
+        if (forcedPixelFormat != 0) {
+                MSPixFmt msfmt=ostype_to_pix_fmt(forcedPixelFormat, true);
+                ms_message("getPixFmt forced capture FMT: %i", msfmt);
+                return msfmt;
+        }
+
         QTCaptureDevice *device = [input device];
-        if([device isOpen]) {   
+        // Return the first pixel format of the hardware device compatible with mediastreamer
+        // Could be improved by choosing the best through all the formats supported by the hardware.
+        if([device isOpen]) {
+                NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];      
                 NSArray * array = [device formatDescriptions];
         
@@ -187 +190 @@
                         if ([desc mediaType] == QTMediaTypeVideo) {
                                 UInt32 fmt = [desc formatType];
-                                MSPixFmt format = ostype_to_pix_fmt(fmt, true);
-                                if (format != MS_PIX_FMT_UNKNOWN) return format;
+                                MSPixFmt msfmt = ostype_to_pix_fmt(fmt, true);
+                                if (msfmt != MS_PIX_FMT_UNKNOWN) {
+                                        [pool drain];
+                                        return msfmt;
+                                }
                         }
                 }
+                [pool drain];
         } else {
-                ms_warning("The camera wasn't opened");
+                ms_error("The camera wasn't opened when asking for pixel format");
         }
-        ms_warning("No format found, using MS_YUV420P pixel format");
+
+        ms_warning("No compatible format found, using MS_YUV420P pixel format");
+        // Configure the output to convert the uncompatible hardware pixel format to MS_YUV420P
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+        NSDictionary *old_dic = [output pixelBufferAttributes];
+        if ([[old_dic objectForKey:(id)kCVPixelBufferPixelFormatTypeKey] integerValue] != kCVPixelFormatType_420YpCbCr8Planar) {
+                NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:
+                 [NSNumber numberWithInteger:[[old_dic objectForKey:(id)kCVPixelBufferWidthKey] integerValue]], (id)kCVPixelBufferWidthKey,
+                 [NSNumber numberWithInteger:[[old_dic objectForKey:(id)kCVPixelBufferHeightKey] integerValue]],(id)kCVPixelBufferHeightKey,
+                 [NSNumber numberWithInteger:kCVPixelFormatType_420YpCbCr8Planar], (id)kCVPixelBufferPixelFormatTypeKey,
+                  nil];
+                  [output setPixelBufferAttributes:dic];
+        }
+
+        [pool drain];
         return MS_YUV420P;
 }
 
--(void) setName:(char*) name
-{
+
+
+-(void) setName:(char*) name {
         NSError *error = nil;
         unsigned int i = 0;
-         
+
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];      
         QTCaptureDevice * device = [QTCaptureDevice defaultInputDeviceWithMediaType:QTMediaTypeVideo];
         
@@ -224 +247 @@
         else {
                 ms_error("%s", [[error localizedDescription] UTF8String]);
+                [pool drain];
                 return;
         }
@@ -230 +254 @@
         
         success = [session addInput:input error:&error];
-        if (success) ms_message("Input added to session");
-        else ms_error("%s", [[error localizedDescription] UTF8String]);
+        if (!success) ms_error("%s", [[error localizedDescription] UTF8String]);
         
 
         success = [session addOutput:output error:&error];
-        if (success) ms_message("Output added to session");
-        else ms_error("%s", [[error localizedDescription] UTF8String]);
-}
-
--(void) setSize:(MSVideoSize) size
-{       
-        ms_message("Set size w=%i, h=%i", size.width, size.height);
-        NSDictionary * dic = [NSDictionary dictionaryWithObjectsAndKeys:
-         [NSNumber numberWithInteger:size.width], (id)kCVPixelBufferWidthKey,
-         [NSNumber numberWithInteger:size.height],(id)kCVPixelBufferHeightKey,
-//       [NSNumber numberWithInteger:kCVPixelFormatType_420YpCbCr8Planar], (id)kCVPixelBufferPixelFormatTypeKey, // force pixel format to plannar
-                                                  nil];
+        if (!success) ms_error("%s", [[error localizedDescription] UTF8String]);
+        [pool drain];
+}
+
+-(void) setSize:(MSVideoSize) size {    
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+        NSDictionary *dic;
+        if (forcedPixelFormat != 0) {
+                ms_message("QTCapture set size w=%i, h=%i fmt=%i", size.width, size.height, forcedPixelFormat);
+                dic = [NSDictionary dictionaryWithObjectsAndKeys:
+                 [NSNumber numberWithInteger:size.width], (id)kCVPixelBufferWidthKey,
+                 [NSNumber numberWithInteger:size.height],(id)kCVPixelBufferHeightKey,
+                 [NSNumber numberWithInteger:forcedPixelFormat], (id)kCVPixelBufferPixelFormatTypeKey, // force pixel format to plannar
+                  nil];
+        } else {
+                dic = [NSDictionary dictionaryWithObjectsAndKeys:
+                 [NSNumber numberWithInteger:size.width], (id)kCVPixelBufferWidthKey,
+                 [NSNumber numberWithInteger:size.height],(id)kCVPixelBufferHeightKey,
+                  nil];
+        }
         
         [output setPixelBufferAttributes:dic];
+        [pool drain];
 }
 
@@ -258 +290 @@
         size.height = MS_VIDEO_SIZE_QCIF_H;
         
-        if(output)
-        {
+        if(output) {
+                NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
                 NSDictionary * dic = [output pixelBufferAttributes];
-                
                 size.width = [[dic objectForKey:(id)kCVPixelBufferWidthKey] integerValue];
                 size.height = [[dic objectForKey:(id)kCVPixelBufferHeightKey] integerValue];
-        }
-                ms_message("get size w=%i, h=%i", size.width, size.height);
+                [pool drain];
+        }
         return size;
 }
 
--(QTCaptureSession *) session
-{
+-(QTCaptureSession *) session {
         return  session;
 }
 
--(queue_t*) rq
-{
+-(queue_t*) rq {
         return &rq;
 }
 
--(ms_mutex_t *) mutex
-{
+-(ms_mutex_t *) mutex {
         return &mutex;
 }
@@ -299 +327 @@
         v4mState *s=ms_new0(v4mState,1);
         s->webcam= [[NsMsWebCam alloc] init];
-//      [s->webcam retain];
         s->start_time=0;
         s->frame_count=-1;