Fix overflows in bicubic interpolation.

[ffmpeg] / libavcodec / jfdctint.c

diff --git a/libavcodec/jfdctint.c b/libavcodec/jfdctint.c
index e1bf2c566c1ff388f737d23cf0d5a55ab2fc18e8..41d27499134e659edfb7dd109e1b69d4ac3d9ccd 100644 (file)
--- a/libavcodec/jfdctint.c
+++ b/libavcodec/jfdctint.c
@@ -92,10 +92,10 @@
 
 #if BITS_IN_JSAMPLE == 8
 #define CONST_BITS  13
-#define PASS1_BITS  4          /* set this to 2 if 16x16 multiplies are faster */
+#define PASS1_BITS  4   /* set this to 2 if 16x16 multiplies are faster */
 #else
 #define CONST_BITS  13
-#define PASS1_BITS  1          /* lose a little precision to avoid overflow */
+#define PASS1_BITS  1   /* lose a little precision to avoid overflow */
 #endif
 
 /* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
@@ -106,18 +106,18 @@
  */
 
 #if CONST_BITS == 13
-#define FIX_0_298631336  ((int32_t)  2446)     /* FIX(0.298631336) */
-#define FIX_0_390180644  ((int32_t)  3196)     /* FIX(0.390180644) */
-#define FIX_0_541196100  ((int32_t)  4433)     /* FIX(0.541196100) */
-#define FIX_0_765366865  ((int32_t)  6270)     /* FIX(0.765366865) */
-#define FIX_0_899976223  ((int32_t)  7373)     /* FIX(0.899976223) */
-#define FIX_1_175875602  ((int32_t)  9633)     /* FIX(1.175875602) */
-#define FIX_1_501321110  ((int32_t)  12299)    /* FIX(1.501321110) */
-#define FIX_1_847759065  ((int32_t)  15137)    /* FIX(1.847759065) */
-#define FIX_1_961570560  ((int32_t)  16069)    /* FIX(1.961570560) */
-#define FIX_2_053119869  ((int32_t)  16819)    /* FIX(2.053119869) */
-#define FIX_2_562915447  ((int32_t)  20995)    /* FIX(2.562915447) */
-#define FIX_3_072711026  ((int32_t)  25172)    /* FIX(3.072711026) */
+#define FIX_0_298631336  ((int32_t)  2446)      /* FIX(0.298631336) */
+#define FIX_0_390180644  ((int32_t)  3196)      /* FIX(0.390180644) */
+#define FIX_0_541196100  ((int32_t)  4433)      /* FIX(0.541196100) */
+#define FIX_0_765366865  ((int32_t)  6270)      /* FIX(0.765366865) */
+#define FIX_0_899976223  ((int32_t)  7373)      /* FIX(0.899976223) */
+#define FIX_1_175875602  ((int32_t)  9633)      /* FIX(1.175875602) */
+#define FIX_1_501321110  ((int32_t)  12299)     /* FIX(1.501321110) */
+#define FIX_1_847759065  ((int32_t)  15137)     /* FIX(1.847759065) */
+#define FIX_1_961570560  ((int32_t)  16069)     /* FIX(1.961570560) */
+#define FIX_2_053119869  ((int32_t)  16819)     /* FIX(2.053119869) */
+#define FIX_2_562915447  ((int32_t)  20995)     /* FIX(2.562915447) */
+#define FIX_3_072711026  ((int32_t)  25172)     /* FIX(3.072711026) */
 #else
 #define FIX_0_298631336  FIX(0.298631336)
 #define FIX_0_390180644  FIX(0.390180644)
@@ -185,9 +185,9 @@ static always_inline void row_fdct(DCTELEM * data){
 
     z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);
     dataptr[2] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
-                                  CONST_BITS-PASS1_BITS);
+                                   CONST_BITS-PASS1_BITS);
     dataptr[6] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp12, - FIX_1_847759065),
-                                  CONST_BITS-PASS1_BITS);
+                                   CONST_BITS-PASS1_BITS);
 
     /* Odd part per figure 8 --- note paper omits factor of sqrt(2).
      * cK represents cos(K*pi/16).
@@ -217,7 +217,7 @@ static always_inline void row_fdct(DCTELEM * data){
     dataptr[3] = (DCTELEM) DESCALE(tmp6 + z2 + z3, CONST_BITS-PASS1_BITS);
     dataptr[1] = (DCTELEM) DESCALE(tmp7 + z1 + z4, CONST_BITS-PASS1_BITS);
 
-    dataptr += DCTSIZE;                /* advance pointer to next row */
+    dataptr += DCTSIZE;         /* advance pointer to next row */
   }
 }
 
@@ -267,9 +267,9 @@ ff_jpeg_fdct_islow (DCTELEM * data)
 
     z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);
     dataptr[DCTSIZE*2] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
-                                          CONST_BITS+PASS1_BITS);
+                                           CONST_BITS+PASS1_BITS);
     dataptr[DCTSIZE*6] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp12, - FIX_1_847759065),
-                                          CONST_BITS+PASS1_BITS);
+                                           CONST_BITS+PASS1_BITS);
 
     /* Odd part per figure 8 --- note paper omits factor of sqrt(2).
      * cK represents cos(K*pi/16).
@@ -295,15 +295,15 @@ ff_jpeg_fdct_islow (DCTELEM * data)
     z4 += z5;
 
     dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp4 + z1 + z3,
-                                          CONST_BITS+PASS1_BITS);
+                                           CONST_BITS+PASS1_BITS);
     dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp5 + z2 + z4,
-                                          CONST_BITS+PASS1_BITS);
+                                           CONST_BITS+PASS1_BITS);
     dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp6 + z2 + z3,
-                                          CONST_BITS+PASS1_BITS);
+                                           CONST_BITS+PASS1_BITS);
     dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp7 + z1 + z4,
-                                          CONST_BITS+PASS1_BITS);
+                                           CONST_BITS+PASS1_BITS);
 
-    dataptr++;                 /* advance pointer to next column */
+    dataptr++;                  /* advance pointer to next column */
   }
 }
 
@@ -350,9 +350,9 @@ ff_fdct248_islow (DCTELEM * data)
 
      z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);
      dataptr[DCTSIZE*2] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
-                                           CONST_BITS+PASS1_BITS);
+                                            CONST_BITS+PASS1_BITS);
      dataptr[DCTSIZE*6] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp12, - FIX_1_847759065),
-                                           CONST_BITS+PASS1_BITS);
+                                            CONST_BITS+PASS1_BITS);
 
      tmp10 = tmp4 + tmp7;
      tmp11 = tmp5 + tmp6;
@@ -364,10 +364,10 @@ ff_fdct248_islow (DCTELEM * data)
 
      z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);
      dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
-                                           CONST_BITS+PASS1_BITS);
+                                            CONST_BITS+PASS1_BITS);
      dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp12, - FIX_1_847759065),
-                                           CONST_BITS+PASS1_BITS);
+                                            CONST_BITS+PASS1_BITS);
 
-     dataptr++;                        /* advance pointer to next column */
+     dataptr++;                 /* advance pointer to next column */
   }
 }