Changeset 744 for pjproject/trunk/pjmedia/src/pjmedia/sound_port.c

Timestamp:

Sep 27, 2006 10:49:55 PM (18 years ago)

Author:

bennylp

Message:

Added pjmedia_snd_stream_get_info() function.

NOTE SOUND DEVICE IMPLEMENTORS: YOU'LL NEED TO IMPLEMENT THIS

FUNCTION TOO *

File:

• pjproject/trunk/pjmedia/src/pjmedia/sound_port.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sound_port.c

@@ -125 +125 @@
         if (snd_port->ec_suspended) {
             snd_port->ec_suspended = PJ_FALSE;
+            //pjmedia_echo_state_reset(snd_port->ec_state);
             PJ_LOG(4,(THIS_FILE, "EC activated"));
         }
@@ -141 +142 @@
             snd_port->ec_suspended = PJ_TRUE;
             PJ_LOG(4,(THIS_FILE, "EC suspended because of inactivity"));
+        }
+        if (snd_port->ec_state) {
+            /* To maintain correct delay in EC */
+            pjmedia_echo_playback(snd_port->ec_state, output);
         }
     }
@@ -354 +359 @@
 
 /*
- * Create sound recorder port.
+ * Create sound recorder AEC.
  */
 PJ_DEF(pj_status_t) pjmedia_snd_port_create_rec( pj_pool_t *pool,
@@ -457 +462 @@
                                              unsigned options)
 {
+    pjmedia_snd_stream_info si;
     pj_status_t status;
 
@@ -464 +470 @@
                      PJ_EINVALIDOP);
 
+    /* Sound port must have 16bits per sample */
+    PJ_ASSERT_RETURN(snd_port->bits_per_sample == 16,
+                     PJ_EINVALIDOP);
+
     /* Destroy AEC */
     if (snd_port->ec_state) {
@@ -473 +483 @@
 
     if (tail_ms != 0) {
+        unsigned delay_ms;
+
+        status = pjmedia_snd_stream_get_info(snd_port->snd_stream, &si);
+        if (status != PJ_SUCCESS)
+            si.rec_latency = si.play_latency = 0;
+
+        delay_ms = (si.rec_latency + si.play_latency) * 1000 /
+                   snd_port->clock_rate;
         status = pjmedia_echo_create(pool, snd_port->clock_rate, 
                                     snd_port->samples_per_frame,