aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--codecs/codec_ilbc.c1
-rw-r--r--codecs/codec_speex.c1
-rw-r--r--include/asterisk/translate.h1
-rw-r--r--main/translate.c4
4 files changed, 6 insertions, 1 deletions
diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
index 34847fcc7..637f22d12 100644
--- a/codecs/codec_ilbc.c
+++ b/codecs/codec_ilbc.c
@@ -203,6 +203,7 @@ static struct ast_translator ilbctolin = {
.sample = ilbctolin_sample,
.desc_size = sizeof(struct ilbc_coder_pvt),
.buf_size = BUFFER_SAMPLES * 2,
+ .native_plc = 1,
};
static struct ast_translator lintoilbc = {
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index 8825f8158..c20ca426e 100644
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -355,6 +355,7 @@ static struct ast_translator speextolin = {
.desc_size = sizeof(struct speex_coder_pvt),
.buffer_samples = BUFFER_SAMPLES,
.buf_size = BUFFER_SAMPLES * 2,
+ .native_plc = 1,
};
static struct ast_translator lintospeex = {
diff --git a/include/asterisk/translate.h b/include/asterisk/translate.h
index 5e28c6236..ec939e6b5 100644
--- a/include/asterisk/translate.h
+++ b/include/asterisk/translate.h
@@ -104,6 +104,7 @@ struct ast_translator {
int desc_size; /*!< size of private descriptor in pvt->pvt, if any */
int plc_samples; /*!< set to the plc block size if used, 0 otherwise */
int useplc; /*!< current status of plc, changed at runtime */
+ int native_plc; /*!< true if the translator can do native plc */
struct ast_module *module; /* opaque reference to the parent module */
diff --git a/main/translate.c b/main/translate.c
index c9e16b96f..ca044c331 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -174,7 +174,9 @@ static int framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
pvt->samples += l;
pvt->datalen = pvt->samples * 2; /* SLIN has 2bytes for 1sample */
}
- return 0;
+ /* We don't want generic PLC. If the codec has native PLC, then do that */
+ if (!pvt->t->native_plc)
+ return 0;
}
if (pvt->samples + f->samples > pvt->t->buffer_samples) {
ast_log(LOG_WARNING, "Out of buffer space\n");