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

conrad subversion at mplayerhq.hu
Thu Dec 4 22:10:32 CET 2008


Author: conrad
Date: Thu Dec  4 22:10:32 2008
New Revision: 3863

Log:
Group decode_component with the other coefficient decoding functions


Modified:
   dirac/libavcodec/diracdec.c

Modified: dirac/libavcodec/diracdec.c
==============================================================================
--- dirac/libavcodec/diracdec.c	(original)
+++ dirac/libavcodec/diracdec.c	Thu Dec  4 22:10:32 2008
@@ -258,6 +258,30 @@ static int subband_dc(DiracContext *s, i
 }
 
 /**
+ * Decode a single component
+ *
+ * @param coeffs coefficients for this component
+ */
+static void decode_component(DiracContext *s, int16_t *coeffs)
+{
+    GetBitContext *gb = &s->gb;
+    int level;
+    dirac_subband orientation;
+
+    /* Align for coefficient bitstream. */
+    align_get_bits(gb);
+
+    /* Unpack LL, level 0. */
+    subband_dc(s, coeffs);
+
+    /* Unpack all other subbands at all levels. */
+    for (level = 1; level <= s->decoding.wavelet_depth; level++) {
+        for (orientation = 1; orientation <= subband_hh; orientation++)
+            subband(s, coeffs, level, orientation);
+    }
+}
+
+/**
  * Unpack the motion compensation parameters
  */
 static int dirac_unpack_prediction_parameters(DiracContext *s)
@@ -570,30 +594,6 @@ static int dirac_unpack_block_motion_dat
 }
 
 /**
- * Decode a single component
- *
- * @param coeffs coefficients for this component
- */
-static void decode_component(DiracContext *s, int16_t *coeffs)
-{
-    GetBitContext *gb = &s->gb;
-    int level;
-    dirac_subband orientation;
-
-    /* Align for coefficient bitstream. */
-    align_get_bits(gb);
-
-    /* Unpack LL, level 0. */
-    subband_dc(s, coeffs);
-
-    /* Unpack all other subbands at all levels. */
-    for (level = 1; level <= s->decoding.wavelet_depth; level++) {
-        for (orientation = 1; orientation <= subband_hh; orientation++)
-            subband(s, coeffs, level, orientation);
-    }
- }
-
-/**
  * IDWT
  *
  * @param coeffs coefficients to transform



More information about the FFmpeg-soc mailing list