Changeset 4467 for pjproject/trunk

Timestamp:

Apr 15, 2013 10:26:58 AM (12 years ago)

Author:

bennylp

Message:

Re #1656: add hardware echo cancellation capability to BB10 audio device

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/bb10_dev.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/bb10_dev.c

@@ -331 +331 @@
     pj_memcpy(info, &af->devs[index], sizeof(*info));
     info->caps = PJMEDIA_AUD_DEV_CAP_INPUT_LATENCY |
-                 PJMEDIA_AUD_DEV_CAP_OUTPUT_LATENCY;
+                 PJMEDIA_AUD_DEV_CAP_OUTPUT_LATENCY |
+                 PJMEDIA_AUD_DEV_CAP_EC;
 
     return PJ_SUCCESS;
@@ -824 +825 @@
                                            PLUGIN_DISABLE_MMAP)) < 0)
     {
-        TRACE_(("snd_pcm_plugin_set_disable failed: %d",ret));
+        TRACE_((THIS_FILE, "snd_pcm_plugin_set_disable failed: %d",ret));
         return PJMEDIA_EAUD_SYSERR;
     }
@@ -831 +832 @@
                                          PLUGIN_ROUTING)) < 0)
     {
-        TRACE_(("snd_pcm_plugin_set_enable failed: %d",ret));
+        TRACE_((THIS_FILE, "snd_pcm_plugin_set_enable failed: %d",ret));
         return PJMEDIA_EAUD_SYSERR;
     }
@@ -1022 +1023 @@
         return PJ_SUCCESS;
 
+    } else if (cap==PJMEDIA_AUD_DEV_CAP_EC &&
+               (stream->param.dir & PJMEDIA_DIR_CAPTURE))
+    {
+        /* EC is enablied implicitly by opening "voice" device */
+        *(pj_bool_t*)pval = PJ_TRUE;
+        return PJ_SUCCESS;
     } else {
         return PJMEDIA_EAUD_INVCAP;
@@ -1036 +1043 @@
                                        const void *value)
 {
-    pj_status_t ret = PJ_SUCCESS;
+
     struct bb10_stream *stream = (struct bb10_stream*)strm;
 
-    if (cap != PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE || value == NULL) {
-        TRACE_((THIS_FILE,"bb10_stream_set_cap() = PJMEDIA_EAUD_INVCAP"));
-        return PJMEDIA_EAUD_INVCAP; 
-
-    } else {
-        pjmedia_aud_dev_route route = *((pjmedia_aud_dev_route*)value);
+    if (cap==PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE &&
+        (stream->param.dir & PJMEDIA_DIR_PLAYBACK))
+    {
+        pjmedia_aud_dev_route route;
+        pj_status_t ret;
+
+        PJ_ASSERT_RETURN(value, PJ_EINVAL);
+
+        route = *((pjmedia_aud_dev_route*)value);
         /* Use the initialization function which lazy-inits the
          * handle for routing
@@ -1053 +1063 @@
             ret = bb10_initialize_playback_ctrl(stream,false);          
         }
-    }
-
-    if (ret != PJ_SUCCESS) {
-        TRACE_((THIS_FILE,"bb10_stream_set_cap() = %d",ret));
-    }
-    return ret;
+        return ret;
+
+    } else if (cap==PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE &&
+               (stream->param.dir & PJMEDIA_DIR_PLAYBACK))
+    {
+        /* EC is always enabled. Silently ignore the request */
+        return PJ_SUCCESS;
+    }
+
+    TRACE_((THIS_FILE,"bb10_stream_set_cap() = PJMEDIA_EAUD_INVCAP"));
+    return PJMEDIA_EAUD_INVCAP;
 }