Changeset 3395 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/sdl_dev.c

Timestamp:

Dec 14, 2010 1:03:10 PM (13 years ago)

Author:

ming

Message:

Fixed #1183

• QT capture device for Mac
• iOS device for iOS (capture device only works for iOS 4.0 or above)
• Add NSAutoReleasePool for sdl_dev (Mac)
• Add NSAutoReleasePool for vid_dev_test (Mac)
• build system for compilation of Obj-C files (.m)

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (15 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/sdl_dev.c

@@ -25 +25 @@
 #if PJMEDIA_VIDEO_DEV_HAS_SDL
 
+#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
+#   include <Foundation/NSAutoreleasePool.h>
+#endif
+
 #include <SDL.h>
 
@@ -324 +328 @@
     pjmedia_video_format_detail *vfd;
 
+#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
+    NSAutoreleasePool *apool = [[NSAutoreleasePool alloc] init];
+#endif
+ 
     vfi = pjmedia_get_video_format_info(pjmedia_video_format_mgr_instance(),
                                         strm->param.fmt.id);
     if (!vfi || !sdl_info) {
         strm->status = PJMEDIA_EVID_BADFORMAT;
-        return strm->status;
+        goto on_return;
     }
 
@@ -335 +343 @@
     if (vfi->apply_fmt(vfi, &strm->vafp) != PJ_SUCCESS) {
         strm->status = PJMEDIA_EVID_BADFORMAT;
-        return strm->status;
+        goto on_return;
     }
 
@@ -342 +350 @@
         PJ_LOG(4, (THIS_FILE, "Cannot initialize SDL"));
         strm->status = PJMEDIA_EVID_INIT;
-        return strm->status;
+        goto on_return;
     }
 
@@ -355 +363 @@
     if (strm->screen == NULL) {
         strm->status = PJMEDIA_EVID_SYSERR;
-        return strm->status;
+        goto on_return;
     }
     SDL_WM_SetCaption("pjmedia-SDL video", NULL);
@@ -369 +377 @@
         if (strm->surf == NULL) {
             strm->status = PJMEDIA_EVID_SYSERR;
-            return strm->status;
+            goto on_return;
         }
     } else if (vfi->color_model == PJMEDIA_COLOR_MODEL_YUV) {
@@ -377 +385 @@
         if (strm->overlay == NULL) {
             strm->status = PJMEDIA_EVID_SYSERR;
-            return strm->status;
+            goto on_return;
         }
     }
@@ -390 +398 @@
             switch(sevent.type) {
                 case SDL_USEREVENT:
-                    return 0;
+                    goto on_return;
                 case SDL_MOUSEBUTTONDOWN:
                     pevent.event_type = PJMEDIA_EVENT_MOUSEBUTTONDOWN;
@@ -449 +457 @@
                         /* Destroy the stream */
                         sdl_stream_destroy(&strm->base);
-                        return 0;
+                        goto on_return;
                     }
 
@@ -461 +469 @@
                     SDL_Quit();
                     strm->screen = NULL;
-                    return 0;
+                    goto on_return;
                 default:
                     break;
@@ -469 +477 @@
     }
 
-    return 0;
+on_return:
+#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
+    [apool release];
+#endif
+    
+    return strm->status;
 }
 
@@ -599 +612 @@
 {
     struct sdl_stream *stream = (struct sdl_stream*)strm;
-
+    pj_status_t status = PJ_SUCCESS;
+#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
+    NSAutoreleasePool *apool = [[NSAutoreleasePool alloc] init];
+#endif
+  
     if (!stream->is_running) {
         stream->render_exited = PJ_TRUE;
-        return PJ_SUCCESS;
+        goto on_return;
     }
 
@@ -609 +626 @@
             if (SDL_LockSurface(stream->surf) < 0) {
                 PJ_LOG(3, (THIS_FILE, "Unable to lock SDL surface"));
-                return PJMEDIA_EVID_NOTREADY;
+                status = PJMEDIA_EVID_NOTREADY;
+                goto on_return;
             }
         }
@@ -625 +643 @@
         if (SDL_LockYUVOverlay(stream->overlay) < 0) {
             PJ_LOG(3, (THIS_FILE, "Unable to lock SDL overlay"));
-            return PJMEDIA_EVID_NOTREADY;
+            status = PJMEDIA_EVID_NOTREADY;
+            goto on_return;
         }
 
@@ -639 +658 @@
     }
 
-    return PJ_SUCCESS;
+on_return:
+#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
+    [apool release];
+#endif
+    
+    return status;
 }