Changeset 5174

Timestamp:

Sep 10, 2015 7:17:22 AM (9 years ago)

Author:

nanang

Message:

Fix #1884: Fixed silence frame length in stream (frame length calculation didn't include frame per packet).

File:

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

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

@@ -1269 +1269 @@
                stream->port.info.fmt.id == PJMEDIA_FORMAT_L16 &&
                (stream->dir & PJMEDIA_DIR_ENCODING) &&
-               stream->codec_param.info.frm_ptime *
-               stream->codec_param.info.channel_cnt *
-               stream->codec_param.info.clock_rate/1000 <
-                  PJ_ARRAY_SIZE(zero_frame))
+               stream->enc_samples_per_pkt < PJ_ARRAY_SIZE(zero_frame))
     {
         pjmedia_frame silence_frame;
@@ -1278 +1275 @@
         pj_bzero(&silence_frame, sizeof(silence_frame));
         silence_frame.buf = zero_frame;
-        silence_frame.size = stream->codec_param.info.frm_ptime * 2 *
-                             stream->codec_param.info.channel_cnt *
-                             stream->codec_param.info.clock_rate / 1000;
+        silence_frame.size = stream->enc_samples_per_pkt * 2;
         silence_frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
         silence_frame.timestamp.u32.lo = pj_ntohl(stream->enc->rtp.out_hdr.ts);