Changeset 1336

Timestamp:

Jun 2, 2007 12:12:29 AM (17 years ago)

Author:

bennylp

Message:

Fixed assertion error caused by different samples_per_frame settings in stereo_demo() in pjsua

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (3 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -3143 +3143 @@
 {
     pjmedia_port *conf, *splitter, *ch1;
-    unsigned clock;
     pj_status_t status;
 
@@ -3149 +3148 @@
     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);
@@ -3183 +3180 @@
     /* 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);