From 3cffabdb26932b60de1480eca8e5d1d726df822b Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Wed, 24 Jun 2009 15:46:49 +0000 Subject: Ticket #885: backported changes from ticket #884 git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.0@2792 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia-codec/g722.c | 4 ++-- pjmedia/src/pjmedia-codec/gsm.c | 4 ++-- pjmedia/src/pjmedia-codec/ilbc.c | 4 ++-- pjmedia/src/pjmedia-codec/ipp_codecs.c | 6 +++--- pjmedia/src/pjmedia-codec/l16.c | 6 +++--- pjmedia/src/pjmedia/g711.c | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pjmedia/src/pjmedia-codec/g722.c b/pjmedia/src/pjmedia-codec/g722.c index a666014d..04135f6c 100644 --- a/pjmedia/src/pjmedia-codec/g722.c +++ b/pjmedia/src/pjmedia-codec/g722.c @@ -552,8 +552,8 @@ static pj_status_t g722_codec_encode(pjmedia_codec *codec, (input->size >> 1), NULL); if (is_silence && - PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*16000/1000) + (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 || + silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*16000/1000)) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; diff --git a/pjmedia/src/pjmedia-codec/gsm.c b/pjmedia/src/pjmedia-codec/gsm.c index 2ecd03a9..965c936d 100644 --- a/pjmedia/src/pjmedia-codec/gsm.c +++ b/pjmedia/src/pjmedia-codec/gsm.c @@ -542,8 +542,8 @@ static pj_status_t gsm_codec_encode( pjmedia_codec *codec, (input->size >> 1), NULL); if (is_silence && - PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000) + (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 || + silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000)) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; diff --git a/pjmedia/src/pjmedia-codec/ilbc.c b/pjmedia/src/pjmedia-codec/ilbc.c index b8a2e58b..c60d4285 100644 --- a/pjmedia/src/pjmedia-codec/ilbc.c +++ b/pjmedia/src/pjmedia-codec/ilbc.c @@ -563,8 +563,8 @@ static pj_status_t ilbc_codec_encode(pjmedia_codec *codec, (input->size >> 1), NULL); if (is_silence && - PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000) + (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 || + silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000)) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; diff --git a/pjmedia/src/pjmedia-codec/ipp_codecs.c b/pjmedia/src/pjmedia-codec/ipp_codecs.c index bbc58b73..cee416f0 100644 --- a/pjmedia/src/pjmedia-codec/ipp_codecs.c +++ b/pjmedia/src/pjmedia-codec/ipp_codecs.c @@ -1172,9 +1172,9 @@ static pj_status_t ipp_codec_encode( pjmedia_codec *codec, (input->size >> 1), NULL); if (is_silence && - PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_duration < (PJMEDIA_CODEC_MAX_SILENCE_PERIOD * - (int)ippc->clock_rate / 1000)) + (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 || + silence_duration < (PJMEDIA_CODEC_MAX_SILENCE_PERIOD * + (int)ippc->clock_rate / 1000))) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; diff --git a/pjmedia/src/pjmedia-codec/l16.c b/pjmedia/src/pjmedia-codec/l16.c index be63e4ec..cd31a4df 100644 --- a/pjmedia/src/pjmedia-codec/l16.c +++ b/pjmedia/src/pjmedia-codec/l16.c @@ -624,9 +624,9 @@ static pj_status_t l16_encode(pjmedia_codec *codec, (input->size >> 1), NULL); if (is_silence && - PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD* - (int)data->clock_rate/1000) + (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 || + silence_duration < PJMEDIA_CODEC_MAX_SILENCE_PERIOD* + (int)data->clock_rate/1000)) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; diff --git a/pjmedia/src/pjmedia/g711.c b/pjmedia/src/pjmedia/g711.c index 2d822da3..a2832459 100644 --- a/pjmedia/src/pjmedia/g711.c +++ b/pjmedia/src/pjmedia/g711.c @@ -502,8 +502,8 @@ static pj_status_t g711_encode(pjmedia_codec *codec, (const pj_int16_t*) input->buf, (input->size >> 1), NULL); if (is_silence && - PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && - silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000) + (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 || + silence_period < PJMEDIA_CODEC_MAX_SILENCE_PERIOD*8000/1000)) { output->type = PJMEDIA_FRAME_TYPE_NONE; output->buf = NULL; -- cgit v1.2.3