Changeset 3499 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/qt_dev.m

Timestamp:

Apr 6, 2011 11:30:18 AM (14 years ago)

Author:

ming

Message:

Re #1213:
Add OpenGL support for SDL renderer

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/qt_dev.m (modified) (10 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/qt_dev.m

@@ -24 +24 @@
 #if PJMEDIA_VIDEO_DEV_HAS_QT
 
+#include <Foundation/NSAutoreleasePool.h>
 #include <QTKit/QTKit.h>
 
@@ -42 +43 @@
 static qt_fmt_info qt_fmts[] =
 {
-    {PJMEDIA_FORMAT_YUY2, kCVPixelFormatType_422YpCbCr8_yuvs} ,
+    {PJMEDIA_FORMAT_YUY2, kCVPixelFormatType_422YpCbCr8_yuvs},
+    {PJMEDIA_FORMAT_UYVY, kCVPixelFormatType_422YpCbCr8},
 };
 
@@ -83 +85 @@
     void                   *user_data;      /**< Application data.     */
 
+    pj_bool_t               cap_thread_exited;
+    pj_bool_t               cap_thread_initialized;
+    pj_thread_desc          cap_thread_desc;
+    pj_thread_t            *cap_thread;
+    
+    NSAutoreleasePool                   *apool;
     QTCaptureSession                    *cap_session;
     QTCaptureDeviceInput                *dev_input;
@@ -171 +179 @@
     struct qt_dev_info *qdi;
     unsigned i, dev_count = 0;
+    NSAutoreleasePool *apool = [[NSAutoreleasePool alloc]init];
     NSArray *dev_array;
 
@@ -245 +254 @@
     }
 
+    [apool release];
+    
     PJ_LOG(4, (THIS_FILE, "qt video initialized with %d devices",
                qf->dev_count));
@@ -317 +328 @@
     pjmedia_frame frame;
 
+    if (stream->cap_thread_initialized == 0 || !pj_thread_is_registered())
+    {
+        pj_thread_register("qt_cap", stream->cap_thread_desc,
+                           &stream->cap_thread);
+        stream->cap_thread_initialized = 1;
+        PJ_LOG(5,(THIS_FILE, "Capture thread started"));
+    }
+    
     if (!videoFrame)
         return;
@@ -380 +399 @@
     pj_memcpy(&strm->vid_cb, cb, sizeof(*cb));
     strm->user_data = user_data;
+    strm->apool = [[NSAutoreleasePool alloc]init];
     
     /* Create player stream here */
@@ -447 +467 @@
         strm->cap_ts_inc = PJMEDIA_SPF2(strm->param.clock_rate, &vfd->fps, 1);
         
-        [strm->video_output setMinimumVideoFrameInterval:
-                            (1.0f * vfd->fps.denum / (double)vfd->fps.num)];
-        
-        strm->vout_delegate = [VOutDelegate alloc];
+        if ([strm->video_output
+             respondsToSelector:@selector(setMinimumVideoFrameInterval)])
+        {
+            [strm->video_output setMinimumVideoFrameInterval:
+                                (1.0f * vfd->fps.denum /
+                                 (double)vfd->fps.num)];
+        }
+        
+        strm->vout_delegate = [[VOutDelegate alloc]init];
         strm->vout_delegate->stream = strm;
         [strm->video_output setDelegate:strm->vout_delegate];
@@ -547 +572 @@
         if (![stream->cap_session isRunning])
             return PJ_EUNKNOWN;
-    }
-    
-    CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false);
-    
+        
+        CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false);
+    }
+
     return PJ_SUCCESS;
 }
@@ -599 +624 @@
     }
 
+//    [stream->apool release];
     pj_pool_release(stream->pool);