diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-30 05:07:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-30 05:29:17 +0100 |
| commit | b113d4a83c82c4dcf51945c2a701a6dd54126c27 (patch) | |
| tree | 41bb444272fcf2abc032666ad2dc1fcc3c1447d3 /libavcodec/aacdec.c | |
| parent | 644f021ccf4b8cd8ffd12c2022e5333215c24aa8 (diff) | |
| download | ffmpeg-b113d4a83c82c4dcf51945c2a701a6dd54126c27.tar.gz | |
aacdec: make dual mono mode selectable through AVOptions too.
Based on patch by Akihiro Tsukada
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 2a9d6954fb..239153a9f9 100644 --- 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, }; /* |