From c98311a567a27296937bd00d01bac63a7029a27f Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Sat, 2 Jun 2007 00:12:29 +0000 Subject: Fixed assertion error caused by different samples_per_frame settings in stereo_demo() in pjsua git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1336 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip-apps/src/pjsua/pjsua_app.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c index fc86225a..1b9584b8 100644 --- a/pjsip-apps/src/pjsua/pjsua_app.c +++ b/pjsip-apps/src/pjsua/pjsua_app.c @@ -3142,20 +3142,17 @@ pj_status_t app_destroy(void) static void stereo_demo() { pjmedia_port *conf, *splitter, *ch1; - unsigned clock; pj_status_t status; /* Disable existing sound device */ conf = pjsua_set_no_snd_dev(); - clock = app_config.media_cfg.clock_rate; - /* Create stereo-mono splitter/combiner */ status = pjmedia_splitcomb_create(app_config.pool, - clock /* clock rate */, + conf->info.clock_rate /* clock rate */, 2 /* stereo */, - clock*2*10/1000/* 10ms samples * 2ch */, - 16 /* bits */, + 2 * conf->info.samples_per_frame, + conf->info.bits_per_sample, 0 /* options */, &splitter); pj_assert(status == PJ_SUCCESS); @@ -3182,10 +3179,10 @@ static void stereo_demo() /* Create sound device */ status = pjmedia_snd_port_create(app_config.pool, -1, -1, - clock /* clock rate */, + conf->info.clock_rate, 2 /* stereo */, - clock*2*10/1000 /* 10 ms samples * 2ch */, - 16 /* bits */, + 2 * conf->info.samples_per_frame, + conf->info.bits_per_sample, 0, &app_config.snd); pj_assert(status == PJ_SUCCESS); -- cgit v1.2.3