diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2009-06-13 15:28:37 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2009-06-13 15:28:37 +0000 |
commit | e2b2434d21da2d71dd0a76ba40cb8c5de68b3ec1 (patch) | |
tree | 74dc7114a983e9e7df60b694acef9328842a5bc7 | |
parent | cd141ad3cd391ee66090e89d04d7c466472fdb7f (diff) |
Ticket #884: Fixed codecs (that use pjmedia VAD) to avoid generating keep-alive frames/payload when PJMEDIA_CODEC_MAX_SILENCE_PERIOD is set to -1.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2760 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r-- | pjmedia/src/pjmedia-codec/g722.c | 4 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-codec/g7221.c | 6 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-codec/gsm.c | 4 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-codec/ilbc.c | 4 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-codec/ipp_codecs.c | 6 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-codec/l16.c | 6 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/g711.c | 4 |
7 files changed, 17 insertions, 17 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/g7221.c b/pjmedia/src/pjmedia-codec/g7221.c index 6245dd5c..dc23cbf5 100644 --- a/pjmedia/src/pjmedia-codec/g7221.c +++ b/pjmedia/src/pjmedia-codec/g7221.c @@ -774,9 +774,9 @@ static pj_status_t 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)codec_data->samples_per_frame / 20)) + (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 || + silence_duration < (PJMEDIA_CODEC_MAX_SILENCE_PERIOD * + (int)codec_data->samples_per_frame / 20))) { 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 87b40fa2..3fb65315 100644 --- a/pjmedia/src/pjmedia-codec/ipp_codecs.c +++ b/pjmedia/src/pjmedia-codec/ipp_codecs.c @@ -1312,9 +1312,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 7e86ac7e..60a7ae32 100644 --- a/pjmedia/src/pjmedia-codec/l16.c +++ b/pjmedia/src/pjmedia-codec/l16.c @@ -630,9 +630,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; |