Changeset 2075 for pjproject/trunk/pjmedia/src/pjmedia/master_port.c

Timestamp:

Jun 27, 2008 4:18:13 PM (16 years ago)

Author:

nanang

Message:

Ticket #543:

• Fixed bug of calculating clock interval which should include channel count
• Added L16 codecs including stereo
• Added WAV files for stereo tests

File:

• pjproject/trunk/pjmedia/src/pjmedia/master_port.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/master_port.c

@@ -53 +53 @@
     pjmedia_master_port *m;
     unsigned clock_rate;
+    unsigned channel_count;
     unsigned samples_per_frame;
     unsigned bytes_per_frame;
@@ -65 +66 @@
                      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,
+    /* Both ports MUST have equal samples per frame */
+    PJ_ASSERT_RETURN(u_port->info.samples_per_frame==
+                     d_port->info.samples_per_frame,
                      PJMEDIA_ENCSAMPLESPFRAME);
+
+    /* Both ports MUST have equal channel count */
+    PJ_ASSERT_RETURN(u_port->info.channel_count == d_port->info.channel_count,
+                     PJMEDIA_ENCCHANNEL);
 
 
@@ -74 +79 @@
     clock_rate = u_port->info.clock_rate;
     samples_per_frame = u_port->info.samples_per_frame;
+    channel_count = u_port->info.channel_count;
 
 
@@ -103 +109 @@
 
     /* Create media clock */
-    status = pjmedia_clock_create(pool, clock_rate, samples_per_frame, 
-                                  options, &clock_callback, m, &m->clock);
+    status = pjmedia_clock_create(pool, clock_rate, channel_count, 
+                                  samples_per_frame, options, &clock_callback,
+                                  m, &m->clock);
     if (status != PJ_SUCCESS) {
         pj_lock_destroy(m->lock);