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

Timestamp:

Jul 14, 2011 8:46:19 AM (13 years ago)

Author:

ming

Message:

Re #1278: NSApplication and NSAutoreleasePool management for Mac OS X

Application now needs to call pj_run_app() from its main() function and pass a pointer to the application's main function. For some examples, please refer to aviplay, pjmedia_test, and pjsua.

File:

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

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

@@ -20 +20 @@
 #include "test.h"
 
-#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
-#   include <CoreFoundation/CFRunLoop.h>
-#endif
-
 #define THIS_FILE   "test.c"
 
@@ -37 +33 @@
 
 pj_pool_factory *mem;
-pj_bool_t is_quit = PJ_FALSE;
-pj_thread_t *thread;
-pj_caching_pool caching_pool;
-pj_pool_t *pool;
+
 
 void app_perror(pj_status_t status, const char *msg)
@@ -51 +44 @@
 }
 
-static int test_func(void *data)
+int test_main(void)
 {
     int rc = 0;
+    pj_caching_pool caching_pool;
+    pj_pool_t *pool;
+
+    pj_init();
+    pj_caching_pool_init(&caching_pool, &pj_pool_factory_default_policy, 0);
+    pool = pj_pool_create(&caching_pool.factory, "test", 1000, 512, NULL);
+
+    pj_log_set_decor(PJ_LOG_HAS_NEWLINE);
+    pj_log_set_level(3);
+
+    mem = &caching_pool.factory;
+
+    pjmedia_video_format_mgr_create(pool, 64, 0, NULL);
+    pjmedia_converter_mgr_create(pool, NULL);
+    pjmedia_vid_codec_mgr_create(pool, NULL);
 
 #if HAS_VID_PORT_TEST
@@ -62 +70 @@
     DO_TEST(vid_dev_test());
 #endif
-    
+
 #if HAS_VID_CODEC_TEST
     DO_TEST(vid_codec_test());
 #endif
-    
+
 #if HAS_SDP_NEG_TEST
     DO_TEST(sdp_neg_test());
@@ -82 +90 @@
     DO_TEST(codec_test_vectors());
 #endif
-    
+
     PJ_LOG(3,(THIS_FILE," "));
-    
+
 on_return:
     if (rc != 0) {
@@ -91 +99 @@
         PJ_LOG(3,(THIS_FILE,"Looks like everything is okay!"));
     }
-    
-    is_quit = PJ_TRUE;
-    return rc;
-}
-
-int test_main(void)
-{
-    int rc = 0;
-
-    pj_init();
-    pj_caching_pool_init(&caching_pool, &pj_pool_factory_default_policy, 0);
-    pool = pj_pool_create(&caching_pool.factory, "test", 1000, 512, NULL);
-    
-    pj_log_set_decor(PJ_LOG_HAS_NEWLINE);
-    pj_log_set_level(3);
-
-    mem = &caching_pool.factory;
-
-    pjmedia_video_format_mgr_create(pool, 64, 0, NULL);
-    pjmedia_converter_mgr_create(pool, NULL);
-    pjmedia_vid_codec_mgr_create(pool, NULL);
-
-#if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
-    {
-        if (pj_thread_create(pool, "test_func", test_func, NULL, 0, 0,
-                             &thread) == PJ_SUCCESS) {
-            while (!is_quit) {
-                CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false);
-            }
-        }
-        return 0;
-    }
-#else
-    rc = test_func(NULL);
-#endif
 
     pjmedia_video_format_mgr_destroy(pjmedia_video_format_mgr_instance());