diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2011-07-19 03:42:28 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2011-07-19 03:42:28 +0000 |
| commit | cd283c8825c9a94400f27735acb1c9385e90ffc8 (patch) | |
| tree | 56d5722310fa8957ce5d1ba7cbd137cf8802dcc7 /pjmedia/src/pjmedia-audiodev | |
| parent | ed8f8d08abba9040f769e922aa0c1adbde86fbbc (diff) | |
Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn".
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3664 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia-audiodev')
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/audiodev.c | 4 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/wmme_dev.c | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pjmedia/src/pjmedia-audiodev/audiodev.c b/pjmedia/src/pjmedia-audiodev/audiodev.c index cb1ebbe2..437ee584 100644 --- a/pjmedia/src/pjmedia-audiodev/audiodev.c +++ b/pjmedia/src/pjmedia-audiodev/audiodev.c @@ -145,7 +145,7 @@ PJ_DEF(const char*) pjmedia_aud_dev_cap_name(pjmedia_aud_dev_cap cap, break; } - if (i==32) { + if (i==PJ_ARRAY_SIZE(cap_infos)) { *p_desc = "??"; return "??"; } @@ -190,9 +190,11 @@ static pj_status_t get_cap_pointer(const pjmedia_aud_param *param, case PJMEDIA_AUD_DEV_CAP_EC_TAIL: FIELD_INFO(ec_tail_ms); break; + /* vad is no longer in "fmt" in 2.0. case PJMEDIA_AUD_DEV_CAP_VAD: FIELD_INFO(ext_fmt.vad); break; + */ case PJMEDIA_AUD_DEV_CAP_CNG: FIELD_INFO(cng_enabled); break; diff --git a/pjmedia/src/pjmedia-audiodev/wmme_dev.c b/pjmedia/src/pjmedia-audiodev/wmme_dev.c index 9c7d4452..3a010226 100644 --- a/pjmedia/src/pjmedia-audiodev/wmme_dev.c +++ b/pjmedia/src/pjmedia-audiodev/wmme_dev.c @@ -372,12 +372,12 @@ static void build_dev_info(UINT deviceId, struct wmme_dev_info *wdi, /* Extended formats */ wdi->info.caps |= PJMEDIA_AUD_DEV_CAP_EXT_FORMAT; wdi->info.ext_fmt_cnt = 2; - wdi->info.ext_fmt[0].id = PJMEDIA_FORMAT_PCMU; - wdi->info.ext_fmt[0].bitrate = 64000; - wdi->info.ext_fmt[0].vad = 0; - wdi->info.ext_fmt[1].id = PJMEDIA_FORMAT_PCMA; - wdi->info.ext_fmt[1].bitrate = 64000; - wdi->info.ext_fmt[1].vad = 0; + pjmedia_format_init_audio(&wdi->info.ext_fmt[0], + PJMEDIA_FORMAT_PCMU, 8000, 1, 8, + 20000, 64000, 64000); + pjmedia_format_init_audio(&wdi->info.ext_fmt[0], + PJMEDIA_FORMAT_PCMA, 8000, 1, 8, + 20000, 64000, 64000); } /* API: init factory */ |