h264: propagate error return values for AV_LOG_ERROR-triggering events

[ffmpeg] / libavcodec / dca_parser.c

diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c
index 90eac203ebbe0665dbf58da44f9febe7ce65b4cd..70a3e989ba62c72c5d5e2d16a4375a56ca4b3db9 100644 (file)
--- a/libavcodec/dca_parser.c
+++ b/libavcodec/dca_parser.c
@@ -5,33 +5,32 @@
  * Copyright (C) 2006 Benjamin Larsson
  * Copyright (C) 2007 Konstantin Shishkov
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/**
- * @file dca_parser.c
- */
-
 #include "parser.h"
 #include "dca.h"
 
 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 +70,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 +92,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;
 
@@ -94,7 +102,7 @@ static int dca_parse_init(AVCodecParserContext * s)
 
 static int dca_parse(AVCodecParserContext * s,
                      AVCodecContext * avctx,
-                     uint8_t ** poutbuf, int *poutbuf_size,
+                     const uint8_t ** poutbuf, int *poutbuf_size,
                      const uint8_t * buf, int buf_size)
 {
     DCAParseContext *pc1 = s->priv_data;
@@ -106,18 +114,18 @@ static int dca_parse(AVCodecParserContext * s,
     } else {
         next = dca_find_frame_end(pc1, buf, buf_size);
 
-        if (ff_combine_frame(pc, next, (uint8_t **) & buf, &buf_size) < 0) {
+        if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
             *poutbuf = NULL;
             *poutbuf_size = 0;
             return buf_size;
         }
     }
-    *poutbuf = (uint8_t *) buf;
+    *poutbuf = buf;
     *poutbuf_size = buf_size;
     return next;
 }
 
-AVCodecParser dca_parser = {
+AVCodecParser ff_dca_parser = {
     {CODEC_ID_DTS},
     sizeof(DCAParseContext),
     dca_parse_init,