aacdec: make dual mono mode selectable through AVOptions too.

Based on patch by Akihiro Tsukada

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index 32fbbc48c3a5751ce2ff6d21c718d9ad4ad671e7..9e9fa0ea64f4a220ad70b1060808323e0d9ba0a7 100644 (file)
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -261,6 +261,7 @@ typedef struct ChannelElement {
  * main AAC context
  */
 typedef struct AACContext {
+    AVClass        *class;
     AVCodecContext *avctx;
     AVFrame frame;
 
@@ -309,6 +310,7 @@ typedef struct AACContext {
      * @name Japanese DTV specific extension
      * @{
      */
+    int force_dmono_mode;///< 0->not dmono, 1->use first channel, 2->use second channel
     int dmono_mode;      ///< 0->not dmono, 1->use first channel, 2->use second channel
     /** @} */
 

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 2a9d6954fb64ca4677037fccba0f8ccd88bfb0b3..239153a9f9e2a57e3babd30dbfdf9488e18c2201 100644 (file)
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -80,6 +80,7 @@
  */
 
 #include "libavutil/float_dsp.h"
+#include "libavutil/opt.h"
 #include "avcodec.h"
 #include "internal.h"
 #include "get_bits.h"
@@ -2661,6 +2662,8 @@ static int aac_decode_frame(AVCodecContext *avctx, void *data,
     ac->dmono_mode = 0;
     if (jp_dualmono && jp_dualmono_size > 0)
         ac->dmono_mode =  1 + *jp_dualmono;
+    if (ac->force_dmono_mode >= 0)
+        ac->dmono_mode = ac->force_dmono_mode;
 
     init_get_bits(&gb, buf, buf_size * 8);
 
@@ -2966,6 +2969,29 @@ static av_cold int latm_decode_init(AVCodecContext *avctx)
     return ret;
 }
 
+/**
+ * AVOptions for Japanese DTV specific extensions (ADTS only)
+ */
+#define AACDEC_FLAGS AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM
+static const AVOption options[] = {
+    {"dual_mono_mode", "Select the channel to decode for dual mono",
+     offsetof(AACContext, force_dmono_mode), AV_OPT_TYPE_INT, {.i64=-1}, -1, 2,
+     AACDEC_FLAGS, "dual_mono_mode"},
+
+    {"auto", "autoselection",            0, AV_OPT_TYPE_CONST, {.i64=-1}, INT_MIN, INT_MAX, AACDEC_FLAGS, "dual_mono_mode"},
+    {"main", "Select Main/Left channel", 0, AV_OPT_TYPE_CONST, {.i64= 1}, INT_MIN, INT_MAX, AACDEC_FLAGS, "dual_mono_mode"},
+    {"sub" , "Select Sub/Right channel", 0, AV_OPT_TYPE_CONST, {.i64= 2}, INT_MIN, INT_MAX, AACDEC_FLAGS, "dual_mono_mode"},
+    {"both", "Select both channels",     0, AV_OPT_TYPE_CONST, {.i64= 0}, INT_MIN, INT_MAX, AACDEC_FLAGS, "dual_mono_mode"},
+
+    {NULL},
+};
+
+static const AVClass aac_decoder_class = {
+    .class_name = "AAC decoder",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
 
 AVCodec ff_aac_decoder = {
     .name            = "aac",
@@ -2982,6 +3008,7 @@ AVCodec ff_aac_decoder = {
     .capabilities    = CODEC_CAP_CHANNEL_CONF | CODEC_CAP_DR1,
     .channel_layouts = aac_channel_layout,
     .flush = flush,
+    .priv_class      = &aac_decoder_class,
 };
 
 /*