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/mix.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/mix.c')
| -rw-r--r-- | pjsip-apps/src/samples/mix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pjsip-apps/src/samples/mix.c b/pjsip-apps/src/samples/mix.c index 513e5466..cc139f76 100644 --- a/pjsip-apps/src/samples/mix.c +++ b/pjsip-apps/src/samples/mix.c @@ -181,7 +181,7 @@ int main(int argc, char *argv[]) &wav_input[i].port) ); len = pjmedia_wav_player_get_len(wav_input[i].port); len = (pj_ssize_t)(len * 1.0 * clock_rate / - wav_input[i].port->info.clock_rate); + PJMEDIA_PIA_SRATE(&wav_input[i].port->info)); if (len > (pj_ssize_t)longest) longest = len; @@ -199,7 +199,7 @@ int main(int argc, char *argv[]) pjmedia_frame frame; frame.buf = framebuf; - frame.size = cp->info.samples_per_frame * 2; + frame.size = PJMEDIA_PIA_SPF(&cp->info) * 2; pj_assert(frame.size <= sizeof(framebuf)); CHECK( pjmedia_port_get_frame(cp, &frame) ); |