[FFmpeg-soc] [soc]: r3911 - in dirac/libavcodec: dirac.h diracdec.c

[conrad]

Author: conrad
Date: Thu Jan  1 21:31:30 2009
New Revision: 3911

Log:
Replace int16_t with IDWTELEM where appropriate

Modified:
   dirac/libavcodec/dirac.h
   dirac/libavcodec/diracdec.c

Modified: dirac/libavcodec/dirac.h
==============================================================================
--- dirac/libavcodec/dirac.h	Thu Jan  1 21:31:28 2009	(r3910)
+++ dirac/libavcodec/dirac.h	Thu Jan  1 21:31:30 2009	(r3911)
@@ -273,7 +273,7 @@ static unsigned int inline coeff_quant_o
 }
 
 static inline
-int zero_neighbourhood(int16_t *data, int x, int y, int stride)
+int zero_neighbourhood(IDWTELEM *data, int x, int y, int stride)
 {
     /* Check if there is a zero to the left and top left of this
        coefficient. */
@@ -295,7 +295,7 @@ int zero_neighbourhood(int16_t *data, in
  * @return prediction for the sign: -1 when negative, 1 when positive, 0 when 0
  */
 static inline
-int sign_predict(int16_t *data, dirac_subband orientation,
+int sign_predict(IDWTELEM *data, dirac_subband orientation,
                  int x, int y, int stride)
 {
     if (orientation == subband_hl && y > 0)
@@ -307,7 +307,7 @@ int sign_predict(int16_t *data, dirac_su
 }
 
 static inline
-int intra_dc_coeff_prediction(int16_t *coeff, int x, int y, int stride)
+int intra_dc_coeff_prediction(IDWTELEM *coeff, int x, int y, int stride)
 {
     int pred;
     if (x > 0 && y > 0) {

Modified: dirac/libavcodec/diracdec.c
==============================================================================
--- dirac/libavcodec/diracdec.c	Thu Jan  1 21:31:28 2009	(r3910)
+++ dirac/libavcodec/diracdec.c	Thu Jan  1 21:31:30 2009	(r3911)
@@ -134,7 +134,7 @@ static inline int coeff_dequant(int coef
  * @param qfact quantizer factor
  */
 static inline void coeff_unpack_arith(DiracContext *s, SubBand *b,
-                         int16_t *coeffp, int x, int y,
+                         IDWTELEM *coeffp, int x, int y,
                          int qoffset, int qfactor)
 {
     int parent = 0;
@@ -169,7 +169,7 @@ static inline void coeff_unpack_arith(Di
     *coeffp = coeff;
 }
 
-static inline void coeff_unpack_vlc(DiracContext *s, SubBand *b, int16_t *buf,
+static inline void coeff_unpack_vlc(DiracContext *s, SubBand *b, IDWTELEM *buf,
                                     int x, int y, int qoffset, int qfactor)
 {
     int coeff, sign;
@@ -198,7 +198,7 @@ static inline void codeblock(DiracContex
 {
     int x, y;
     unsigned int qoffset, qfactor;
-    int16_t *buf;
+    IDWTELEM *buf;
 
     if (!blockcnt_one) {
         int zero_block;
@@ -240,7 +240,7 @@ static inline void codeblock(DiracContex
 static inline void intra_dc_prediction(SubBand *b)
 {
     int x, y;
-    int16_t *line = b->ibuf;
+    IDWTELEM *line = b->ibuf;
 
     for (y = 0; y < b->height; y++) {
         for (x = 0; x < b->width; x++) {
@@ -708,7 +708,7 @@ static int dirac_unpack_block_motion_dat
  */
 static int dirac_decode_frame_internal(DiracContext *s)
 {
-    int16_t *line;
+    IDWTELEM *line;
     int16_t *mcline;
     int comp;
     int x, y;