Changeset 322 for pjproject/trunk/pjmedia/src/pjmedia/conference.c

Timestamp:

Mar 16, 2006 7:03:07 PM (18 years ago)

Author:

bennylp

Message:

Support for stereo audio (or N audio channels, for that matter)

File:

• pjproject/trunk/pjmedia/src/pjmedia/conference.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/conference.c

@@ -137 +137 @@
     struct conf_port    **ports;        /**< Array of ports.                */
     pj_uint16_t          *uns_buf;      /**< Buf for unsigned conversion    */
-    unsigned              clock_rate;   /**< Sampling rate.         */
+    unsigned              clock_rate;   /**< Sampling rate.                 */
+    unsigned              channel_count;/**< Number of channels (1=mono).   */
     unsigned              samples_per_frame;    /**< Samples per frame.     */
     unsigned              bits_per_sample;      /**< Bits per sample.       */
@@ -323 +324 @@
                                          unsigned max_ports,
                                          unsigned clock_rate,
+                                         unsigned channel_count,
                                          unsigned samples_per_frame,
                                          unsigned bits_per_sample,
@@ -493 +495 @@
 
     PJ_ASSERT_RETURN(conf && pool && strm_port && port_name, PJ_EINVAL);
+
+    /* For this version of PJMEDIA, port MUST have the same number of
+     * PCM channels.
+     */
+    if (strm_port->info.channel_count != conf->channel_count) {
+        pj_assert(!"Number of channels mismatch");
+        return PJMEDIA_ENCCHANNEL;
+    }
 
     pj_mutex_lock(conf->mutex);