Changeset 3981 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Mar 22, 2012 3:29:56 AM (12 years ago)

Author:

nanang

Message:

Re #1467: fix sound device (opened/closed) status check in check_snd_dev_idle(), especially when sound device is managed by app (no_snd = PJ_TRUE). Note that pjsua_media_subsys_destroy() always close the sound device first, so check_snd_dev_idle() in pjsua_destroy() sequence should have been just a no-operation.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -279 +279 @@
     unsigned call_cnt;
 
+    /* Check if the sound device auto-close feature is disabled. */
+    if (pjsua_var.media_cfg.snd_auto_close_time < 0)
+        return;
+
+    /* Check if the sound device is currently closed. */
+    if (!pjsua_var.snd_is_on)
+        return;
+
     /* Get the call count, we shouldn't close the sound device when there is
      * any calls active.
@@ -305 +313 @@
      * 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 ||
-            pjsua_var.no_snd) &&
-        pjsua_var.snd_idle_timer.id == PJ_FALSE &&
-        pjmedia_conf_get_connect_count(pjsua_var.mconf) == 0 &&
+    if (pjsua_var.snd_idle_timer.id == PJ_FALSE &&
         call_cnt == 0 &&
-        pjsua_var.media_cfg.snd_auto_close_time >= 0)
+        pjmedia_conf_get_connect_count(pjsua_var.mconf) == 0)
     {
         pj_time_val delay;
@@ -3838 +3841 @@
     }
 
+    pjsua_var.snd_is_on = PJ_TRUE;
+
     pj_log_pop_indent();
     return PJ_SUCCESS;