Changeset 1686 for pjproject/trunk/pjsip-apps/src/samples/mix.c

Timestamp:

Jan 12, 2008 3:32:17 PM (16 years ago)

Author:

bennylp

Message:

In mix.c, handle FRAME_TYPE_NONE if the conference ever returns one

File:

• pjproject/trunk/pjsip-apps/src/samples/mix.c (modified) (3 diffs)

pjproject/trunk/pjsip-apps/src/samples/mix.c

@@ -83 +83 @@
     pjmedia_port *wavout;
     struct wav_input wav_input[MAX_WAV];
-    pj_ssize_t longest = 0, processed;
+    pj_size_t longest = 0, processed;
     unsigned i, input_cnt = 0;
     pj_status_t status;
@@ -174 +174 @@
         len = (pj_ssize_t)(len * 1.0 * clock_rate / 
                             wav_input[i].port->info.clock_rate);
-        if (len > longest)
+        if (len > (pj_ssize_t)longest)
             longest = len;
 
@@ -196 +196 @@
         CHECK( pjmedia_port_get_frame(cp, &frame) );
 
+        if (frame.type != PJMEDIA_FRAME_TYPE_AUDIO) {
+            pj_bzero(frame.buf, frame.size);
+            frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
+        }
+
         CHECK( pjmedia_port_put_frame(wavout, &frame));