[FFmpeg-soc] [soc]: r1334 - dirac/libavcodec/dirac.c

[marco]

Author: marco
Date: Mon Sep 10 18:12:37 2007
New Revision: 1334

Log:
reenable the code to check for a zero codeblock

Modified:
   dirac/libavcodec/dirac.c

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	(original)
+++ dirac/libavcodec/dirac.c	Mon Sep 10 18:12:37 2007
@@ -3152,8 +3152,7 @@ static void encode_codeblock(DiracContex
     bottom = (subband_height(s, level) * (ypos + 1)) / s->codeblocksv[level];
 
     if (!blockcnt_one) {
-#if 0
-        int zero = 1;
+        int zero = 0;
         for (y = top; y < bottom; y++) {
             for (x = left; x < right; x++) {
                 if (coeffs[x + y * s->padded_width] != 0) {
@@ -3162,20 +3161,11 @@ static void encode_codeblock(DiracContex
                 }
             }
         }
-#endif
-        /* XXX: Check if this is a zero codeblock.  For now just
-           encode like it isn't.  */
-        if (!blockcnt_one) {
-#if 0
+
         dirac_arith_put_bit(&s->arith, ARITH_CONTEXT_ZERO_BLOCK, zero);
-#endif
-        dirac_arith_put_bit(&s->arith, ARITH_CONTEXT_ZERO_BLOCK, 0);
-        }
 
-#if 0
         if (zero)
             return;
-#endif
     }
 
     for (y = top; y < bottom; y++)