summaryrefslogtreecommitdiff
path: root/pjmedia/src
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2006-05-20 09:55:07 +0000
committerBenny Prijono <bennylp@teluu.com>2006-05-20 09:55:07 +0000
commit52047138ccfb664a2b574a8cf65a18206894f422 (patch)
treedeff6ab458a4099fff27822d6565d5a12d23d678 /pjmedia/src
parentb14a582ee3bc4dcdd2c1cfe38562e877993510e7 (diff)
Fixed crashed with the latest VAD changes
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@459 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src')
-rw-r--r--pjmedia/src/pjmedia/conference.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/pjmedia/src/pjmedia/conference.c b/pjmedia/src/pjmedia/conference.c
index e4f29f2c..0897d4ae 100644
--- a/pjmedia/src/pjmedia/conference.c
+++ b/pjmedia/src/pjmedia/conference.c
@@ -227,16 +227,6 @@ static pj_status_t create_conf_port( pj_pool_t *pool,
PJ_ASSERT_RETURN(conf_port->listeners, PJ_ENOMEM);
- /* Create and init vad. */
- status = pjmedia_silence_det_create( pool,
- port->info.clock_rate,
- port->info.samples_per_frame,
- &conf_port->vad);
- if (status != PJ_SUCCESS)
- return status;
-
- pjmedia_silence_det_set_fixed(conf_port->vad, 2);
-
/* Save some port's infos, for convenience. */
if (port) {
conf_port->port = port;
@@ -248,6 +238,18 @@ static pj_status_t create_conf_port( pj_pool_t *pool,
conf_port->samples_per_frame = conf->samples_per_frame;
}
+ /* Create and init vad. */
+ status = pjmedia_silence_det_create( pool,
+ conf_port->clock_rate,
+ conf_port->samples_per_frame,
+ &conf_port->vad);
+ if (status != PJ_SUCCESS)
+ return status;
+
+ /* Set fixed */
+ pjmedia_silence_det_set_fixed(conf_port->vad, 2);
+
+
/* If port's clock rate is different than conference's clock rate,
* create a resample sessions.
*/