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: https://svn.pjsip.org/repos/pjproject/trunk@2760 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjmedia/src/pjmedia-codec/g722.c b/pjmedia/src/pjmedia-codec/g722.c
index a666014..04135f6 100644
--- a/pjmedia/src/pjmedia-codec/g722.c
+++ b/pjmedia/src/pjmedia-codec/g722.c
@@ -552,8 +552,8 @@
(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 6245dd5..dc23cbf 100644
--- a/pjmedia/src/pjmedia-codec/g7221.c
+++ b/pjmedia/src/pjmedia-codec/g7221.c
@@ -774,9 +774,9 @@
(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 2ecd03a..965c936 100644
--- a/pjmedia/src/pjmedia-codec/gsm.c
+++ b/pjmedia/src/pjmedia-codec/gsm.c
@@ -542,8 +542,8 @@
(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 b8a2e58..c60d428 100644
--- a/pjmedia/src/pjmedia-codec/ilbc.c
+++ b/pjmedia/src/pjmedia-codec/ilbc.c
@@ -563,8 +563,8 @@
(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 87b40fa..3fb6531 100644
--- a/pjmedia/src/pjmedia-codec/ipp_codecs.c
+++ b/pjmedia/src/pjmedia-codec/ipp_codecs.c
@@ -1312,9 +1312,9 @@
(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 7e86ac7..60a7ae3 100644
--- a/pjmedia/src/pjmedia-codec/l16.c
+++ b/pjmedia/src/pjmedia-codec/l16.c
@@ -630,9 +630,9 @@
(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 2d822da..a283245 100644
--- a/pjmedia/src/pjmedia/g711.c
+++ b/pjmedia/src/pjmedia/g711.c
@@ -502,8 +502,8 @@
(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;