Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "aacdec: Reconfigure output as needed, disable pop_output_configuration()"

Browse Source 
This reverts commit 60dbf2eff9.

This is not needed anymore, Ticket 1694 has been fixed differently
pull/19/head
Michael Niedermayer 12 years ago
parent 8978c743fb
commit eab49f4fb5
3 changed files with 32 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      libavcodec/aac.h
  2. 39
      libavcodec/aacdec.c
  3. 13
      libavcodec/aacsbr.c

5
libavcodec/aac.h
Unescape View File

@ -328,11 +328,6 @@ struct AACContext {
}; };
int ff_aac_output_configure(AACContext *ac,
uint8_t layout_map[MAX_ELEM_ID*4][3], int tags,
enum OCStatus oc_type, int get_new_frame);
void ff_aacdec_init_mips(AACContext *c); void ff_aacdec_init_mips(AACContext *c);
#endif /* AVCODEC_AAC_H */ #endif /* AVCODEC_AAC_H */

39
libavcodec/aacdec.c
Unescape View File

@ -114,6 +114,10 @@
static VLC vlc_scalefactors; static VLC vlc_scalefactors;
static VLC vlc_spectral[11]; static VLC vlc_spectral[11];
static int output_configure(AACContext *ac,
uint8_t layout_map[MAX_ELEM_ID*4][3], int tags,
enum OCStatus oc_type, int get_new_frame);
#define overread_err "Input buffer exhausted before END element found\n" #define overread_err "Input buffer exhausted before END element found\n"
static int count_channels(uint8_t (*layout)[3], int tags) static int count_channels(uint8_t (*layout)[3], int tags)
@ -403,12 +407,11 @@ static void push_output_configuration(AACContext *ac) {
* configuration is unlocked. * configuration is unlocked.
*/ */
static void pop_output_configuration(AACContext *ac) { static void pop_output_configuration(AACContext *ac) {
return;
if (ac->oc[1].status != OC_LOCKED && ac->oc[0].status != OC_NONE) { if (ac->oc[1].status != OC_LOCKED && ac->oc[0].status != OC_NONE) {
ac->oc[1] = ac->oc[0]; ac->oc[1] = ac->oc[0];
ac->avctx->channels = ac->oc[1].channels; ac->avctx->channels = ac->oc[1].channels;
ac->avctx->channel_layout = ac->oc[1].channel_layout; ac->avctx->channel_layout = ac->oc[1].channel_layout;
ff_aac_output_configure(ac, ac->oc[1].layout_map, ac->oc[1].layout_map_tags, output_configure(ac, ac->oc[1].layout_map, ac->oc[1].layout_map_tags,
ac->oc[1].status, 0); ac->oc[1].status, 0);
} }
} }
@ -418,7 +421,7 @@ static void pop_output_configuration(AACContext *ac) {
* *
* @return Returns error status. 0 - OK, !0 - error * @return Returns error status. 0 - OK, !0 - error
*/ */
int ff_aac_output_configure(AACContext *ac, static int output_configure(AACContext *ac,
uint8_t layout_map[MAX_ELEM_ID*4][3], int tags, uint8_t layout_map[MAX_ELEM_ID*4][3], int tags,
enum OCStatus oc_type, int get_new_frame) enum OCStatus oc_type, int get_new_frame)
{ {
@ -522,7 +525,7 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
if (set_default_channel_config(ac->avctx, layout_map, &layout_map_tags, if (set_default_channel_config(ac->avctx, layout_map, &layout_map_tags,
2) < 0) 2) < 0)
return NULL; return NULL;
if (ff_aac_output_configure(ac, layout_map, layout_map_tags, if (output_configure(ac, layout_map, layout_map_tags,
OC_TRIAL_FRAME, 1) < 0) OC_TRIAL_FRAME, 1) < 0)
return NULL; return NULL;
@ -540,7 +543,7 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
if (set_default_channel_config(ac->avctx, layout_map, &layout_map_tags, if (set_default_channel_config(ac->avctx, layout_map, &layout_map_tags,
1) < 0) 1) < 0)
return NULL; return NULL;
if (ff_aac_output_configure(ac, layout_map, layout_map_tags, if (output_configure(ac, layout_map, layout_map_tags,
OC_TRIAL_FRAME, 1) < 0) OC_TRIAL_FRAME, 1) < 0)
return NULL; return NULL;
@ -734,7 +737,7 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx,
} else if (m4ac->sbr == 1 && m4ac->ps == -1) } else if (m4ac->sbr == 1 && m4ac->ps == -1)
m4ac->ps = 1; m4ac->ps = 1;
if (ac && (ret = ff_aac_output_configure(ac, layout_map, tags, OC_GLOBAL_HDR, 0))) if (ac && (ret = output_configure(ac, layout_map, tags, OC_GLOBAL_HDR, 0)))
return ret; return ret;
if (extension_flag) { if (extension_flag) {
@ -917,7 +920,7 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)
int ret = set_default_channel_config(avctx, layout_map, int ret = set_default_channel_config(avctx, layout_map,
&layout_map_tags, ac->oc[1].m4ac.chan_config); &layout_map_tags, ac->oc[1].m4ac.chan_config);
if (!ret) if (!ret)
ff_aac_output_configure(ac, layout_map, layout_map_tags, output_configure(ac, layout_map, layout_map_tags,
OC_GLOBAL_HDR, 0); OC_GLOBAL_HDR, 0);
else if (avctx->err_recognition & AV_EF_EXPLODE) else if (avctx->err_recognition & AV_EF_EXPLODE)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -2032,13 +2035,21 @@ static int decode_extension_payload(AACContext *ac, GetBitContext *gb, int cnt,
if (!che) { if (!che) {
av_log(ac->avctx, AV_LOG_ERROR, "SBR was found before the first channel element.\n"); av_log(ac->avctx, AV_LOG_ERROR, "SBR was found before the first channel element.\n");
return res; return res;
} else if (ac->oc[1].m4ac.sbr != 1) { } else if (!ac->oc[1].m4ac.sbr) {
av_log(ac->avctx, AV_LOG_DEBUG, "SBR was found in the bitstream.\n"); av_log(ac->avctx, AV_LOG_ERROR, "SBR signaled to be not-present but was found in the bitstream.\n");
skip_bits_long(gb, 8 * cnt - 4);
return res;
} else if (ac->oc[1].m4ac.sbr == -1 && ac->oc[1].status == OC_LOCKED) {
av_log(ac->avctx, AV_LOG_ERROR, "Implicit SBR was found with a first occurrence after the first frame.\n");
skip_bits_long(gb, 8 * cnt - 4);
return res;
} else if (ac->oc[1].m4ac.ps == -1 && ac->oc[1].status < OC_LOCKED && ac->avctx->channels == 1) {
ac->oc[1].m4ac.sbr = 1; ac->oc[1].m4ac.sbr = 1;
if (ac->oc[1].m4ac.ps == -1 && ac->avctx->channels == 1)
ac->oc[1].m4ac.ps = 1; ac->oc[1].m4ac.ps = 1;
ff_aac_output_configure(ac, ac->oc[1].layout_map, ac->oc[1].layout_map_tags, output_configure(ac, ac->oc[1].layout_map, ac->oc[1].layout_map_tags,
ac->oc[1].status, 1); ac->oc[1].status, 1);
} else {
ac->oc[1].m4ac.sbr = 1;
} }
res = ff_decode_sbr_extension(ac, &che->sbr, gb, crc_flag, cnt, elem_type); res = ff_decode_sbr_extension(ac, &che->sbr, gb, crc_flag, cnt, elem_type);
break; break;
@ -2429,7 +2440,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
if (set_default_channel_config(ac->avctx, layout_map, if (set_default_channel_config(ac->avctx, layout_map,
&layout_map_tags, hdr_info.chan_config)) &layout_map_tags, hdr_info.chan_config))
return -7; return -7;
if (ff_aac_output_configure(ac, layout_map, layout_map_tags, if (output_configure(ac, layout_map, layout_map_tags,
FFMAX(ac->oc[1].status, OC_TRIAL_FRAME), 0)) FFMAX(ac->oc[1].status, OC_TRIAL_FRAME), 0))
return -7; return -7;
} else { } else {
@ -2445,7 +2456,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
layout_map[0][2] = layout_map[1][2] = AAC_CHANNEL_FRONT; layout_map[0][2] = layout_map[1][2] = AAC_CHANNEL_FRONT;
layout_map[0][1] = 0; layout_map[0][1] = 0;
layout_map[1][1] = 1; layout_map[1][1] = 1;
if (ff_aac_output_configure(ac, layout_map, layout_map_tags, if (output_configure(ac, layout_map, layout_map_tags,
OC_TRIAL_FRAME, 0)) OC_TRIAL_FRAME, 0))
return -7; return -7;
} }
@ -2549,7 +2560,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Not evaluating a further program_config_element as this construct is dubious at best.\n"); "Not evaluating a further program_config_element as this construct is dubious at best.\n");
} else { } else {
err = ff_aac_output_configure(ac, layout_map, tags, OC_TRIAL_PCE, 1); err = output_configure(ac, layout_map, tags, OC_TRIAL_PCE, 1);
if (!err) if (!err)
ac->oc[1].m4ac.chan_config = 0; ac->oc[1].m4ac.chan_config = 0;
pce_found = 1; pce_found = 1;

13
libavcodec/aacsbr.c
Unescape View File

@ -925,13 +925,11 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr,
{ {
switch (bs_extension_id) { switch (bs_extension_id) {
case EXTENSION_ID_PS: case EXTENSION_ID_PS:
if (ac->oc[1].m4ac.ps != 1) { if (!ac->oc[1].m4ac.ps) {
av_log(ac->avctx, AV_LOG_DEBUG, "Parametric Stereo was found in the bitstream.\n"); av_log(ac->avctx, AV_LOG_ERROR, "Parametric Stereo signaled to be not-present but was found in the bitstream.\n");
ac->oc[1].m4ac.ps = 1; skip_bits_long(gb, *num_bits_left); // bs_fill_bits
ff_aac_output_configure(ac, ac->oc[1].layout_map, ac->oc[1].layout_map_tags, *num_bits_left = 0;
ac->oc[1].status, 1); } else {
}
av_assert0(ac->oc[1].m4ac.ps);
#if 1 #if 1
*num_bits_left -= ff_ps_read_data(ac->avctx, gb, &sbr->ps, *num_bits_left); *num_bits_left -= ff_ps_read_data(ac->avctx, gb, &sbr->ps, *num_bits_left);
#else #else
@ -939,6 +937,7 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr,
skip_bits_long(gb, *num_bits_left); // bs_fill_bits skip_bits_long(gb, *num_bits_left); // bs_fill_bits
*num_bits_left = 0; *num_bits_left = 0;
#endif #endif
}
break; break;
default: default:
// some files contain 0-padding // some files contain 0-padding

Write Preview
Loading…
Cancel
Save