From 0a5754c3b729cf8fc9b938ac0724ee7261aa1606 Mon Sep 17 00:00:00 2001 From: Bartlomiej Wolowiec Date: Sat, 5 Apr 2008 20:09:36 +0000 Subject: change of aac_ac3_parser, so it is able to send complete portion of data to decoder Originally committed as revision 12758 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/ac3_parser.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'libavcodec/ac3_parser.c') diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index d0a22b9950..57cd87f10d 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -123,12 +123,14 @@ int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr) return 0; } -static int ac3_sync(AACAC3ParseContext *hdr_info, AACAC3FrameFlag *flag) +static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info, + int *need_next_header, int *new_frame_start) { int err; + uint64_t tmp = be2me_64(state); AC3HeaderInfo hdr; - err = ff_ac3_parse_header(hdr_info->inbuf, &hdr); + err = ff_ac3_parse_header((uint8_t *)&tmp, &hdr); if(err < 0) return 0; @@ -138,24 +140,14 @@ static int ac3_sync(AACAC3ParseContext *hdr_info, AACAC3FrameFlag *flag) hdr_info->channels = hdr.channels; hdr_info->samples = AC3_FRAME_SIZE; - switch(hdr.frame_type){ - case EAC3_FRAME_TYPE_INDEPENDENT: - *flag = FRAME_START; - break; - case EAC3_FRAME_TYPE_DEPENDENT: - *flag = FRAME_CONTINUATION; - break; - case EAC3_FRAME_TYPE_AC3_CONVERT: - *flag = FRAME_COMPLETE; - break; - } + *need_next_header = (hdr.frame_type != EAC3_FRAME_TYPE_AC3_CONVERT); + *new_frame_start = (hdr.frame_type != EAC3_FRAME_TYPE_DEPENDENT); return hdr.frame_size; } static av_cold int ac3_parse_init(AVCodecParserContext *s1) { AACAC3ParseContext *s = s1->priv_data; - s->inbuf_ptr = s->inbuf; s->header_size = AC3_HEADER_SIZE; s->sync = ac3_sync; return 0; -- cgit v1.2.3