Changeset 3579

Timestamp:

Jun 9, 2011 4:05:44 AM (13 years ago)

Author:

ming

Message:

Closed #1275: Change pjmedia_vid_subsys_xx() to pjmedia_vid_dev_subsys_xx()

Location:

pjproject/branches/projects/2.0-dev

Files:

• pjmedia/include/pjmedia-videodev/videodev.h (modified) (3 diffs)
• pjmedia/src/pjmedia-videodev/videodev.c (modified) (6 diffs)
• pjmedia/src/test/vid_codec_test.c (modified) (2 diffs)
• pjmedia/src/test/vid_dev_test.c (modified) (2 diffs)
• pjsip-apps/src/samples/aviplay.c (modified) (2 diffs)
• pjsip-apps/src/samples/simpleua.c (modified) (1 diff)
• pjsip-apps/src/samples/vid_streamutil.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

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

@@ -358 +358 @@
 
 /**
- * Initialize the video subsystem. This will register all supported video
- * device factories to the video subsystem. This function may be called
- * more than once, but each call to this function must have the
- * corresponding #pjmedia_vid_subsys_shutdown() call.
+ * Initialize the video device subsystem. This will register all supported
+ * video device factories to the video device subsystem. This function may be
+ * called more than once, but each call to this function must have the
+ * corresponding #pjmedia_vid_dev_subsys_shutdown() call.
  *
  * @param pf        The pool factory.
@@ -368 +368 @@
  *                  error code.
  */
-PJ_DECL(pj_status_t) pjmedia_vid_subsys_init(pj_pool_factory *pf);
-
-
-/**
- * Get the pool factory registered to the video subsystem.
+PJ_DECL(pj_status_t) pjmedia_vid_dev_subsys_init(pj_pool_factory *pf);
+
+
+/**
+ * Get the pool factory registered to the video device subsystem.
  *
  * @return          The pool factory.
  */
-PJ_DECL(pj_pool_factory*) pjmedia_vid_subsys_get_pool_factory(void);
-
-
-/**
- * Shutdown the video subsystem. This will destroy all video device factories
- * registered in the video subsystem. Note that currently opened video streams
- * may or may not be closed, depending on the implementation of the video
- * device factories.
- *
- * @return          PJ_SUCCESS on successful operation or the appropriate
- *                  error code.
- */
-PJ_DECL(pj_status_t) pjmedia_vid_subsys_shutdown(void);
-
-
-/**
- * Register a supported video device factory to the video subsystem. This
- * function can only be called after calling #pjmedia_vid_subsys_init().
+PJ_DECL(pj_pool_factory*) pjmedia_vid_dev_subsys_get_pool_factory(void);
+
+
+/**
+ * Shutdown the video device subsystem. This will destroy all video device
+ * factories registered in the video device subsystem. Note that currently
+ * opened video streams may or may not be closed, depending on the
+ * implementation of the video device factories.
+ *
+ * @return          PJ_SUCCESS on successful operation or the appropriate
+ *                  error code.
+ */
+PJ_DECL(pj_status_t) pjmedia_vid_dev_subsys_shutdown(void);
+
+
+/**
+ * Register a supported video device factory to the video device subsystem.
+ * This function can only be called after calling
+ * #pjmedia_vid_dev_subsys_init().
  *
  * @param vdf       The video device factory.
@@ -405 +406 @@
 
 /**
- * Unregister an video device factory from the video subsystem. This
- * function can only be called after calling #pjmedia_vid_subsys_init().
+ * Unregister a video device factory from the video device subsystem. This
+ * function can only be called after calling #pjmedia_vid_dev_subsys_init().
  * Devices from this factory will be unlisted. If a device from this factory
  * is currently in use, then the behavior is undefined.

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

@@ -105 +105 @@
 };
 
-/* The video subsystem */
+/* The video device subsystem */
 static struct vid_subsys
 {
@@ -309 +309 @@
 }
 
-/* API: Initialize the video subsystem. */
-PJ_DEF(pj_status_t) pjmedia_vid_subsys_init(pj_pool_factory *pf)
+/* API: Initialize the video device subsystem. */
+PJ_DEF(pj_status_t) pjmedia_vid_dev_subsys_init(pj_pool_factory *pf)
 {
     unsigned i;
@@ -367 +367 @@
 }
 
-/* API: register an video device factory to the video subsystem. */
+/* API: register a video device factory to the video device subsystem. */
 PJ_DEF(pj_status_t)
 pjmedia_vid_register_factory(pjmedia_vid_dev_factory_create_func_ptr adf)
