Changeset 3999 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_aud.c

Timestamp:

Mar 30, 2012 7:10:13 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/src/pjsua-lib/pjsua_aud.c (modified) (20 diffs)

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

@@ -27 +27 @@
 
 /*****************************************************************************
-/*
+ *
  * Prototypes
  */
@@ -44 +44 @@
 
 /*****************************************************************************
-/*
+ *
  * Call API that are closely tied to PJMEDIA
  */
@@ -224 +224 @@
 
 /*****************************************************************************
-/*
+ *
  * Audio media with PJMEDIA backend
  */
@@ -807 +807 @@
     pj_log_push_indent();
 
+    PJSUA_LOCK();
+
     /* If sound device idle timer is active, cancel it first. */
-    PJSUA_LOCK();
     if (pjsua_var.snd_idle_timer.id) {
         pjsip_endpt_cancel_timer(pjsua_var.endpt, &pjsua_var.snd_idle_timer);
         pjsua_var.snd_idle_timer.id = PJ_FALSE;
     }
-    PJSUA_UNLOCK();
 
 
@@ -911 +911 @@
             !pjsua_var.no_snd)
         {
-            pj_status_t status;
-
             status = pjsua_set_snd_dev(pjsua_var.cap_dev, pjsua_var.play_dev);
             if (status != PJ_SUCCESS) {
@@ -927 +925 @@
     }
 
-    status = pjmedia_conf_connect_port(pjsua_var.mconf, source, sink, 0);
-
 on_return:
+    PJSUA_UNLOCK();
+
+    if (status == PJ_SUCCESS) {
+        status = pjmedia_conf_connect_port(pjsua_var.mconf, source, sink, 0);
+    }
+
     pj_log_pop_indent();
     return status;
@@ -1852 +1854 @@
     pj_log_push_indent();
 
+    PJSUA_LOCK();
+
     /* Null-sound */
     if (capture_dev==NULL_SND_DEV_ID && playback_dev==NULL_SND_DEV_ID) {
+        PJSUA_UNLOCK();
         status = pjsua_set_null_snd_dev();
         pj_log_pop_indent();
@@ -1904 +1909 @@
     pjsua_var.snd_is_on = PJ_TRUE;
 
+    PJSUA_UNLOCK();
     pj_log_pop_indent();
     return PJ_SUCCESS;
 
 on_error:
+    PJSUA_UNLOCK();
     pj_log_pop_indent();
     return status;
@@ -1921 +1928 @@
                                       int *playback_dev)
 {
+    PJSUA_LOCK();
+
     if (capture_dev) {
         *capture_dev = pjsua_var.cap_dev;
@@ -1928 +1937 @@
     }
 
+    PJSUA_UNLOCK();
     return PJ_SUCCESS;
 }
@@ -1943 +1953 @@
     pj_log_push_indent();
 
+    PJSUA_LOCK();
 
     /* Close existing sound device */
@@ -1970 +1981 @@
         pjsua_perror(THIS_FILE, "Unable to create null sound device",
                      status);
+        PJSUA_UNLOCK();
         pj_log_pop_indent();
         return status;
@@ -1984 +1996 @@
     pjsua_var.snd_is_on = PJ_TRUE;
 
+    PJSUA_UNLOCK();
     pj_log_pop_indent();
     return PJ_SUCCESS;
@@ -1995 +2008 @@
 PJ_DEF(pjmedia_port*) pjsua_set_no_snd_dev(void)
 {
+    PJSUA_LOCK();
+
     /* Close existing sound device */
     close_snd_dev();
-
     pjsua_var.no_snd = PJ_TRUE;
+
+    PJSUA_UNLOCK();
+
     return pjmedia_conf_get_master_port(pjsua_var.mconf);
 }
@@ -2008 +2025 @@
 PJ_DEF(pj_status_t) pjsua_set_ec(unsigned tail_ms, unsigned options)
 {
+    pj_status_t status = PJ_SUCCESS;
+
+    PJSUA_LOCK();
+
     pjsua_var.media_cfg.ec_tail_len = tail_ms;
 
     if (pjsua_var.snd_port)
-        return pjmedia_snd_port_set_ec( pjsua_var.snd_port, pjsua_var.pool,
-                                        tail_ms, options);
-
-    return PJ_SUCCESS;
+        status = pjmedia_snd_port_set_ec(pjsua_var.snd_port, pjsua_var.pool,
+                                         tail_ms, options);
+
+    PJSUA_UNLOCK();
+    return status;
 }
 
@@ -2050 +2072 @@
         return PJMEDIA_EAUD_INVCAP;
     }
+
+    PJSUA_LOCK();
 
     /* If sound is active, set it immediately */
@@ -2061 +2085 @@
     }
 
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+        PJSUA_UNLOCK();
         return status;
+    }
 
     /* Save in internal param for later device open */
@@ -2070 +2096 @@
     }
 
+    PJSUA_UNLOCK();
     return status;
 }
@@ -2079 +2106 @@
                                            void *pval)
 {
+    pj_status_t status;
+
+    PJSUA_LOCK();
+
     /* If sound device has never been opened before, open it to
      * retrieve the initial setting from the device (e.g. audio
@@ -2094 +2125 @@
 
         strm = pjmedia_snd_port_get_snd_stream(pjsua_var.snd_port);
-        return pjmedia_aud_stream_get_cap(strm, cap, pval);
+        status = pjmedia_aud_stream_get_cap(strm, cap, pval);
     } else {
         /* Otherwise retrieve from internal param */
-        return pjmedia_aud_param_get_cap(&pjsua_var.aud_param,
-                                         cap, pval);
-    }
+        status = pjmedia_aud_param_get_cap(&pjsua_var.aud_param,
+                                           cap, pval);
+    }
+
+    PJSUA_UNLOCK();
+    return status;
 }