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 /pjsip-apps/src/samples/auddemo.c | |
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 'pjsip-apps/src/samples/auddemo.c')
-rw-r--r-- | pjsip-apps/src/samples/auddemo.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pjsip-apps/src/samples/auddemo.c b/pjsip-apps/src/samples/auddemo.c index 3c97b0db..48bcad4e 100644 --- a/pjsip-apps/src/samples/auddemo.c +++ b/pjsip-apps/src/samples/auddemo.c @@ -144,7 +144,7 @@ static void show_dev_info(unsigned index) strcat(formats, "unknown/"); break; } - sprintf(bitrate, "%u", info.ext_fmt[i].bitrate); + sprintf(bitrate, "%u", info.ext_fmt[i].det.aud.avg_bps); strcat(formats, bitrate); strcat(formats, " "); } @@ -276,10 +276,10 @@ static void record(unsigned rec_index, const char *filename) } param.dir = PJMEDIA_DIR_CAPTURE; - param.clock_rate = wav->info.clock_rate; - param.samples_per_frame = wav->info.samples_per_frame; - param.channel_count = wav->info.channel_count; - param.bits_per_sample = wav->info.bits_per_sample; + param.clock_rate = PJMEDIA_PIA_SRATE(&wav->info); + param.samples_per_frame = PJMEDIA_PIA_SPF(&wav->info); + param.channel_count = PJMEDIA_PIA_CCNT(&wav->info); + param.bits_per_sample = PJMEDIA_PIA_BITS(&wav->info); status = pjmedia_aud_stream_create(¶m, &wav_rec_cb, NULL, wav, &strm); @@ -343,10 +343,10 @@ static void play_file(unsigned play_index, const char *filename) } param.dir = PJMEDIA_DIR_PLAYBACK; - param.clock_rate = wav->info.clock_rate; - param.samples_per_frame = wav->info.samples_per_frame; - param.channel_count = wav->info.channel_count; - param.bits_per_sample = wav->info.bits_per_sample; + param.clock_rate = PJMEDIA_PIA_SRATE(&wav->info); + param.samples_per_frame = PJMEDIA_PIA_SPF(&wav->info); + param.channel_count = PJMEDIA_PIA_CCNT(&wav->info); + param.bits_per_sample = PJMEDIA_PIA_BITS(&wav->info); status = pjmedia_aud_stream_create(¶m, NULL, &wav_play_cb, wav, &strm); |