Mercurial > libavcodec.hg
changeset 9512:ba5d9a97ab2f libavcodec
Add channel layout support to the AC-3 decoder and AC-3 parser.
| author | jbr |
|---|---|
| date | Sun, 19 Apr 2009 15:05:32 +0000 |
| parents | c2dba7ed94dc |
| children | 24532a2d9d2c |
| files | aac_ac3_parser.c aac_ac3_parser.h ac3.h ac3_parser.c ac3dec.c ac3dec.h ac3tab.c ac3tab.h |
| diffstat | 8 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/aac_ac3_parser.c Sun Apr 19 14:05:55 2009 +0000 +++ b/aac_ac3_parser.c Sun Apr 19 15:05:32 2009 +0000 @@ -85,6 +85,7 @@ avctx->channels = avctx->request_channels; } else { avctx->channels = s->channels; + avctx->channel_layout = s->channel_layout; } avctx->bit_rate = s->bit_rate; avctx->frame_size = s->samples;
--- a/aac_ac3_parser.h Sun Apr 19 14:05:55 2009 +0000 +++ b/aac_ac3_parser.h Sun Apr 19 15:05:32 2009 +0000 @@ -48,6 +48,7 @@ int sample_rate; int bit_rate; int samples; + int64_t channel_layout; int remaining_size; uint64_t state;
--- a/ac3.h Sun Apr 19 14:05:55 2009 +0000 +++ b/ac3.h Sun Apr 19 15:05:32 2009 +0000 @@ -100,6 +100,7 @@ uint32_t bit_rate; uint8_t channels; uint16_t frame_size; + int64_t channel_layout; /** @} */ } AC3HeaderInfo;
--- a/ac3_parser.c Sun Apr 19 14:05:55 2009 +0000 +++ b/ac3_parser.c Sun Apr 19 15:05:32 2009 +0000 @@ -121,6 +121,9 @@ (hdr->num_blocks * 256.0)); hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on; } + hdr->channel_layout = ff_ac3_channel_layout_tab[hdr->channel_mode]; + if (hdr->lfe_on) + hdr->channel_layout |= CH_LOW_FREQUENCY; return 0; } @@ -174,6 +177,7 @@ hdr_info->sample_rate = hdr.sample_rate; hdr_info->bit_rate = hdr.bit_rate; hdr_info->channels = hdr.channels; + hdr_info->channel_layout = hdr.channel_layout; hdr_info->samples = hdr.num_blocks * 256; if(hdr.bitstream_id>10) hdr_info->codec_id = CODEC_ID_EAC3;
--- a/ac3dec.c Sun Apr 19 14:05:55 2009 +0000 +++ b/ac3dec.c Sun Apr 19 15:05:32 2009 +0000 @@ -285,6 +285,7 @@ /* get decoding parameters from header info */ s->bit_alloc_params.sr_code = hdr.sr_code; s->channel_mode = hdr.channel_mode; + s->channel_layout = hdr.channel_layout; s->lfe_on = hdr.lfe_on; s->bit_alloc_params.sr_shift = hdr.sr_shift; s->sample_rate = hdr.sample_rate; @@ -1307,8 +1308,10 @@ avctx->request_channels < s->channels) { s->out_channels = avctx->request_channels; s->output_mode = avctx->request_channels == 1 ? AC3_CHMODE_MONO : AC3_CHMODE_STEREO; + s->channel_layout = ff_ac3_channel_layout_tab[s->output_mode]; } avctx->channels = s->out_channels; + avctx->channel_layout = s->channel_layout; /* set downmixing coefficients if needed */ if(s->channels != s->out_channels && !((s->output_mode & AC3_OUTPUT_LFEON) &&
--- a/ac3dec.h Sun Apr 19 14:05:55 2009 +0000 +++ b/ac3dec.h Sun Apr 19 15:05:32 2009 +0000 @@ -58,6 +58,7 @@ int sample_rate; ///< sample frequency, in Hz int num_blocks; ///< number of audio blocks int channel_mode; ///< channel mode (acmod) + int channel_layout; ///< channel layout int lfe_on; ///< lfe channel in use int channel_map; ///< custom channel map int center_mix_level; ///< Center mix level index
--- a/ac3tab.c Sun Apr 19 14:05:55 2009 +0000 +++ b/ac3tab.c Sun Apr 19 15:05:32 2009 +0000 @@ -24,6 +24,7 @@ * tables taken directly from the AC-3 spec. */ +#include "avcodec.h" #include "ac3tab.h" /** @@ -79,6 +80,20 @@ 2, 1, 2, 3, 3, 4, 4, 5 }; +/** + * Maps audio coding mode (acmod) to channel layout mask. + */ +const uint16_t ff_ac3_channel_layout_tab[8] = { + CH_LAYOUT_STEREO, + CH_LAYOUT_MONO, + CH_LAYOUT_STEREO, + CH_LAYOUT_SURROUND, + CH_LAYOUT_2_1, + CH_LAYOUT_4POINT0, + CH_LAYOUT_2_2, + CH_LAYOUT_5POINT0 +}; + #define COMMON_CHANNEL_MAP \ { { 0, 1, }, { 0, 1, 2, } },\ { { 0, }, { 0, 1, } },\
--- a/ac3tab.h Sun Apr 19 14:05:55 2009 +0000 +++ b/ac3tab.h Sun Apr 19 15:05:32 2009 +0000 @@ -26,6 +26,7 @@ extern const uint16_t ff_ac3_frame_size_tab[38][3]; extern const uint8_t ff_ac3_channels_tab[8]; +extern const uint16_t ff_ac3_channel_layout_tab[8]; extern const uint8_t ff_ac3_enc_channel_map[8][2][6]; extern const uint8_t ff_ac3_dec_channel_map[8][2][6]; extern const uint16_t ff_ac3_sample_rate_tab[3];