@@ -387 +387 @@
 }
 
-/* API: unregister an video device factory from the video subsystem. */
+/* API: unregister a video device factory from the video device subsystem. */
 PJ_DEF(pj_status_t)
 pjmedia_vid_unregister_factory(pjmedia_vid_dev_factory_create_func_ptr adf)
@@ -414 +414 @@
 }
 
-/* API: get the pool factory registered to the video subsystem. */
-PJ_DEF(pj_pool_factory*) pjmedia_vid_subsys_get_pool_factory(void)
+/* API: get the pool factory registered to the video device subsystem. */
+PJ_DEF(pj_pool_factory*) pjmedia_vid_dev_subsys_get_pool_factory(void)
 {
     return vid_subsys.pf;
 }
 
-/* API: Shutdown the video subsystem. */
-PJ_DEF(pj_status_t) pjmedia_vid_subsys_shutdown(void)
+/* API: Shutdown the video device subsystem. */
+PJ_DEF(pj_status_t) pjmedia_vid_dev_subsys_shutdown(void)
 {
     unsigned i;
@@ -433 +433 @@
     --vid_subsys.init_count;
 
-    for (i=0; i<vid_subsys.drv_cnt; ++i) {
-        deinit_driver(i);
-    }
-
-    vid_subsys.pf = NULL;
+    if (vid_subsys.init_count == 0) {
+        for (i=0; i<vid_subsys.drv_cnt; ++i) {
+            deinit_driver(i);
+        }
+
+        vid_subsys.pf = NULL;
+    }
     return PJ_SUCCESS;
 }

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

@@ -418 +418 @@
     pool = pj_pool_create(mem, "Vid codec test", 256, 256, 0);
 
-    status = pjmedia_vid_subsys_init(mem);
+    status = pjmedia_vid_dev_subsys_init(mem);
     if (status != PJ_SUCCESS)
         return -10;
@@ -436 +436 @@
 on_return:
     pjmedia_codec_ffmpeg_deinit();
-    pjmedia_vid_subsys_shutdown();
+    pjmedia_vid_dev_subsys_shutdown();
     pj_pool_release(pool);
     pj_log_set_level(orig_log_level);

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

@@ -277 +277 @@
     pj_status_t status;
     
-    status = pjmedia_vid_subsys_init(mem);
+    status = pjmedia_vid_dev_subsys_init(mem);
     if (status != PJ_SUCCESS)
         return -10;
@@ -290 +290 @@
 
 on_return:
-    pjmedia_vid_subsys_shutdown();
+    pjmedia_vid_dev_subsys_shutdown();
     
     return rc;

pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples/aviplay.c

@@ -481 +481 @@
     pjmedia_vid_codec_mgr_create(pool, NULL);
     
-    status = pjmedia_vid_subsys_init(&cp.factory);
+    status = pjmedia_vid_dev_subsys_init(&cp.factory);
     if (status != PJ_SUCCESS)
         goto on_return;
@@ -508 +508 @@
     pjmedia_codec_ffmpeg_deinit();
     pjmedia_aud_subsys_shutdown();
-    pjmedia_vid_subsys_shutdown();
+    pjmedia_vid_dev_subsys_shutdown();
     
     pjmedia_video_format_mgr_destroy(pjmedia_video_format_mgr_instance());

pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples/simpleua.c

@@ -383 +383 @@
     status = pjmedia_vid_codec_mgr_create(pool, NULL);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1);
-    status = pjmedia_vid_subsys_init(&cp.factory);
+    status = pjmedia_vid_dev_subsys_init(&cp.factory);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1);
 

pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples/vid_streamutil.c

@@ -566 +566 @@
 
     /* Init video subsystem */
-    pjmedia_vid_subsys_init(&cp.factory);
+    pjmedia_vid_dev_subsys_init(&cp.factory);
 
     /* Register all supported codecs */
@@ -912 +912 @@
 
     /* Shutdown video subsystem */
-    pjmedia_vid_subsys_shutdown();
+    pjmedia_vid_dev_subsys_shutdown();
 
     /* Release application pool */

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c

@@ -298 +298 @@
     }
 
-    status = pjmedia_vid_subsys_init(&pjsua_var.cp.factory);
+    status = pjmedia_vid_dev_subsys_init(&pjsua_var.cp.factory);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Error creating PJMEDIA video subsystem",
@@ -541 +541 @@
         /* Videodev */
 #       if PJMEDIA_HAS_VIDEO
-            pjmedia_vid_subsys_shutdown();
+            pjmedia_vid_dev_subsys_shutdown();
 #       endif