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

Timestamp:

Mar 27, 2015 8:47:20 AM (9 years ago)

Author:

riza

Message:

Re #1833: Support bdSound's bdiMad v2.0.0

File:

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

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

@@ -5 +5 @@
  Author: bdSound Development Team (techsupport@bdsound.com)
  
- Date: 30/10/2012
- Version 1.0.206
-
- Copyright (c) 2012 bdSound s.r.l. (www.bdsound.com)
+ Date: 12/03/2015
+ Version 2.0.0 rev.1618
+
+ Copyright (c) 2015 bdSound s.r.l. (www.bdsound.com)
  All Rights Reserved.
  
@@ -37 +37 @@
 /* Only mono mode */
 #define BD_IMAD_MAX_CHANNELS                1                                  
-/* Frequency default value (admitted 8000 Hz, 16000 Hz, 32000 Hz and 48000Hz) */
+/* Frequency default value (admitted 8000 Hz, 16000 Hz, 32000 Hz, 44100 Hz and 48000 Hz) */
 #define BD_IMAD_DEFAULT_FREQ                48000                              
 /* Default milliseconds per buffer */
@@ -46 +46 @@
 #define BD_IMAD_STARTING_OUTPUT_VOLUME      100                                
 /* Diagnostic Enable/Disable */
-#define BD_IMAD_DIAGNOSTIC                  BD_IMAD_DIAGNOSTIC_DISABLE         
+#define BD_IMAD_DIAGNOSTIC                  BD_IMAD_DIAGNOSTIC_DISABLE
 
 /* Diagnostic folder path */ 
-wchar_t * bdImadPjDiagnosticFolderPath   = L"";                                
+#define BD_IMAD_DIAGNOSTIC_PATH  "/mnt/sdcard/MUSIC/"
+
+static wchar_t bdImadPjDiagnosticFolderPath[200];                          
 
 #define THIS_FILE            "bdimad_dev.c"
@@ -303 +305 @@
     for(i=0;i<captureDeviceCount;i++) {
         wf->dev_info[i].deviceId = i;
-        wf->dev_info[i].info.caps = PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING | 
-                                    PJMEDIA_AUD_DEV_CAP_EC;
+                bdIMADpj_getDeviceCapabilities(BD_IMAD_CAPTURE_DEVICES,&wf->dev_info[i].info.caps);
         wf->dev_info[i].info.default_samples_per_sec = BD_IMAD_DEFAULT_FREQ;
         strcpy(wf->dev_info[i].info.driver, "BD_IMAD");
@@ -318 +319 @@
     for(i=0;i<playbackDeviceCount;i++) {
         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_ROUTE;
+                bdIMADpj_getDeviceCapabilities(BD_IMAD_PLAYBACK_DEVICES,&wf->dev_info[captureDeviceCount+i].info.caps);
         wf->dev_info[captureDeviceCount+i].info.default_samples_per_sec = 
                                 BD_IMAD_DEFAULT_FREQ;
@@ -707 +707 @@
     strm->bdIMADpjSettingsPtr->FrameSize_ms = ptime;
     strm->bdIMADpjSettingsPtr->DiagnosticEnable = BD_IMAD_DIAGNOSTIC;
-    strm->bdIMADpjSettingsPtr->DiagnosticFolderPath = 
-                                            bdImadPjDiagnosticFolderPath;
+    mbstowcs(bdImadPjDiagnosticFolderPath, BD_IMAD_DIAGNOSTIC_PATH, strlen(BD_IMAD_DIAGNOSTIC_PATH));
+    strm->bdIMADpjSettingsPtr->DiagnosticFolderPath = bdImadPjDiagnosticFolderPath;
     strm->bdIMADpjSettingsPtr->validate = (void *)manage_code;
 
     if(prm->clock_rate != 8000 && prm->clock_rate != 16000 
-           && prm->clock_rate != 32000 && prm->clock_rate != 48000) {
+           && prm->clock_rate != 32000 && prm->clock_rate != 44100 && prm->clock_rate != 48000) {
         PJ_LOG(4, (THIS_FILE, 
-                   "BDIMAD support 8000 Hz, 16000 Hz, 32000 Hz and 48000 Hz "
+                   "BDIMAD support 8000 Hz, 16000 Hz, 32000 Hz, 44100 Hz and 48000 Hz "
                    "frequency."));
     }
@@ -767 +767 @@
                               BD_PARAM_IMAD_PJ_MIC_CONTROL_ENABLE, 
                               &auxInt);
+                
+                // Enable GUI Socket Communication [default->disabled]
+                bdIMADpj_enableGuiSocketCommunication(strm->bdIMADpjInstance,27000,0);
     }
 
@@ -934 +937 @@
         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);
+                res = bdIMADpj_setRouteOutputDevice(strm->bdIMADpjInstance, (bdIMADpj_out_dev_route) outputRoute, &strm->bdIMADpjWarningPtr);
                 if(res == BD_PJ_OK) {
                         strm->param.output_route = outputRoute;
@@ -1220 +1222 @@
 
 #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