Changeset 3484

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.

Location:

pjproject/branches/projects/2.0-dev/pjmedia

Files:

• build/Makefile (modified) (2 diffs)
• build/os-auto.mak.in (modified) (1 diff)
• include/pjmedia_videodev.h (modified) (1 diff)
• src/pjmedia-videodev/qt_dev.m (modified) (1 diff)
• src/test/main.c (modified) (1 diff)
• src/test/vid_dev_test.c (modified) (5 diffs)
• src/test/vid_dev_test_m.m (deleted)

pjproject/branches/projects/2.0-dev/pjmedia/build/Makefile

@@ -29 +29 @@
                    $(CC_INC)../../pjlib/include \
                    $(CC_INC)../../pjlib-util/include \
+                   $(CC_INC)../../pjmedia/include \
                    $(CC_INC)../../pjnath/include \
                    $(CC_INC)../.. \
@@ -120 +121 @@
 export PJMEDIA_TEST_SRCDIR = ../src/test
 export PJMEDIA_TEST_OBJS += codec_vectors.o jbuf_test.o main.o mips_test.o \
-                            vid_codec_test.o rtp_test.o test.o
+                            vid_codec_test.o vid_dev_test.o rtp_test.o test.o
 export PJMEDIA_TEST_OBJS += sdp_neg_test.o 
 export PJMEDIA_TEST_CFLAGS += $(_CFLAGS)

pjproject/branches/projects/2.0-dev/pjmedia/build/os-auto.mak.in

@@ -167 +167 @@
 # Mac OS specific, use obj-c
 export PJMEDIA_VIDEODEV_OBJS += sdl_dev_m.o
-export PJMEDIA_TEST_OBJS += vid_dev_test_m.o
 else
 # Other platforms, compile .c
 export PJMEDIA_VIDEODEV_OBJS += sdl_dev.o
-export PJMEDIA_TEST_OBJS += vid_dev_test.o
 endif

pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia_videodev.h

@@ -28 +28 @@
 #include <pjmedia-videodev/videodev_imp.h>
 
+#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
+#   if PJMEDIA_VIDEO_DEV_HAS_SDL
+#       include <SDL.h>
+#endif
+#endif
+
 #endif  /* __PJMEDIA_VIDEODEV_H__ */

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

@@ -549 +549 @@
     }
     
+    CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false);
+    
     return PJ_SUCCESS;
 }

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

@@ -19 +19 @@
  */
 #include "test.h"
+#include <pjmedia_videodev.h>
 
  

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;