generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

aac: decode directly to the user-provided AVFrame

Browse Source
This commit is contained in:
Justin Ruggles 2012-12-23 16:37:23 -05:00
parent a3de4010c2
commit ffd2123095
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aac.h
View File

@ -262,7 +262,7 @@ typedef struct ChannelElement {
*/ */
typedef struct AACContext { typedef struct AACContext {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame frame; AVFrame *frame;
int is_saved; ///< Set if elements have stored overlap from previous frame. int is_saved; ///< Set if elements have stored overlap from previous frame.
DynamicRangeControl che_drc; DynamicRangeControl che_drc;

17
libavcodec/aacdec.c
View File

@ -180,8 +180,8 @@ static int frame_configure_elements(AVCodecContext *avctx)
} }
/* get output buffer */ /* get output buffer */
ac->frame.nb_samples = 2048; ac->frame->nb_samples = 2048;
if ((ret = ff_get_buffer(avctx, &ac->frame)) < 0) { if ((ret = ff_get_buffer(avctx, ac->frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret; return ret;
} }
@ -189,7 +189,7 @@ static int frame_configure_elements(AVCodecContext *avctx)
/* map output channel pointers to AVFrame data */ /* map output channel pointers to AVFrame data */
for (ch = 0; ch < avctx->channels; ch++) { for (ch = 0; ch < avctx->channels; ch++) {
if (ac->output_element[ch]) if (ac->output_element[ch])
ac->output_element[ch]->ret = (float *)ac->frame.extended_data[ch]; ac->output_element[ch]->ret = (float *)ac->frame->extended_data[ch];
} }
return 0; return 0;
@ -918,9 +918,6 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)
cbrt_tableinit(); cbrt_tableinit();
avcodec_get_frame_defaults(&ac->frame);
avctx->coded_frame = &ac->frame;
return 0; return 0;
} }
@ -2389,6 +2386,8 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
int err, elem_id; int err, elem_id;
int samples = 0, multiplier, audio_found = 0, pce_found = 0; int samples = 0, multiplier, audio_found = 0, pce_found = 0;
ac->frame = data;
if (show_bits(gb, 12) == 0xfff) { if (show_bits(gb, 12) == 0xfff) {
if (parse_adts_frame_header(ac, gb) < 0) { if (parse_adts_frame_header(ac, gb) < 0) {
av_log(avctx, AV_LOG_ERROR, "Error decoding AAC frame header.\n"); av_log(avctx, AV_LOG_ERROR, "Error decoding AAC frame header.\n");
@ -2503,10 +2502,8 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
multiplier = (ac->oc[1].m4ac.sbr == 1) ? ac->oc[1].m4ac.ext_sample_rate > ac->oc[1].m4ac.sample_rate : 0; multiplier = (ac->oc[1].m4ac.sbr == 1) ? ac->oc[1].m4ac.ext_sample_rate > ac->oc[1].m4ac.sample_rate : 0;
samples <<= multiplier; samples <<= multiplier;
if (samples) { if (samples)
ac->frame.nb_samples = samples; ac->frame->nb_samples = samples;
*(AVFrame *)data = ac->frame;
}
*got_frame_ptr = !!samples; *got_frame_ptr = !!samples;
if (ac->oc[1].status && audio_found) { if (ac->oc[1].status && audio_found) {