Changeset 3632

Timestamp:

Jul 13, 2011 3:05:22 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1299: New callback to notify that sound device needs to be opened or closed

Location:

pjproject/branches/projects/2.0-dev

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (2 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (9 diffs)

pjproject/branches/projects/2.0-dev/pjsip-apps/src/pjsua/pjsua_app.c

@@ -3135 +3135 @@
 
 /*
+ * Notification on sound device operation.
+ */
+static pj_status_t on_snd_dev_operation(int operation)
+{
+    PJ_LOG(3,(THIS_FILE, "Turning sound device %s", (operation? "ON":"OFF")));
+    return PJ_SUCCESS;
+}
+
+/*
  * Print buddy list.
  */
@@ -5052 +5061 @@
     app_config.cfg.cb.on_transport_state = &on_transport_state;
     app_config.cfg.cb.on_ice_transport_error = &on_ice_transport_error;
+    app_config.cfg.cb.on_snd_dev_operation = &on_snd_dev_operation;
     app_config.log_cfg.cb = log_cb;
 

pjproject/branches/projects/2.0-dev/pjsip/include/pjsua-lib/pjsua.h

@@ -962 +962 @@
                                    pj_status_t status, void *param);
 
+    /**
+     * Callback when the sound device is about to be opened or closed.
+     * This callback will be called even when null sound device or no
+     * sound device is configured by the application (i.e. the
+     * #pjsua_set_null_snd_dev() and #pjsua_set_no_snd_dev() APIs).
+     * This API is mostly useful when the application wants to manage
+     * the sound device by itself (i.e. with #pjsua_set_no_snd_dev()),
+     * to get notified when it should open or close the sound device.
+     *
+     * @param operation The value will be set to 0 to signal that sound
+     *                  device is about to be closed, and 1 to be opened.
+     *
+     * @return          The callback must return PJ_SUCCESS at the moment.
+     */
+    pj_status_t (*on_snd_dev_operation)(int operation);
+
+
 } pjsua_callback;
 

pjproject/branches/projects/2.0-dev/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -401 +401 @@
     pjmedia_master_port *null_snd;  /**< Master port for null sound.    */
     pjmedia_port        *null_port; /**< Null port.                     */
-
+    pj_bool_t            snd_is_on; /**< Media flow is currently active */
 
     /* Video device */

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

@@ -377 +377 @@
      * It is idle when there is no port connection in the bridge and
      * there is no active call.
+     *
+     * Note: this block is now valid if no snd dev is used because of #1299
      */
-    if ((pjsua_var.snd_port!=NULL || pjsua_var.null_snd!=NULL) &&
+    if ((pjsua_var.snd_port!=NULL || pjsua_var.null_snd!=NULL ||
+            pjsua_var.no_snd) &&
         pjsua_var.snd_idle_timer.id == PJ_FALSE &&
         pjmedia_conf_get_connect_count(pjsua_var.mconf) == 0 &&
@@ -2422 +2425 @@
                 }
             }
+        } else if (pjsua_var.no_snd) {
+            if (!pjsua_var.snd_is_on) {
+                pjsua_var.snd_is_on = PJ_TRUE;
+                /* Notify app */
+                if (pjsua_var.ua_cfg.cb.on_snd_dev_operation) {
+                    (*pjsua_var.ua_cfg.cb.on_snd_dev_operation)(1);
+                }
+            }
         }
 
@@ -2438 +2449 @@
                 return status;
             }
-        }
-
+        } else if (pjsua_var.no_snd && !pjsua_var.snd_is_on) {
+            pjsua_var.snd_is_on = PJ_TRUE;
+            /* Notify app */
+            if (pjsua_var.ua_cfg.cb.on_snd_dev_operation) {
+                (*pjsua_var.ua_cfg.cb.on_snd_dev_operation)(1);
+            }
+        }
     }
 
@@ -3093 +3109 @@
     /* Close existing sound port */
     close_snd_dev();
+
+    /* Notify app */
+    if (pjsua_var.ua_cfg.cb.on_snd_dev_operation) {
+        (*pjsua_var.ua_cfg.cb.on_snd_dev_operation)(1);
+    }
 
     /* Create memory pool for sound device. */
@@ -3230 +3251 @@
 static void close_snd_dev(void)
 {
+    /* Notify app */
+    if (pjsua_var.snd_is_on && pjsua_var.ua_cfg.cb.on_snd_dev_operation) {
+        (*pjsua_var.ua_cfg.cb.on_snd_dev_operation)(0);
+    }
+
     /* Close sound device */
     if (pjsua_var.snd_port) {
@@ -3263 +3289 @@
         pj_pool_release(pjsua_var.snd_pool);
     pjsua_var.snd_pool = NULL;
+    pjsua_var.snd_is_on = PJ_FALSE;
 }
 
@@ -3325 +3352 @@
 
     pjsua_var.no_snd = PJ_FALSE;
+    pjsua_var.snd_is_on = PJ_TRUE;
 
     return PJ_SUCCESS;
@@ -3359 +3387 @@
     /* Close existing sound device */
     close_snd_dev();
+
+    /* Notify app */
+    if (pjsua_var.ua_cfg.cb.on_snd_dev_operation) {
+        (*pjsua_var.ua_cfg.cb.on_snd_dev_operation)(1);
+    }
 
     /* Create memory pool for sound device. */
@@ -3389 +3422 @@
 
     pjsua_var.no_snd = PJ_FALSE;
+    pjsua_var.snd_is_on = PJ_TRUE;
 
     return PJ_SUCCESS;