Commit 651b276e authored by Martin Storsjö's avatar Martin Storsjö

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: default avatarMartin Storsjö <martin@martin.st>
parent 3dd82afc
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/opt.h"
static void amr_decode_fix_avctx(AVCodecContext *avctx) static void amr_decode_fix_avctx(AVCodecContext *avctx)
{ {
...@@ -77,13 +78,24 @@ static int get_bitrate_mode(int bitrate, void *log_ctx) ...@@ -77,13 +78,24 @@ static int get_bitrate_mode(int bitrate, void *log_ctx)
} }
typedef struct AMRContext { typedef struct AMRContext {
AVClass *av_class;
int frame_count; int frame_count;
void *dec_state; void *dec_state;
void *enc_state; void *enc_state;
int enc_bitrate; int enc_bitrate;
int enc_mode; int enc_mode;
int enc_dtx;
} AMRContext; } 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) static av_cold int amr_nb_decode_init(AVCodecContext *avctx)
{ {
AMRContext *s = avctx->priv_data; AMRContext *s = avctx->priv_data;
...@@ -176,7 +188,7 @@ static av_cold int amr_nb_encode_init(AVCodecContext *avctx) ...@@ -176,7 +188,7 @@ static av_cold int amr_nb_encode_init(AVCodecContext *avctx)
avctx->frame_size = 160; avctx->frame_size = 160;
avctx->coded_frame = avcodec_alloc_frame(); 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) { if (!s->enc_state) {
av_log(avctx, AV_LOG_ERROR, "Encoder_Interface_init error\n"); av_log(avctx, AV_LOG_ERROR, "Encoder_Interface_init error\n");
return -1; return -1;
...@@ -228,6 +240,7 @@ AVCodec ff_libopencore_amrnb_encoder = { ...@@ -228,6 +240,7 @@ AVCodec ff_libopencore_amrnb_encoder = {
NULL, NULL,
.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .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"), .long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"),
.priv_class = &class,
}; };
#endif #endif
......
...@@ -23,14 +23,25 @@ ...@@ -23,14 +23,25 @@
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/opt.h"
typedef struct AMRWBContext { typedef struct AMRWBContext {
AVClass *av_class;
void *state; void *state;
int mode; int mode;
int last_bitrate; int last_bitrate;
int allow_dtx; int allow_dtx;
} AMRWBContext; } AMRWBContext;
static const AVOption options[] = {
{ "dtx", "Allow DTX (generate comfort noise)", offsetof(AMRWBContext, allow_dtx), FF_OPT_TYPE_INT, 0, 0, 1, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
{ NULL }
};
static const AVClass class = {
"libvo_amrwbenc", av_default_item_name, options, LIBAVUTIL_VERSION_INT
};
static int get_wb_bitrate_mode(int bitrate, void *log_ctx) static int get_wb_bitrate_mode(int bitrate, void *log_ctx)
{ {
/* make the correspondance between bitrate and mode */ /* make the correspondance between bitrate and mode */
...@@ -78,7 +89,6 @@ static av_cold int amr_wb_encode_init(AVCodecContext *avctx) ...@@ -78,7 +89,6 @@ static av_cold int amr_wb_encode_init(AVCodecContext *avctx)
avctx->coded_frame = avcodec_alloc_frame(); avctx->coded_frame = avcodec_alloc_frame();
s->state = E_IF_init(); s->state = E_IF_init();
s->allow_dtx = 0;
return 0; return 0;
} }
...@@ -119,5 +129,6 @@ AVCodec ff_libvo_amrwbenc_encoder = { ...@@ -119,5 +129,6 @@ AVCodec ff_libvo_amrwbenc_encoder = {
.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("Android VisualOn Adaptive Multi-Rate " .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn Adaptive Multi-Rate "
"(AMR) Wide-Band"), "(AMR) Wide-Band"),
.priv_class = &class,
}; };
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment