Ignore:
Timestamp:
Mar 9, 2009 12:55:29 PM (12 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:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp

    r2491 r2492  
    12061206    param->samples_per_frame = af->dev_info.default_samples_per_sec * 20 / 1000; 
    12071207    param->bits_per_sample = BITS_PER_SAMPLE; 
    1208     param->flags = af->dev_info.caps; 
     1208    param->flags = PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE; 
    12091209    param->ext_fmt.id = PJMEDIA_FORMAT_L16; 
    1210     param->out_route = PJMEDIA_AUD_DEV_ROUTE_EARPIECE; 
     1210    param->output_route = PJMEDIA_AUD_DEV_ROUTE_EARPIECE; 
    12111211 
    12121212    return PJ_SUCCESS; 
     
    13011301    aps_setting.cng = aps_setting.vad; 
    13021302    aps_setting.loudspk =  
    1303                 strm->param.out_route==PJMEDIA_AUD_DEV_ROUTE_LOUDSPEAKER; 
     1303                strm->param.output_route==PJMEDIA_AUD_DEV_ROUTE_LOUDSPEAKER; 
    13041304 
    13051305    /* Set audio engine callbacks. */ 
     
    13761376    case PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE:  
    13771377        if (strm->param.dir & PJMEDIA_DIR_PLAYBACK) { 
    1378             *(pjmedia_aud_dev_route*)pval = strm->param.out_route; 
     1378            *(pjmedia_aud_dev_route*)pval = strm->param.output_route; 
    13791379            status = PJ_SUCCESS; 
    13801380        } 
     
    14501450            } 
    14511451            if (status == PJ_SUCCESS) 
    1452                 strm->param.out_route = r;  
     1452                strm->param.output_route = r;  
    14531453        } 
    14541454        break; 
Note: See TracChangeset for help on using the changeset viewer.