[FFmpeg-soc] [soc]: r1653 - dirac/libavcodec/diracdec.c

[marco]

Author: marco
Date: Sun Dec 23 12:26:43 2007
New Revision: 1653

Log:
adept to the bitstream changes from the spec

Modified:
   dirac/libavcodec/diracdec.c

Modified: dirac/libavcodec/diracdec.c
==============================================================================
--- dirac/libavcodec/diracdec.c	(original)
+++ dirac/libavcodec/diracdec.c	Sun Dec 23 12:26:43 2007
@@ -465,7 +465,6 @@ static int dirac_unpack_prediction_param
     GetBitContext *gb = &s->gb;
 
     /* Override block parameters.  */
-    if (get_bits1(gb)) {
         unsigned int idx = svq3_get_ue_golomb(gb);
 
         if (idx > 3)
@@ -477,12 +476,11 @@ static int dirac_unpack_prediction_param
             s->frame_decoding.luma_xbsep = svq3_get_ue_golomb(gb);
             s->frame_decoding.luma_ybsep = svq3_get_ue_golomb(gb);
         } else {
-            s->frame_decoding.luma_xblen = dirac_block_param_defaults[idx].xblen;
-            s->frame_decoding.luma_yblen = dirac_block_param_defaults[idx].yblen;
-            s->frame_decoding.luma_xbsep = dirac_block_param_defaults[idx].xbsep;
-            s->frame_decoding.luma_ybsep = dirac_block_param_defaults[idx].ybsep;
+            s->frame_decoding.luma_xblen = dirac_block_param_defaults[idx - 1].xblen;
+            s->frame_decoding.luma_yblen = dirac_block_param_defaults[idx - 1].yblen;
+            s->frame_decoding.luma_xbsep = dirac_block_param_defaults[idx - 1].xbsep;
+            s->frame_decoding.luma_ybsep = dirac_block_param_defaults[idx - 1].ybsep;
         }
-    }
 
     /* Setup the blen and bsep parameters for the chroma
        component.  */
@@ -496,7 +494,6 @@ static int dirac_unpack_prediction_param
                                       >> s->chroma_vshift);
 
     /* Override motion vector precision.  */
-    if (get_bits1(gb))
         s->frame_decoding.mv_precision = svq3_get_ue_golomb(gb);
 
     /* Read the global motion compensation parameters.  */
@@ -531,10 +528,8 @@ static int dirac_unpack_prediction_param
     }
 
     /* Picture prediction mode.  Not used yet in the specification.  */
-    if (get_bits1(gb)) {
         /* Just ignore it, it should and will be zero.  */
         svq3_get_ue_golomb(gb);
-    }
 
     /* XXX: For now set the weights here, I can't find this in the
        specification.  */