Mercurial > libavcodec.hg

changeset 3267:8072ed8993f6 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dtsdec.c copies one input packet at a time to a (static) buffer of size 4096 bytes while the packet can be up to 18726 bytes. The code also keeps decoding until all input data has been used up, not respecting AVCODEC_MAX_AUDIO_FRAME_SIZE. The patch increases the buffer size and return after decoding one frame. Also fixes dts_decode_init to return -1, not 1, on failure. Patch by Uoti Urpala ||| uoti : urpala |!| pp1 : inet : fi |||
author rtognimp
date Thu, 20 Apr 2006 19:23:57 +0000
parents 3b785e80ce3e
children f7a9d8dd476b
files dtsdec.c
diffstat 1 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/dtsdec.c	Wed Apr 19 19:51:56 2006 +0000
+++ b/dtsdec.c	Thu Apr 20 19:23:57 2006 +0000
@@ -33,8 +33,7 @@
 #include <malloc.h>
 #endif
 
-#define INBUF_SIZE 4096
-#define BUFFER_SIZE 4096
+#define BUFFER_SIZE 18726
 #define HEADER_SIZE 14
 
 #ifdef LIBDTS_FIXED
@@ -231,9 +230,11 @@
       memcpy (bufptr, start, len);
       bufptr += len;
       start += len;
-      if (bufptr == bufpos)
-        {
-          if (bufpos == buf + HEADER_SIZE)
+      if (bufptr != bufpos)
+          return start - buff;
+      if (bufpos != buf + HEADER_SIZE)
+          break;
+
             {
               int length;
 
@@ -248,7 +249,8 @@
                 }
               bufpos = buf + length;
             }
-          else
+    }
+
             {
               level_t level;
               sample_t bias;
@@ -280,16 +282,14 @@
                 }
               bufptr = buf;
               bufpos = buf + HEADER_SIZE;
-              continue;
+              return start-buff;
             error:
               av_log (NULL, AV_LOG_ERROR, "error\n");
               bufptr = buf;
               bufpos = buf + HEADER_SIZE;
             }
-        }
-    }
 
-  return buff_size;
+  return start-buff;
 }
 
 static int
@@ -297,7 +297,7 @@
 {
   avctx->priv_data = dts_init (0);
   if (avctx->priv_data == NULL)
-    return 1;
+    return -1;
 
   return 0;
 }