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

Timestamp:

Jun 13, 2008 5:01:46 PM (16 years ago)

Author:

nanang

Message:

Ticket #540: Added pjsua-lib feature auto-close sound device on idle and new pjsua option --snd-auto-close=N

File:

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

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

@@ -23 +23 @@
 #define THIS_FILE               "pjsua_media.c"
 
-#define DEFAULT_RTP_PORT                        4000
+#define DEFAULT_RTP_PORT        4000
+
+#define NULL_SND_DEV_ID         -99
 
 #ifndef PJSUA_REQUIRE_CONSECUTIVE_RTCP_PORT
@@ -424 +426 @@
 }
 
+/* Timer callback to close sound device */
+static void close_snd_timer_cb( pj_timer_heap_t *th,
+                                pj_timer_entry *entry)
+{
+    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();
+}
+
 
 /*
@@ -445 +461 @@
     }
 
-    /* Create sound port if none is created yet */
-    if (pjsua_var.snd_port==NULL && pjsua_var.null_snd==NULL && 
-        !pjsua_var.no_snd) 
-    {
-        status = pjsua_set_snd_dev(pjsua_var.cap_dev, pjsua_var.play_dev);
-        if (status != PJ_SUCCESS) {
-            pjsua_perror(THIS_FILE, "Error opening sound device", status);
-            return status;
-        }
-    }
+    pj_timer_entry_init(&pjsua_var.snd_idle_timer, PJ_FALSE, NULL, 
+                        &close_snd_timer_cb);
 
     return PJ_SUCCESS;
@@ -1328 +1336 @@
                                         pjsua_conf_port_id sink)
 {
+    /* If sound device idle timer is active, cancel it first. */
+    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;
+    }
+
+    /* Create sound port if none is instantiated */
+    if (pjsua_var.snd_port==NULL && pjsua_var.null_snd==NULL && 
+        !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) {
+            pjsua_perror(THIS_FILE, "Error opening sound device", status);
+            return status;
+        }
+    }
+
     return pjmedia_conf_connect_port(pjsua_var.mconf, source, sink, 0);
 }
@@ -1338 +1365 @@
                                            pjsua_conf_port_id sink)
 {
-    return pjmedia_conf_disconnect_port(pjsua_var.mconf, source, sink);
+    pj_status_t status;
+
+    status = pjmedia_conf_disconnect_port(pjsua_var.mconf, source, sink);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    /* If no port is connected, sound device must be idle. Activate sound 
+     * device auto-close timer.
+     */
+    if ((pjsua_var.snd_port!=NULL || pjsua_var.null_snd!=NULL) && 
+        pjsua_var.snd_idle_timer.id==PJ_FALSE &&
+        pjmedia_conf_get_connect_count(pjsua_var.mconf) == 0 &&
+        pjsua_var.media_cfg.snd_auto_close_time >= 0)
+    {
+        pj_time_val delay;
+
+        delay.msec = 0;
+        delay.sec = pjsua_var.media_cfg.snd_auto_close_time;
+
+        pjsua_var.snd_idle_timer.id = PJ_TRUE;
+        pjsip_endpt_schedule_timer(pjsua_var.endpt, &pjsua_var.snd_idle_timer, 
+                                   &delay);
+    }
+
+    return status;
 }
 
@@ -1844 +1895 @@
         pjsua_var.null_snd = NULL;
     }
+
+    if (pjsua_var.snd_pool) 
+        pj_pool_release(pjsua_var.snd_pool);
+    pjsua_var.snd_pool = NULL;
 }
 
@@ -1864 +1919 @@
     pj_status_t status = -1;
 
+    /* Check if NULL sound device is used */
+    if (NULL_SND_DEV_ID == capture_dev || NULL_SND_DEV_ID == playback_dev) {
+        return pjsua_set_null_snd_dev();
+    }
+
     /* Close existing sound port */
     close_snd_dev();
 
+    /* Create memory pool for sound device. */
+    pjsua_var.snd_pool = pjsua_pool_create("pjsua_snd", 4000, 4000);
+    PJ_ASSERT_RETURN(pjsua_var.snd_pool, PJ_ENOMEM);
 
     /* Set default clock rate */
@@ -1888 +1951 @@
         /* Create the sound device. Sound port will start immediately. */
         fps = 1000 / pjsua_var.media_cfg.audio_frame_ptime;
-        status = pjmedia_snd_port_create(pjsua_var.pool, capture_dev,
+        status = pjmedia_snd_port_create(pjsua_var.snd_pool, capture_dev,
                                          playback_dev, 
                                          clock_rates[i], 
@@ -1915 +1978 @@
                 }
                 
-                status = pjmedia_resample_port_create(pjsua_var.pool, 
+                status = pjmedia_resample_port_create(pjsua_var.snd_pool, 
                                                       conf_port,
                                                       selected_clock_rate,
@@ -1949 +2012 @@
 
     /* Set AEC */
-    pjmedia_snd_port_set_ec( pjsua_var.snd_port, pjsua_var.pool, 
+    pjmedia_snd_port_set_ec( pjsua_var.snd_port, pjsua_var.snd_pool, 
                              pjsua_var.media_cfg.ec_tail_len, 
                              pjsua_var.media_cfg.ec_options);
@@ -2020 +2083 @@
     close_snd_dev();
 
+    /* Create memory pool for sound device. */
+    pjsua_var.snd_pool = pjsua_pool_create("pjsua_snd", 4000, 4000);
+    PJ_ASSERT_RETURN(pjsua_var.snd_pool, PJ_ENOMEM);
+
     PJ_LOG(4,(THIS_FILE, "Opening null sound device.."));
 
@@ -2029 +2096 @@
      * a null port.
      */
-    status = pjmedia_master_port_create(pjsua_var.pool, pjsua_var.null_port,
+    status = pjmedia_master_port_create(pjsua_var.snd_pool, pjsua_var.null_port,
                                         conf_port, 0, &pjsua_var.null_snd);
     if (status != PJ_SUCCESS) {
@@ -2040 +2107 @@
     status = pjmedia_master_port_start(pjsua_var.null_snd);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+
+    pjsua_var.cap_dev = NULL_SND_DEV_ID;
+    pjsua_var.play_dev = NULL_SND_DEV_ID;
 
     return PJ_SUCCESS;