Changeset 2328

Timestamp:

Sep 27, 2008 11:50:17 AM (16 years ago)

Author:

nanang

Message:

Fixed possible assertion by codec when stereo/multichannel codec is used and stream is about to send keep-NAT-alive packet (thanks Bill Gardner for the patch).

File:

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

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -180 +180 @@
 
 /* Zero audio frame samples */
-static pj_int16_t zero_frame[30 * 16000 / 1000];
+static pj_int16_t zero_frame[2 * 30 * 16000 / 1000];
 
 /*
@@ -756 +756 @@
                (stream->dir & PJMEDIA_DIR_ENCODING) &&
                stream->codec_param.info.frm_ptime *
-                stream->codec_param.info.clock_rate/1000 <
+               stream->codec_param.info.channel_cnt *
+               stream->codec_param.info.clock_rate/1000 <
                   PJ_ARRAY_SIZE(zero_frame)) 
     {
@@ -764 +765 @@
         silence_frame.buf = zero_frame;
         silence_frame.size = stream->codec_param.info.frm_ptime * 2 *
-                              stream->codec_param.info.clock_rate / 1000;
+                             stream->codec_param.info.channel_cnt *
+                             stream->codec_param.info.clock_rate / 1000;
         silence_frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
         silence_frame.timestamp.u32.lo = pj_ntohl(stream->enc->rtp.out_hdr.ts);