From 469d8816d6e1a2eaee3f590c1125ed9586da3014 Mon Sep 17 00:00:00 2001 From: Bartlomiej Wolowiec Date: Wed, 9 Apr 2008 22:11:21 +0000 Subject: undo changes in aac_ac3_parser Originally committed as revision 12778 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/aac_parser.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'libavcodec/aac_parser.c') diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c index 9fbef864a1..2e4334f440 100644 --- a/libavcodec/aac_parser.c +++ b/libavcodec/aac_parser.c @@ -27,14 +27,12 @@ #define AAC_HEADER_SIZE 7 -static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info, - int *need_next_header, int *new_frame_start) +static int aac_sync(AACAC3ParseContext *hdr_info, AACAC3FrameFlag *flag) { GetBitContext bits; int size, rdb, ch, sr; - uint64_t tmp = be2me_64(state); - init_get_bits(&bits, ((uint8_t *)&tmp)+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8); + init_get_bits(&bits, hdr_info->inbuf, AAC_HEADER_SIZE * 8); if(get_bits(&bits, 12) != 0xfff) return 0; @@ -67,15 +65,15 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info, hdr_info->sample_rate = ff_mpeg4audio_sample_rates[sr]; hdr_info->samples = (rdb + 1) * 1024; hdr_info->bit_rate = size * 8 * hdr_info->sample_rate / hdr_info->samples; + *flag = FRAME_COMPLETE; - *need_next_header=0; - *new_frame_start=1; return size; } static av_cold int aac_parse_init(AVCodecParserContext *s1) { AACAC3ParseContext *s = s1->priv_data; + s->inbuf_ptr = s->inbuf; s->header_size = AAC_HEADER_SIZE; s->sync = aac_sync; return 0; -- cgit v1.2.3