Changeset 4622 for pjproject/trunk/pjmedia/src/pjmedia/echo_speex.c

Timestamp:

Oct 21, 2013 3:11:14 AM (11 years ago)

Author:

nanang

Message:

Close #1705: Added playback and capture callbacks for echo canceller algo. Note that this changeset also modified current Speex AEC algo behaviors:

• applied this two APIs model for Speex AEC algo
• enabled Speex AGC preprocessing

File:

• pjproject/trunk/pjmedia/src/pjmedia/echo_speex.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/echo_speex.c

@@ -110 +110 @@
 #endif
 
+    /* Enable AGC */
+    {
+        spx_int32_t enabled = 1;
+        speex_preprocess_ctl(echo->preprocess, SPEEX_PREPROCESS_SET_AGC, 
+                             &enabled);
+    }
+
     /* Control echo cancellation in the preprocessor */
    speex_preprocess_ctl(echo->preprocess, SPEEX_PREPROCESS_SET_ECHO_STATE, 
@@ -190 +197 @@
 }
 
+/*
+ * Let AEC know that a frame was queued to be played.
+ */
+PJ_DEF(pj_status_t) speex_aec_playback( void *state,
+                                        pj_int16_t *play_frm )
+{
+    speex_ec *echo = (speex_ec*) state;
+
+    /* Sanity checks */
+    PJ_ASSERT_RETURN(echo && play_frm, PJ_EINVAL);
+
+    speex_echo_playback(echo->state, (spx_int16_t*)play_frm);
+
+    return PJ_SUCCESS;
+
+}
+
+/*
+ * Perform echo cancellation to captured frame.
+ */
+PJ_DEF(pj_status_t) speex_aec_capture( void *state,
+                                       pj_int16_t *rec_frm,
+                                       unsigned options )
+{
+    speex_ec *echo = (speex_ec*) state;
+
+    /* Sanity checks */
+    PJ_ASSERT_RETURN(echo && rec_frm, PJ_EINVAL);
+
+    PJ_UNUSED_ARG(options);
+
+    /* Cancel echo */
+    pjmedia_copy_samples(echo->tmp_frame, rec_frm, echo->samples_per_frame);
+    speex_echo_capture(echo->state,
+                       (spx_int16_t*)echo->tmp_frame,
+                       (spx_int16_t*)rec_frm);
+
+    /* Apply preprocessing */
+    speex_preprocess_run(echo->preprocess, (spx_int16_t*)rec_frm);
+
+    return PJ_SUCCESS;
+}
+
+
 #endif