summaryrefslogtreecommitdiff
path: root/pjmedia
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2006-11-15 18:55:44 +0000
committerBenny Prijono <bennylp@teluu.com>2006-11-15 18:55:44 +0000
commita66ebf5d8f421cab171f591799fc94edf76e2d3f (patch)
tree0bb20c4dac416643fd22922714d0b22b28c3fdd0 /pjmedia
parent894497d1eff2a54f9b4819fb7cece1f012b867d8 (diff)
Added checking for clock rate mismatch in PJMEDIA master port.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@802 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
-rw-r--r--pjmedia/src/pjmedia/master_port.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia/master_port.c b/pjmedia/src/pjmedia/master_port.c
index 7f371fad..7746e4e4 100644
--- a/pjmedia/src/pjmedia/master_port.c
+++ b/pjmedia/src/pjmedia/master_port.c
@@ -60,7 +60,11 @@ PJ_DEF(pj_status_t) pjmedia_master_port_create( pj_pool_t *pool,
PJ_ASSERT_RETURN(pool && u_port && d_port && p_m, PJ_EINVAL);
- /* Both ports MUST have the equal ptime */
+ /* Both ports MUST have equal clock rate */
+ PJ_ASSERT_RETURN(u_port->info.clock_rate == d_port->info.clock_rate,
+ PJMEDIA_ENCCLOCKRATE);
+
+ /* Both ports MUST have equal ptime */
PJ_ASSERT_RETURN(u_port->info.clock_rate/u_port->info.samples_per_frame==
d_port->info.clock_rate/d_port->info.samples_per_frame,
PJMEDIA_ENCSAMPLESPFRAME);