aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2008-04-15 13:36:56 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2008-04-15 13:36:56 +0000
commitf4bcc857cb71695ac774a3e44ddc5c1dc9683e4d (patch)
tree0d908cc1b6a36fc1a00526f1cb322fc2b5a72cbc
parenta8f0c9c5b98890423b949f5a2dd474d2393fc524 (diff)
downloadffmpeg-f4bcc857cb71695ac774a3e44ddc5c1dc9683e4d.tar.gz
DCA frame size is constant
Originally committed as revision 12835 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/dca_parser.c7
1 files changed, 6 insertions, 1 deletions
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;
}
}