summaryrefslogtreecommitdiff
path: root/pjmedia
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2015-09-10 07:17:22 +0000
committerNanang Izzuddin <nanang@teluu.com>2015-09-10 07:17:22 +0000
commit75203896be3be45a950e2f6d71492aac24cabae2 (patch)
treefae23cd2e8ceb6268753efb522c61d512cd0dd9c /pjmedia
parent6d55f3d443d5d4375469bd11a1f0c8bc5269b1f5 (diff)
Fix #1884: Fixed silence frame length in stream (frame length calculation didn't include frame per packet).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5174 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
-rw-r--r--pjmedia/src/pjmedia/stream.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/pjmedia/src/pjmedia/stream.c b/pjmedia/src/pjmedia/stream.c
index 329ced8d..7ef6d08e 100644
--- a/pjmedia/src/pjmedia/stream.c
+++ b/pjmedia/src/pjmedia/stream.c
@@ -1268,18 +1268,13 @@ static pj_status_t put_frame_imp( pjmedia_port *port,
frame->buf == NULL &&
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;
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);