Changeset 3484 for pjproject/branches/projects/2.0-dev/pjmedia/src/test/vid_dev_test.c

Timestamp:

Mar 24, 2011 3:20:05 PM (14 years ago)

Author:

ming

Message:

Re #1213:

• Move Mac OS' CFRunLoop object from vid_dev_test inside qt
• Remove NSApplication object management and auto release pool from vid_dev_test. Temporarily depend on SDLmain library for these.

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/test/vid_dev_test.c (modified) (5 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/test/vid_dev_test.c

@@ -24 +24 @@
 #include <pjmedia_videodev.h>
 
-#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
-#    include "TargetConditionals.h"
-#    if !TARGET_OS_IPHONE
-#       define VID_DEV_TEST_MAC_OS 1
-#    endif
-#endif
-
-#if VID_DEV_TEST_MAC_OS
-#   include <Foundation/NSAutoreleasePool.h>
-#   include <AppKit/NSApplication.h>
-#endif
-
 #define THIS_FILE "vid_dev_test.c"
 
@@ -144 +132 @@
 
     /* Sleep while the webcam is being displayed... */
-    for (i = 0; i < 15 && (!is_quitting); i++) {
-#if VID_DEV_TEST_MAC_OS
-        CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false);
-#endif
+    for (i = 0; i < 25 && (!is_quitting); i++) {
         pj_thread_sleep(100);
     }
@@ -208 +193 @@
 
     for (i = 0; i < 35 && (!is_quitting); i++) {
-#if VID_DEV_TEST_MAC_OS
-        CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false);
-#endif
         pj_thread_sleep(100);
     }
@@ -229 +211 @@
     int rc = 0;
     pj_status_t status;
-
-#if VID_DEV_TEST_MAC_OS
-    NSAutoreleasePool *apool = [[NSAutoreleasePool alloc] init];
-    
-    [NSApplication sharedApplication];
-#endif
     
     PJ_LOG(3, (THIS_FILE, "Video device tests.."));
@@ -255 +231 @@
     pjmedia_vid_subsys_shutdown();
     pj_pool_release(pool);
-
-#if VID_DEV_TEST_MAC_OS
-    [apool release];
-#endif
     
     return rc;