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.

Martin Storsjö committed 15 years ago

Commit 651b2761 parent 3dd82af2 files · +26 −2Browse files

Unified · Split

2 files

 #include "avcodec.h"
 #include "libavutil/avstring.h"
+#include "libavutil/opt.h"
 static void amr_decode_fix_avctx(AVCodecContext *avctx)
 {
 }
 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;
     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;
     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

 #include "avcodec.h"
 #include "libavutil/avstring.h"
+#include "libavutil/opt.h"
 typedef struct AMRWBContext {
+    AVClass *av_class;
     void  *state;
     int    mode;
     int    last_bitrate;
     int    allow_dtx;
 } 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)
 {
     /* make the correspondance between bitrate and mode */
     avctx->coded_frame = avcodec_alloc_frame();
     s->state     = E_IF_init();
-    s->allow_dtx = 0;
     return 0;
 }
     .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
     .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn Adaptive Multi-Rate "
                                       "(AMR) Wide-Band"),
+    .priv_class = &class,
 };

Keyboard shortcuts