Changeset 4079 for pjproject/branches/1.x/pjmedia/src/pjmedia/sound_port.c

Timestamp:

Apr 24, 2012 10:26:07 AM (12 years ago)

Author:

ming

Message:

Fixed #1494: Use EC options to determine whether to use device/software EC

File:

• pjproject/branches/1.x/pjmedia/src/pjmedia/sound_port.c (modified) (3 diffs)

pjproject/branches/1.x/pjmedia/src/pjmedia/sound_port.c

@@ -226 +226 @@
     if (param_copy.flags & PJMEDIA_AUD_DEV_CAP_EC) {
         /* EC is wanted */
-        if (snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC) {
+        if ((snd_port->prm_ec_options & PJMEDIA_ECHO_USE_SW_ECHO) == 0 &&
+            snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC)
+        {
             /* Device supports EC */
             /* Nothing to do */
         } else {
-            /* Device doesn't support EC, remove EC settings from
+            /* Application wants to use software EC or device
+             * doesn't support EC, remove EC settings from
              * device parameters
              */
@@ -262 +265 @@
                                   snd_port->samples_per_frame);
 
-    /* Create software EC if parameter specifies EC but device 
-     * doesn't support EC. Only do this if the format is PCM!
+    /* Create software EC if parameter specifies EC and
+     * (app specifically requests software EC or device
+     * doesn't support EC). Only do this if the format is PCM!
      */
     if ((snd_port->aud_param.flags & PJMEDIA_AUD_DEV_CAP_EC) &&
-        (snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC)==0 &&
+        ((snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC)==0 ||
+         (snd_port->prm_ec_options & PJMEDIA_ECHO_USE_SW_ECHO) != 0) &&
         param_copy.ext_fmt.id == PJMEDIA_FORMAT_PCM)
     {
@@ -506 +511 @@
 
     /* Determine whether we use device or software EC */
-    if (snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC) {
+    if ((snd_port->prm_ec_options & PJMEDIA_ECHO_USE_SW_ECHO) == 0 &&
+        snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC)
+    {
         /* We use device EC */
         pj_bool_t ec_enabled;