Move AVMediaType from libavcodec to libavutil.

[ffmpeg] / libavcodec / dca_parser.c

diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c
index 6618b3156535e6985ec525625226592ffcc11b1a..49b2ecd3f5d6380cea8a623d2beb6d9be612df63 100644 (file)
--- a/libavcodec/dca_parser.c
+++ b/libavcodec/dca_parser.c
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file dca_parser.c
+ * @file libavcodec/dca_parser.c
  */
 
 #include "parser.h"
@@ -32,6 +32,9 @@
 typedef struct DCAParseContext {
     ParseContext pc;
     uint32_t lastmarker;
+    int size;
+    int framesize;
+    int hd_pos;
 } DCAParseContext;
 
 #define IS_MARKER(state, i, buf, buf_size) \
@@ -71,10 +74,19 @@ 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 == DCA_HD_MARKER && !pc1->hd_pos)
+                pc1->hd_pos = pc1->size;
             if (state == pc1->lastmarker && IS_MARKER(state, i, buf, buf_size)) {
+                if(pc1->framesize > pc1->size)
+                    continue;
+                if(!pc1->framesize){
+                    pc1->framesize = pc1->hd_pos ? pc1->hd_pos : pc1->size;
+                }
                 pc->frame_start_found = 0;
                 pc->state = -1;
+                pc1->size = 0;
                 return i - 3;
             }
         }
@@ -84,7 +96,7 @@ static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf,
     return END_NOT_FOUND;
 }
 
-static int dca_parse_init(AVCodecParserContext * s)
+static av_cold int dca_parse_init(AVCodecParserContext * s)
 {
     DCAParseContext *pc1 = s->priv_data;