[FFmpeg-cvslog] r10915 - trunk/libavcodec/flac.c

[jbr]

Author: jbr
Date: Sun Nov  4 00:54:50 2007
New Revision: 10915

Log:
Add support for FLAC's new RICE2 entropy coding method. Patch by Josh Coalson.

Modified:
   trunk/libavcodec/flac.c

Modified: trunk/libavcodec/flac.c
==============================================================================
--- trunk/libavcodec/flac.c	(original)
+++ trunk/libavcodec/flac.c	Sun Nov  4 00:54:50 2007
@@ -217,7 +217,7 @@ static int decode_residuals(FLACContext 
     int sample = 0, samples;
 
     method_type = get_bits(&s->gb, 2);
-    if (method_type != 0){
+    if (method_type > 1){
         av_log(s->avctx, AV_LOG_DEBUG, "illegal residual coding method %d\n", method_type);
         return -1;
     }
@@ -234,8 +234,8 @@ static int decode_residuals(FLACContext 
     i= pred_order;
     for (partition = 0; partition < (1 << rice_order); partition++)
     {
-        tmp = get_bits(&s->gb, 4);
-        if (tmp == 15)
+        tmp = get_bits(&s->gb, method_type == 0 ? 4 : 5);
+        if (tmp == (method_type == 0 ? 15 : 31))
         {
             av_log(s->avctx, AV_LOG_DEBUG, "fixed len partition\n");
             tmp = get_bits(&s->gb, 5);