Mercurial > libavcodec.hg

changeset 8226:ee1b8c54a603 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for parsing and decoding DCA-HD streams.
author kostya
date Sat, 29 Nov 2008 10:06:37 +0000
parents d133e597db2d
children 596677256482
files dca.c dca.h dca_parser.c
diffstat 3 files changed, 15 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/dca.c	Sat Nov 29 06:24:47 2008 +0000
+++ b/dca.c	Sat Nov 29 10:06:37 2008 +0000
@@ -1175,8 +1175,9 @@
     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);
--- a/dca.h	Sat Nov 29 06:24:47 2008 +0000
+++ b/dca.h	Sat Nov 29 10:06:37 2008 +0000
@@ -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 */
--- a/dca_parser.c	Sat Nov 29 06:24:47 2008 +0000
+++ b/dca_parser.c	Sat Nov 29 10:06:37 2008 +0000
@@ -34,6 +34,7 @@
     uint32_t lastmarker;
     int size;
     int framesize;
+    int hd_pos;
 } DCAParseContext;
 
 #define IS_MARKER(state, i, buf, buf_size) \
@@ -75,10 +76,16 @@
         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;
             }