Changeset 2679 for pjproject/trunk

Timestamp:

May 6, 2009 7:08:43 PM (16 years ago)

Author:

bennylp

Message:

Ticket #824: Race condition in sound auto-close feature may cause sound device to not be opened

File:

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

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

@@ -523 +523 @@
     PJ_UNUSED_ARG(th);
 
-    PJ_LOG(4,(THIS_FILE,"Closing sound device after idle for %d seconds", 
-              pjsua_var.media_cfg.snd_auto_close_time));
-
-    entry->id = PJ_FALSE;
-
-    close_snd_dev();
+    PJSUA_LOCK();
+    if (entry->id) {
+        PJ_LOG(4,(THIS_FILE,"Closing sound device after idle for %d seconds", 
+                  pjsua_var.media_cfg.snd_auto_close_time));
+
+        entry->id = PJ_FALSE;
+
+        close_snd_dev();
+    }
+    PJSUA_UNLOCK();
 }
 
@@ -1667 +1671 @@
 {
     /* 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();