virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

aacdec: make dual mono mode selectable through AVOptions too.

Browse Source 
Based on patch by Akihiro Tsukada

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-12-30 05:07:12 +01:00
parent 644f021ccf
commit b113d4a83c
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aac.h
View File

@@ -261,6 +261,7 @@ typedef struct ChannelElement {
* main AAC context * main AAC context
*/ */
typedef struct AACContext { typedef struct AACContext {
AVClass *class;
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame frame; AVFrame frame;
@@ -309,6 +310,7 @@ typedef struct AACContext {
* @name Japanese DTV specific extension * @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 int dmono_mode; ///< 0->not dmono, 1->use first channel, 2->use second channel
/** @} */ /** @} */

27
libavcodec/aacdec.c
View File

@@ -80,6 +80,7 @@
*/ */
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "get_bits.h" #include "get_bits.h"
@@ -2661,6 +2662,8 @@ static int aac_decode_frame(AVCodecContext *avctx, void *data,
ac->dmono_mode = 0; ac->dmono_mode = 0;
if (jp_dualmono && jp_dualmono_size > 0) if (jp_dualmono && jp_dualmono_size > 0)
ac->dmono_mode = 1 + *jp_dualmono; 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); init_get_bits(&gb, buf, buf_size * 8);
@@ -2966,6 +2969,29 @@ static av_cold int latm_decode_init(AVCodecContext *avctx)
return ret; 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 = { AVCodec ff_aac_decoder = {
.name = "aac", .name = "aac",
@@ -2982,6 +3008,7 @@ AVCodec ff_aac_decoder = {
.capabilities = CODEC_CAP_CHANNEL_CONF | CODEC_CAP_DR1, .capabilities = CODEC_CAP_CHANNEL_CONF | CODEC_CAP_DR1,
.channel_layouts = aac_channel_layout, .channel_layouts = aac_channel_layout,
.flush = flush, .flush = flush,
.priv_class = &aac_decoder_class,
}; };
/* /*