Changeset 4982

Timestamp:

Feb 11, 2015 5:15:29 AM (10 years ago)

Author:

nanang

Message:

Close #1814: Add audio frame preview callbacks.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/sound_port.h (modified) (1 diff)
• pjmedia/src/pjmedia/sound_port.c (modified) (7 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_aud.c (modified) (2 diffs)

pjproject/trunk/pjmedia/include/pjmedia/sound_port.h

@@ -96 +96 @@
      */
     unsigned ec_options;
+
+    /**
+     * Arbitrary user data for playback and record preview callbacks below.
+     */
+    void *user_data;
+
+    /**
+     * Optional callback for audio frame preview right before queued to
+     * the speaker.
+     * Notes:
+     * - application MUST NOT block or perform long operation in the callback
+     *   as the callback may be executed in sound device thread
+     * - when using software echo cancellation, application MUST NOT modify
+     *   the audio data from within the callback, otherwise the echo canceller
+     *   will not work properly.
+     * - the return value of the callback will be ignored
+     */
+    pjmedia_aud_play_cb on_play_frame;
+
+    /**
+     * Optional callback for audio frame preview recorded from the microphone
+     * before being processed by any media component such as software echo
+     * canceller.
+     * Notes:
+     * - application MUST NOT block or perform long operation in the callback
+     *   as the callback may be executed in sound device thread
+     * - when using software echo cancellation, application MUST NOT modify
+     *   the audio data from within the callback, otherwise the echo canceller
+     *   will not work properly.
+     * - the return value of the callback will be ignored
+     */
+    pjmedia_aud_rec_cb on_rec_frame;
 
 } pjmedia_snd_port_param;

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

@@ -62 +62 @@
     unsigned             ec_suspend_count;
     unsigned             ec_suspend_limit;
+
+    /* audio frame preview callbacks */
+    void                *user_data;
+    pjmedia_aud_play_cb  on_play_frame;
+    pjmedia_aud_rec_cb   on_rec_frame;
 };
 
@@ -101 +106 @@
     }
 
+    /* Invoke preview callback */
+    if (snd_port->on_play_frame)
+        (*snd_port->on_play_frame)(snd_port->user_data, frame);
 
     return PJ_SUCCESS;
@@ -121 +129 @@
     }
 
+    /* Invoke preview callback */
+    if (snd_port->on_play_frame)
+        (*snd_port->on_play_frame)(snd_port->user_data, frame);
+
     return PJ_SUCCESS;
 }
@@ -135 +147 @@
 
     pjmedia_clock_src_update(&snd_port->cap_clocksrc, &frame->timestamp);
+
+    /* Invoke preview callback */
+    if (snd_port->on_rec_frame)
+        (*snd_port->on_rec_frame)(snd_port->user_data, frame);
 
     port = snd_port->port;
@@ -167 +183 @@
     pjmedia_port_get_frame(port, frame);
 
+    /* Invoke preview callback */
+    if (snd_port->on_play_frame)
+        (*snd_port->on_play_frame)(snd_port->user_data, frame);
+
     return PJ_SUCCESS;
 }
@@ -179 +199 @@
     pjmedia_snd_port *snd_port = (pjmedia_snd_port*) user_data;
     pjmedia_port *port;
+
+    /* Invoke preview callback */
+    if (snd_port->on_rec_frame)
+        (*snd_port->on_rec_frame)(snd_port->user_data, frame);
 
     port = snd_port->port;
@@ -465 +489 @@
     snd_port->options = prm->options;
     snd_port->prm_ec_options = prm->ec_options;
+    snd_port->user_data = prm->user_data;
+    snd_port->on_play_frame = prm->on_play_frame;
+    snd_port->on_rec_frame = prm->on_rec_frame;
 
     ptime_usec = prm->base.samples_per_frame * 1000 / prm->base.channel_count /

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -5812 +5812 @@
      */
     pj_bool_t no_rtcp_sdes_bye;
+
+    /**
+     * Optional callback for audio frame preview right before queued to
+     * the speaker.
+     * Notes:
+     * - application MUST NOT block or perform long operation in the callback
+     *   as the callback may be executed in sound device thread
+     * - when using software echo cancellation, application MUST NOT modify
+     *   the audio data from within the callback, otherwise the echo canceller
+     *   will not work properly.
+     */
+    void (*on_aud_prev_play_frame)(pjmedia_frame *frame);
+
+    /**
+     * Optional callback for audio frame preview recorded from the microphone
+     * before being processed by any media component such as software echo
+     * canceller.
+     * Notes:
+     * - application MUST NOT block or perform long operation in the callback
+     *   as the callback may be executed in sound device thread
+     * - when using software echo cancellation, application MUST NOT modify
+     *   the audio data from within the callback, otherwise the echo canceller
+     *   will not work properly.
+     */
+    void (*on_aud_prev_rec_frame)(pjmedia_frame *frame);
 };
 

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

@@ -1678 +1678 @@
 }
 
+static pj_status_t on_aud_prev_play_frame(void *user_data, pjmedia_frame *frame)
+{
+    PJ_UNUSED_ARG(user_data);
+    (*pjsua_var.media_cfg.on_aud_prev_play_frame)(frame);
+    return PJ_SUCCESS;
+}
+
+static pj_status_t on_aud_prev_rec_frame(void *user_data, pjmedia_frame *frame)
+{
+    PJ_UNUSED_ARG(user_data);
+    (*pjsua_var.media_cfg.on_aud_prev_rec_frame)(frame);
+    return PJ_SUCCESS;
+}
+
 /* Open sound device with the setting. */
 static pj_status_t open_snd_dev(pjmedia_snd_port_param *param)
@@ -1705 +1719 @@
     PJ_ASSERT_RETURN(pjsua_var.snd_pool, PJ_ENOMEM);
 
+    /* Setup preview callbacks, if configured */
+    if (pjsua_var.media_cfg.on_aud_prev_play_frame)
+        param->on_play_frame = &on_aud_prev_play_frame;
+    if (pjsua_var.media_cfg.on_aud_prev_rec_frame)
+        param->on_rec_frame = &on_aud_prev_rec_frame;
 
     PJ_LOG(4,(THIS_FILE, "Opening sound device %s@%d/%d/%dms",