Close #1814: Add audio frame preview callbacks.

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4982 74dad513-b988-da41-8d7b-12977e46ad98

2 files changed, 44 insertions, 0 deletions

diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h
index 31c5378b..6325b70a 100644
--- a/pjsip/include/pjsua-lib/pjsua.h
+++ b/pjsip/include/pjsua-lib/pjsua.h
@@ -5811,6 +5811,31 @@ struct pjsua_media_config
      * Default: PJ_FALSE
      */
     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);
 };
 
 
diff --git a/pjsip/src/pjsua-lib/pjsua_aud.c b/pjsip/src/pjsua-lib/pjsua_aud.c
index 65c69979..921a5f61 100644
--- a/pjsip/src/pjsua-lib/pjsua_aud.c
+++ b/pjsip/src/pjsua-lib/pjsua_aud.c
@@ -1677,6 +1677,20 @@ static const char *get_fmt_name(pj_uint32_t id)
     return name;
 }
 
+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)
 {
@@ -1704,6 +1718,11 @@ static pj_status_t open_snd_dev(pjmedia_snd_port_param *param)
     pjsua_var.snd_pool = pjsua_pool_create("pjsua_snd", 4000, 4000);
     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",
 	      get_fmt_name(param->base.ext_fmt.id),