virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avcodec/dca: move some enumeration typedefs into headers

Browse Source 
These values will be used by the parser. Prefix them with DCA_
appropriately.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
foo86 2017-07-10 17:11:31 +03:00 committed by James Almer
parent 5c7e7ac6d4
commit f6b86b62f7
4 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
libavcodec/dca_core.c
View File

@ -35,35 +35,7 @@ enum HeaderType {
HEADER_XXCH HEADER_XXCH
}; };
enum AudioMode { static const int8_t prm_ch_to_spkr_map[DCA_AMODE_COUNT][5] = {
AMODE_MONO, // Mode 0: A (mono)
AMODE_MONO_DUAL, // Mode 1: A + B (dual mono)
AMODE_STEREO, // Mode 2: L + R (stereo)
AMODE_STEREO_SUMDIFF, // Mode 3: (L+R) + (L-R) (sum-diff)
AMODE_STEREO_TOTAL, // Mode 4: LT + RT (left and right total)
AMODE_3F, // Mode 5: C + L + R
AMODE_2F1R, // Mode 6: L + R + S
AMODE_3F1R, // Mode 7: C + L + R + S
AMODE_2F2R, // Mode 8: L + R + SL + SR
AMODE_3F2R, // Mode 9: C + L + R + SL + SR
AMODE_COUNT
};
enum ExtAudioType {
EXT_AUDIO_XCH = 0,
EXT_AUDIO_X96 = 2,
EXT_AUDIO_XXCH = 6
};
enum LFEFlag {
LFE_FLAG_NONE,
LFE_FLAG_128,
LFE_FLAG_64,
LFE_FLAG_INVALID
};
static const int8_t prm_ch_to_spkr_map[AMODE_COUNT][5] = {
{ DCA_SPEAKER_C, -1, -1, -1, -1 }, { DCA_SPEAKER_C, -1, -1, -1, -1 },
{ DCA_SPEAKER_L, DCA_SPEAKER_R, -1, -1, -1 }, { DCA_SPEAKER_L, DCA_SPEAKER_R, -1, -1, -1 },
{ DCA_SPEAKER_L, DCA_SPEAKER_R, -1, -1, -1 }, { DCA_SPEAKER_L, DCA_SPEAKER_R, -1, -1, -1 },
@ -76,7 +48,7 @@ static const int8_t prm_ch_to_spkr_map[AMODE_COUNT][5] = {
{ DCA_SPEAKER_C, DCA_SPEAKER_L, DCA_SPEAKER_R, DCA_SPEAKER_Ls, DCA_SPEAKER_Rs } { DCA_SPEAKER_C, DCA_SPEAKER_L, DCA_SPEAKER_R, DCA_SPEAKER_Ls, DCA_SPEAKER_Rs }
}; };
static const uint8_t audio_mode_ch_mask[AMODE_COUNT] = { static const uint8_t audio_mode_ch_mask[DCA_AMODE_COUNT] = {
DCA_SPEAKER_LAYOUT_MONO, DCA_SPEAKER_LAYOUT_MONO,
DCA_SPEAKER_LAYOUT_STEREO, DCA_SPEAKER_LAYOUT_STEREO,
DCA_SPEAKER_LAYOUT_STEREO, DCA_SPEAKER_LAYOUT_STEREO,
@ -139,7 +111,7 @@ static int parse_frame_header(DCACoreDecoder *s)
// Audio channel arrangement // Audio channel arrangement
s->audio_mode = get_bits(&s->gb, 6); s->audio_mode = get_bits(&s->gb, 6);
if (s->audio_mode >= AMODE_COUNT) { if (s->audio_mode >= DCA_AMODE_COUNT) {
av_log(s->avctx, AV_LOG_ERROR, "Unsupported audio channel arrangement (%d)\n", s->audio_mode); av_log(s->avctx, AV_LOG_ERROR, "Unsupported audio channel arrangement (%d)\n", s->audio_mode);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
@ -180,7 +152,7 @@ static int parse_frame_header(DCACoreDecoder *s)
// Low frequency effects flag // Low frequency effects flag
s->lfe_present = get_bits(&s->gb, 2); s->lfe_present = get_bits(&s->gb, 2);
if (s->lfe_present == LFE_FLAG_INVALID) { if (s->lfe_present == DCA_LFE_FLAG_INVALID) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid low frequency effects flag\n"); av_log(s->avctx, AV_LOG_ERROR, "Invalid low frequency effects flag\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -1783,7 +1755,7 @@ static int parse_optional_info(DCACoreDecoder *s)
// must be done backwards from the end of core frame to work around // must be done backwards from the end of core frame to work around
// sync word aliasing issues. // sync word aliasing issues.
switch (s->ext_audio_type) { switch (s->ext_audio_type) {
case EXT_AUDIO_XCH: case DCA_EXT_AUDIO_XCH:
if (dca->request_channel_layout) if (dca->request_channel_layout)
break; break;
@ -1813,7 +1785,7 @@ static int parse_optional_info(DCACoreDecoder *s)
} }
break; break;
case EXT_AUDIO_X96: case DCA_EXT_AUDIO_X96:
// The distance between X96 sync word and end of the core frame // The distance between X96 sync word and end of the core frame
// must be equal to X96 frame size. Minimum X96 frame size is 96 // must be equal to X96 frame size. Minimum X96 frame size is 96
// bytes. // bytes.
@ -1836,7 +1808,7 @@ static int parse_optional_info(DCACoreDecoder *s)
} }
break; break;
case EXT_AUDIO_XXCH: case DCA_EXT_AUDIO_XXCH:
if (dca->request_channel_layout) if (dca->request_channel_layout)
break; break;
@ -2102,7 +2074,7 @@ int ff_dca_core_filter_fixed(DCACoreDecoder *s, int x96_synth)
int nlfesamples = s->npcmblocks >> 1; int nlfesamples = s->npcmblocks >> 1;
// Check LFF // Check LFF
if (s->lfe_present == LFE_FLAG_128) { if (s->lfe_present == DCA_LFE_FLAG_128) {
av_log(s->avctx, AV_LOG_ERROR, "Fixed point mode doesn't support LFF=1\n"); av_log(s->avctx, AV_LOG_ERROR, "Fixed point mode doesn't support LFF=1\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -2152,7 +2124,7 @@ static int filter_frame_fixed(DCACoreDecoder *s, AVFrame *frame)
// Undo embedded XCH downmix // Undo embedded XCH downmix
if (s->es_format && (s->ext_audio_mask & DCA_CSS_XCH) if (s->es_format && (s->ext_audio_mask & DCA_CSS_XCH)
&& s->audio_mode >= AMODE_2F2R) { && s->audio_mode >= DCA_AMODE_2F2R) {
s->dcadsp->dmix_sub_xch(s->output_samples[DCA_SPEAKER_Ls], s->dcadsp->dmix_sub_xch(s->output_samples[DCA_SPEAKER_Ls],
s->output_samples[DCA_SPEAKER_Rs], s->output_samples[DCA_SPEAKER_Rs],
s->output_samples[DCA_SPEAKER_Cs], s->output_samples[DCA_SPEAKER_Cs],
@ -2196,15 +2168,15 @@ static int filter_frame_fixed(DCACoreDecoder *s, AVFrame *frame)
if (!(s->ext_audio_mask & (DCA_CSS_XXCH | DCA_CSS_XCH | DCA_EXSS_XXCH))) { if (!(s->ext_audio_mask & (DCA_CSS_XXCH | DCA_CSS_XCH | DCA_EXSS_XXCH))) {
// Front sum/difference decoding // Front sum/difference decoding
if ((s->sumdiff_front && s->audio_mode > AMODE_MONO) if ((s->sumdiff_front && s->audio_mode > DCA_AMODE_MONO)
|| s->audio_mode == AMODE_STEREO_SUMDIFF) { || s->audio_mode == DCA_AMODE_STEREO_SUMDIFF) {
s->fixed_dsp->butterflies_fixed(s->output_samples[DCA_SPEAKER_L], s->fixed_dsp->butterflies_fixed(s->output_samples[DCA_SPEAKER_L],
s->output_samples[DCA_SPEAKER_R], s->output_samples[DCA_SPEAKER_R],
nsamples); nsamples);
} }
// Surround sum/difference decoding // Surround sum/difference decoding
if (s->sumdiff_surround && s->audio_mode >= AMODE_2F2R) { if (s->sumdiff_surround && s->audio_mode >= DCA_AMODE_2F2R) {
s->fixed_dsp->butterflies_fixed(s->output_samples[DCA_SPEAKER_Ls], s->fixed_dsp->butterflies_fixed(s->output_samples[DCA_SPEAKER_Ls],
s->output_samples[DCA_SPEAKER_Rs], s->output_samples[DCA_SPEAKER_Rs],
nsamples); nsamples);
@ -2308,7 +2280,7 @@ static int filter_frame_float(DCACoreDecoder *s, AVFrame *frame)
// Filter LFE channel // Filter LFE channel
if (s->lfe_present) { if (s->lfe_present) {
int dec_select = (s->lfe_present == LFE_FLAG_128); int dec_select = (s->lfe_present == DCA_LFE_FLAG_128);
float *samples = output_samples[DCA_SPEAKER_LFE1]; float *samples = output_samples[DCA_SPEAKER_LFE1];
int nlfesamples = s->npcmblocks >> (dec_select + 1); int nlfesamples = s->npcmblocks >> (dec_select + 1);
@ -2342,7 +2314,7 @@ static int filter_frame_float(DCACoreDecoder *s, AVFrame *frame)
// Undo embedded XCH downmix // Undo embedded XCH downmix
if (s->es_format && (s->ext_audio_mask & DCA_CSS_XCH) if (s->es_format && (s->ext_audio_mask & DCA_CSS_XCH)
&& s->audio_mode >= AMODE_2F2R) { && s->audio_mode >= DCA_AMODE_2F2R) {
s->float_dsp->vector_fmac_scalar(output_samples[DCA_SPEAKER_Ls], s->float_dsp->vector_fmac_scalar(output_samples[DCA_SPEAKER_Ls],
output_samples[DCA_SPEAKER_Cs], output_samples[DCA_SPEAKER_Cs],
-M_SQRT1_2, nsamples); -M_SQRT1_2, nsamples);
@ -2389,15 +2361,15 @@ static int filter_frame_float(DCACoreDecoder *s, AVFrame *frame)
if (!(s->ext_audio_mask & (DCA_CSS_XXCH | DCA_CSS_XCH | DCA_EXSS_XXCH))) { if (!(s->ext_audio_mask & (DCA_CSS_XXCH | DCA_CSS_XCH | DCA_EXSS_XXCH))) {
// Front sum/difference decoding // Front sum/difference decoding
if ((s->sumdiff_front && s->audio_mode > AMODE_MONO) if ((s->sumdiff_front && s->audio_mode > DCA_AMODE_MONO)
|| s->audio_mode == AMODE_STEREO_SUMDIFF) { || s->audio_mode == DCA_AMODE_STEREO_SUMDIFF) {
s->float_dsp->butterflies_float(output_samples[DCA_SPEAKER_L], s->float_dsp->butterflies_float(output_samples[DCA_SPEAKER_L],
output_samples[DCA_SPEAKER_R], output_samples[DCA_SPEAKER_R],
nsamples); nsamples);
} }
// Surround sum/difference decoding // Surround sum/difference decoding
if (s->sumdiff_surround && s->audio_mode >= AMODE_2F2R) { if (s->sumdiff_surround && s->audio_mode >= DCA_AMODE_2F2R) {
s->float_dsp->butterflies_float(output_samples[DCA_SPEAKER_Ls], s->float_dsp->butterflies_float(output_samples[DCA_SPEAKER_Ls],
output_samples[DCA_SPEAKER_Rs], output_samples[DCA_SPEAKER_Rs],
nsamples); nsamples);
@ -2424,7 +2396,7 @@ int ff_dca_core_filter_frame(DCACoreDecoder *s, AVFrame *frame)
// Handle downmixing to stereo request // Handle downmixing to stereo request
if (dca->request_channel_layout == DCA_SPEAKER_LAYOUT_STEREO if (dca->request_channel_layout == DCA_SPEAKER_LAYOUT_STEREO
&& s->audio_mode > AMODE_MONO && s->prim_dmix_embedded && s->audio_mode > DCA_AMODE_MONO && s->prim_dmix_embedded
&& (s->prim_dmix_type == DCA_DMIX_TYPE_LoRo || && (s->prim_dmix_type == DCA_DMIX_TYPE_LoRo ||
s->prim_dmix_type == DCA_DMIX_TYPE_LtRt)) s->prim_dmix_type == DCA_DMIX_TYPE_LtRt))
s->request_mask = DCA_SPEAKER_LAYOUT_STEREO; s->request_mask = DCA_SPEAKER_LAYOUT_STEREO;
@ -2457,8 +2429,8 @@ int ff_dca_core_filter_frame(DCACoreDecoder *s, AVFrame *frame)
else else
avctx->bit_rate = 0; avctx->bit_rate = 0;
if (s->audio_mode == AMODE_STEREO_TOTAL || (s->request_mask != s->ch_mask && if (s->audio_mode == DCA_AMODE_STEREO_TOTAL || (s->request_mask != s->ch_mask &&
s->prim_dmix_type == DCA_DMIX_TYPE_LtRt)) s->prim_dmix_type == DCA_DMIX_TYPE_LtRt))
matrix_encoding = AV_MATRIX_ENCODING_DOLBY; matrix_encoding = AV_MATRIX_ENCODING_DOLBY;
else else
matrix_encoding = AV_MATRIX_ENCODING_NONE; matrix_encoding = AV_MATRIX_ENCODING_NONE;

28
libavcodec/dca_core.h
View File

@ -56,6 +56,34 @@
#define DCA_FILTER_MODE_X96 0x01 #define DCA_FILTER_MODE_X96 0x01
#define DCA_FILTER_MODE_FIXED 0x02 #define DCA_FILTER_MODE_FIXED 0x02
enum DCACoreAudioMode {
DCA_AMODE_MONO, // Mode 0: A (mono)
DCA_AMODE_MONO_DUAL, // Mode 1: A + B (dual mono)
DCA_AMODE_STEREO, // Mode 2: L + R (stereo)
DCA_AMODE_STEREO_SUMDIFF, // Mode 3: (L+R) + (L-R) (sum-diff)
DCA_AMODE_STEREO_TOTAL, // Mode 4: LT + RT (left and right total)
DCA_AMODE_3F, // Mode 5: C + L + R
DCA_AMODE_2F1R, // Mode 6: L + R + S
DCA_AMODE_3F1R, // Mode 7: C + L + R + S
DCA_AMODE_2F2R, // Mode 8: L + R + SL + SR
DCA_AMODE_3F2R, // Mode 9: C + L + R + SL + SR
DCA_AMODE_COUNT
};
enum DCACoreExtAudioType {
DCA_EXT_AUDIO_XCH = 0,
DCA_EXT_AUDIO_X96 = 2,
DCA_EXT_AUDIO_XXCH = 6
};
enum DCACoreLFEFlag {
DCA_LFE_FLAG_NONE,
DCA_LFE_FLAG_128,
DCA_LFE_FLAG_64,
DCA_LFE_FLAG_INVALID
};
typedef struct DCADSPData { typedef struct DCADSPData {
union { union {
struct { struct {

9
libavcodec/dca_lbr.c
View File

@ -30,11 +30,6 @@
#define AMP_MAX 56 #define AMP_MAX 56
enum LBRHeader {
LBR_HEADER_SYNC_ONLY = 1,
LBR_HEADER_DECODER_INIT = 2
};
enum LBRFlags { enum LBRFlags {
LBR_FLAG_24_BIT = 0x01, LBR_FLAG_24_BIT = 0x01,
LBR_FLAG_LFE_PRESENT = 0x02, LBR_FLAG_LFE_PRESENT = 0x02,
@ -1171,13 +1166,13 @@ int ff_dca_lbr_parse(DCALbrDecoder *s, uint8_t *data, DCAExssAsset *asset)
// LBR header type // LBR header type
switch (bytestream2_get_byte(&gb)) { switch (bytestream2_get_byte(&gb)) {
case LBR_HEADER_SYNC_ONLY: case DCA_LBR_HEADER_SYNC_ONLY:
if (!s->sample_rate) { if (!s->sample_rate) {
av_log(s->avctx, AV_LOG_ERROR, "LBR decoder not initialized\n"); av_log(s->avctx, AV_LOG_ERROR, "LBR decoder not initialized\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
break; break;
case LBR_HEADER_DECODER_INIT: case DCA_LBR_HEADER_DECODER_INIT:
if ((ret = parse_decoder_init(s, &gb)) < 0) { if ((ret = parse_decoder_init(s, &gb)) < 0) {
s->sample_rate = 0; s->sample_rate = 0;
return ret; return ret;

5
libavcodec/dca_lbr.h
View File

@ -41,6 +41,11 @@
#define DCA_LBR_TIME_SAMPLES 128 #define DCA_LBR_TIME_SAMPLES 128
#define DCA_LBR_TIME_HISTORY 8 #define DCA_LBR_TIME_HISTORY 8
enum DCALBRHeader {
DCA_LBR_HEADER_SYNC_ONLY = 1,
DCA_LBR_HEADER_DECODER_INIT = 2
};
typedef struct DCALbrTone { typedef struct DCALbrTone {
uint8_t x_freq; ///< Spectral line offset uint8_t x_freq; ///< Spectral line offset
uint8_t f_delt; ///< Difference between original and center frequency uint8_t f_delt; ///< Difference between original and center frequency