Changeset 2492 for pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp

Timestamp:

Mar 9, 2009 12:55:29 PM (15 years ago)

Author:

bennylp

Message:

PJMEDIA/PJMEDIA-AUDIODEV update:

• pjmedia.h: re-added inclusion of <sound.h> since we have compat

layer now

• audiodev.h:
  • added input_vol and output_vol in pjmedia_aud_param, and

implement it on WMME dev

• added pjmedia_aud_dev_cap_name() to see cap name
• added pjmedia_aud_param_set_cap() and pjmedia_aud_param_get_cap() to set and get specific capability in param

• conference.h: exported PJMEDIA_CONF_BRIDGE_SIGNATURE and

PJMEDIA_CONF_SWITCH_SIGNATURE since these are needed by PJSUA-LIB

• WMME: bug due to addition of input_vol and output_vol in param:

volumes are set in flags in default_param(), but the
fields are not set. This would cause audio volume to be set to
zero for example.

• WMME: some refactoring, removed duplicate settings in param
• WMME: bug: setting set in set_cap() is not saved to param, so

get_param() will return wrong setting

• APS: update because of s/out_route/output_route/ in param
• APS: same bug as WMME due to addition of input_vol and output_vol in

param: flags are set in param but the fields are not

File:

• pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp (modified) (4 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp

@@ -1206 +1206 @@
     param->samples_per_frame = af->dev_info.default_samples_per_sec * 20 / 1000;
     param->bits_per_sample = BITS_PER_SAMPLE;
-    param->flags = af->dev_info.caps;
+    param->flags = PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE;
     param->ext_fmt.id = PJMEDIA_FORMAT_L16;
-    param->out_route = PJMEDIA_AUD_DEV_ROUTE_EARPIECE;
+    param->output_route = PJMEDIA_AUD_DEV_ROUTE_EARPIECE;
 
     return PJ_SUCCESS;
@@ -1301 +1301 @@
     aps_setting.cng = aps_setting.vad;
     aps_setting.loudspk = 
-                strm->param.out_route==PJMEDIA_AUD_DEV_ROUTE_LOUDSPEAKER;
+                strm->param.output_route==PJMEDIA_AUD_DEV_ROUTE_LOUDSPEAKER;
 
     /* Set audio engine callbacks. */
@@ -1376 +1376 @@
     case PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE: 
         if (strm->param.dir & PJMEDIA_DIR_PLAYBACK) {
-            *(pjmedia_aud_dev_route*)pval = strm->param.out_route;
+            *(pjmedia_aud_dev_route*)pval = strm->param.output_route;
             status = PJ_SUCCESS;
         }
@@ -1450 +1450 @@
             }
             if (status == PJ_SUCCESS)
-                strm->param.out_route = r; 
+                strm->param.output_route = r; 
         }
         break;