From 3329e6261fba0e1fb9e4e8b23805945683101122 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Fri, 22 Aug 2008 15:45:08 +0000 Subject: Fixed miscalculation of conference port buffer size (rx/tx_buf_cap) when two conf ports have different clock rate/channel count/samples per frame (thanks Joao Cesar). git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2233 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia/conference.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pjmedia') diff --git a/pjmedia/src/pjmedia/conference.c b/pjmedia/src/pjmedia/conference.c index 6f53fafe..4fdf5a03 100644 --- a/pjmedia/src/pjmedia/conference.c +++ b/pjmedia/src/pjmedia/conference.c @@ -357,11 +357,11 @@ static pj_status_t create_conf_port( pj_pool_t *pool, * and 30ms, use 50ms) */ if (port_ptime > conf_ptime) { - buff_ptime = conf_ptime * (port_ptime / conf_ptime); + buff_ptime = port_ptime; if (port_ptime % conf_ptime) buff_ptime += conf_ptime; } else { - buff_ptime = port_ptime * (conf_ptime / port_ptime); + buff_ptime = conf_ptime; if (conf_ptime % port_ptime) buff_ptime += port_ptime; } -- cgit v1.2.3