Changeset 4748 for pjproject/trunk/pjmedia/src/pjmedia-audiodev/bdimad_dev.c

Timestamp:

Feb 18, 2014 1:41:45 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1736: Update to bdSound's bdiMad audio device to support output routing. Thanks Andrea for the patch.

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/bdimad_dev.c (modified) (7 diffs)

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

@@ -319 +319 @@
         wf->dev_info[captureDeviceCount+i].deviceId = captureDeviceCount+i;
         wf->dev_info[captureDeviceCount+i].info.caps = 
-                                PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING;
+                                PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING | PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE;
         wf->dev_info[captureDeviceCount+i].info.default_samples_per_sec = 
                                 BD_IMAD_DEFAULT_FREQ;
@@ -426 +426 @@
     }
 
+        if(di->info.caps & PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE) {
+                param->output_route = PJMEDIA_AUD_DEV_ROUTE_LOUDSPEAKER;
+    }
+
     return PJ_SUCCESS;
 }
@@ -928 +932 @@
     }
 
+        if(cap == PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE) {
+                pjmedia_aud_dev_route outputRoute = *(pjmedia_aud_dev_route*)pval;
+                if(strm->param.output_route!=outputRoute)
+                        res = bdIMADpj_setRouteOutputDevice(strm->bdIMADpjInstance, (bdIMADpj_out_dev_route) outputRoute, &strm->bdIMADpjWarningPtr);
+                if(res == BD_PJ_OK) {
+                        strm->param.output_route = outputRoute;
+            return PJ_SUCCESS;
+        } else {
+            return PJMEDIA_AUDIODEV_ERRNO_FROM_BDIMAD(res);
+        }
+        }
+
     return PJMEDIA_EAUD_INVCAP;
 }
@@ -1012 +1028 @@
     }
 
+    if(param->flags & PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE) {
+                stream_set_capBDIMAD(&strm->base,
+                                PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE,
+                                 &param->output_route);
+        }
+
     strm->base.op = &stream_op;
     *p_aud_strm = &strm->base;
@@ -1060 +1082 @@
     {
         pi->flags |= PJMEDIA_AUD_DEV_CAP_EC;
+    }
+        if(stream_get_cap(s, PJMEDIA_AUD_DEV_CAP_EC, &pi->ec_enabled) == PJ_SUCCESS)
+    {
+        pi->flags |= PJMEDIA_AUD_DEV_CAP_EC;
+    }
+    
+
+    // Get the Route Output Device setting
+    if(stream_get_cap(s, PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE, &pi->output_route) == PJ_SUCCESS)
+    {
+        pi->flags |= PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE;
     }
 
@@ -1114 +1147 @@
             return PJMEDIA_AUDIODEV_ERRNO_FROM_BDIMAD(res);
         }
+    }
+    else if(cap == PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE) {
+                pjmedia_aud_dev_route routeOutDev;
+                res = bdIMADpj_getRouteOutputDevice(strm->bdIMADpjInstance,(bdIMADpj_out_dev_route*)&routeOutDev);
+            if(res == BD_PJ_OK) {
+                *(pjmedia_aud_dev_route*)pval = routeOutDev;
+                return PJ_SUCCESS;
+            } else {
+                return PJMEDIA_AUDIODEV_ERRNO_FROM_BDIMAD(res);
+            }
     } else {
         return PJMEDIA_EAUD_INVCAP;
@@ -1177 +1220 @@
 
 #if defined (_MSC_VER)
+#ifdef _DEBUG
+#pragma comment ( lib, "bdClientValidationd.lib" )
+#pragma comment ( lib, "bdIMADpjd.lib" )
+#else
 #pragma comment ( lib, "bdClientValidation.lib" )
 #pragma comment ( lib, "bdIMADpj.lib" )
 #endif
+#endif