From f4bcc857cb71695ac774a3e44ddc5c1dc9683e4d Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Tue, 15 Apr 2008 13:36:56 +0000 Subject: DCA frame size is constant Originally committed as revision 12835 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/dca_parser.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libavcodec/dca_parser.c') diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c index be9af1fd63..f182506f8a 100644 --- a/libavcodec/dca_parser.c +++ b/libavcodec/dca_parser.c @@ -32,6 +32,8 @@ typedef struct DCAParseContext { ParseContext pc; uint32_t lastmarker; + int size; + int framesize; } DCAParseContext; #define IS_MARKER(state, i, buf, buf_size) \ @@ -71,10 +73,13 @@ static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf, } if (start_found) { for (; i < buf_size; i++) { + pc1->size++; state = (state << 8) | buf[i]; - if (state == pc1->lastmarker && IS_MARKER(state, i, buf, buf_size)) { + if (state == pc1->lastmarker && IS_MARKER(state, i, buf, buf_size) && (!pc1->framesize || pc1->framesize == pc1->size)) { pc->frame_start_found = 0; pc->state = -1; + pc1->framesize = pc1->size; + pc1->size = 0; return i - 3; } } -- cgit v1.2.3