diff options
| author | Martin Storsjö <martin@martin.st> | 2011-04-13 21:47:12 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2011-04-14 00:31:39 +0300 |
| commit | 651b276ef7ad8d89e89bfc94a4232ab6c36f3a8a (patch) | |
| tree | 85f9373af0018e4184a6817dfc73dac516a28a6b /libavcodec/libopencore-amr.c | |
| parent | 3dd82afc748df0f1c49b76e1cd4ea6e35b1001a5 (diff) | |
libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions
DTX, discontinuous transmission, allows emitting frames with
comfort noise when no voice is detected in the input audio.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/libopencore-amr.c')
| -rw-r--r-- | libavcodec/libopencore-amr.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index c8b3a2c1bc..cf8bdbbcb8 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -21,6 +21,7 @@ #include "avcodec.h" #include "libavutil/avstring.h" +#include "libavutil/opt.h" static void amr_decode_fix_avctx(AVCodecContext *avctx) { @@ -77,13 +78,24 @@ static int get_bitrate_mode(int bitrate, void *log_ctx) } typedef struct AMRContext { + AVClass *av_class; int frame_count; void *dec_state; void *enc_state; int enc_bitrate; int enc_mode; + int enc_dtx; } AMRContext; +static const AVOption options[] = { + { "dtx", "Allow DTX (generate comfort noise)", offsetof(AMRContext, enc_dtx), FF_OPT_TYPE_INT, 0, 0, 1, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, + { NULL } +}; + +static const AVClass class = { + "libopencore_amrnb", av_default_item_name, options, LIBAVUTIL_VERSION_INT +}; + static av_cold int amr_nb_decode_init(AVCodecContext *avctx) { AMRContext *s = avctx->priv_data; @@ -176,7 +188,7 @@ static av_cold int amr_nb_encode_init(AVCodecContext *avctx) avctx->frame_size = 160; avctx->coded_frame = avcodec_alloc_frame(); - s->enc_state = Encoder_Interface_init(0); + s->enc_state = Encoder_Interface_init(s->enc_dtx); if (!s->enc_state) { av_log(avctx, AV_LOG_ERROR, "Encoder_Interface_init error\n"); return -1; @@ -228,6 +240,7 @@ AVCodec ff_libopencore_amrnb_encoder = { NULL, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"), + .priv_class = &class, }; #endif |