[FFmpeg-cvslog] r15951 - in trunk/libavcodec: dca.c dca.h dca_parser.c

[kostya]

Author: kostya
Date: Sat Nov 29 11:06:37 2008
New Revision: 15951

Log:
Add support for parsing and decoding DCA-HD streams.


Modified:
   trunk/libavcodec/dca.c
   trunk/libavcodec/dca.h
   trunk/libavcodec/dca_parser.c

Modified: trunk/libavcodec/dca.c
==============================================================================
--- trunk/libavcodec/dca.c	(original)
+++ trunk/libavcodec/dca.c	Sat Nov 29 11:06:37 2008
@@ -1175,8 +1175,9 @@ static int dca_convert_bitstream(const u
     PutBitContext pb;
 
     if((unsigned)src_size > (unsigned)max_size) {
-        av_log(NULL, AV_LOG_ERROR, "Input frame size larger then DCA_MAX_FRAME_SIZE!\n");
-        return -1;
+//        av_log(NULL, AV_LOG_ERROR, "Input frame size larger then DCA_MAX_FRAME_SIZE!\n");
+//        return -1;
+        src_size = max_size;
     }
 
     mrk = AV_RB32(src);

Modified: trunk/libavcodec/dca.h
==============================================================================
--- trunk/libavcodec/dca.h	(original)
+++ trunk/libavcodec/dca.h	Sat Nov 29 11:06:37 2008
@@ -31,4 +31,7 @@
 #define DCA_MARKER_14B_BE 0x1FFFE800
 #define DCA_MARKER_14B_LE 0xFF1F00E8
 
+/** DCA-HD specific block starts with this marker. */
+#define DCA_HD_MARKER     0x64582025
+
 #endif /* AVCODEC_DCA_H */

Modified: trunk/libavcodec/dca_parser.c
==============================================================================
--- trunk/libavcodec/dca_parser.c	(original)
+++ trunk/libavcodec/dca_parser.c	Sat Nov 29 11:06:37 2008
@@ -34,6 +34,7 @@ typedef struct DCAParseContext {
     uint32_t lastmarker;
     int size;
     int framesize;
+    int hd_pos;
 } DCAParseContext;
 
 #define IS_MARKER(state, i, buf, buf_size) \
@@ -75,10 +76,16 @@ static int dca_find_frame_end(DCAParseCo
         for (; i < buf_size; i++) {
             pc1->size++;
             state = (state << 8) | buf[i];
-            if (state == pc1->lastmarker && IS_MARKER(state, i, buf, buf_size) && (!pc1->framesize || pc1->framesize == pc1->size)) {
+            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->framesize = pc1->size;
                 pc1->size = 0;
                 return i - 3;
             }