shithub: libvpx

Info  •  Files  •  Log  •  Branches

Rename defined constants

The change is to better reflect the nature of the constants.

Change-Id: Icabac6e9bceefbdb3f03f8218f88ef75943c30fb

--- a/vp9/common/vp9_idct.c

+++ b/vp9/common/vp9_idct.c

@@ -28,10 +28,10 @@

   int16_t *op = output;

   for (i = 0; i < 4; i++) {

-    a1 = ip[0] >> WHT_UPSCALE_FACTOR;

-    c1 = ip[1] >> WHT_UPSCALE_FACTOR;

-    d1 = ip[2] >> WHT_UPSCALE_FACTOR;

-    b1 = ip[3] >> WHT_UPSCALE_FACTOR;

+    a1 = ip[0] >> UNIT_QUANT_SHIFT;

+    c1 = ip[1] >> UNIT_QUANT_SHIFT;

+    d1 = ip[2] >> UNIT_QUANT_SHIFT;

+    b1 = ip[3] >> UNIT_QUANT_SHIFT;

     a1 += c1;

     d1 -= b1;

     e1 = (a1 - d1) >> 1;

@@ -77,7 +77,7 @@

   int16_t *ip = in;

   int16_t *op = tmp;

-  a1 = ip[0] >> WHT_UPSCALE_FACTOR;

+  a1 = ip[0] >> UNIT_QUANT_SHIFT;

   e1 = a1 >> 1;

   a1 -= e1;

   op[0] = a1;

--- a/vp9/common/vp9_idct.h

+++ b/vp9/common/vp9_idct.h

@@ -22,7 +22,8 @@

 #define DCT_CONST_BITS 14

 #define DCT_CONST_ROUNDING  (1 << (DCT_CONST_BITS - 1))

-#define WHT_UPSCALE_FACTOR 2

+#define UNIT_QUANT_SHIFT 2

+#define UNIT_QUANT_FACTOR (1 << UNIT_QUANT_SHIFT)

 #define pair_set_epi16(a, b) \

   _mm_set_epi16(b, a, b, a, b, a, b, a)

--- a/vp9/encoder/vp9_dct.c

+++ b/vp9/encoder/vp9_dct.c

@@ -637,10 +637,10 @@

     c1 = e1 - c1;

     a1 -= c1;

     d1 += b1;

-    op[0] = a1 << WHT_UPSCALE_FACTOR;

-    op[1] = c1 << WHT_UPSCALE_FACTOR;

-    op[2] = d1 << WHT_UPSCALE_FACTOR;

-    op[3] = b1 << WHT_UPSCALE_FACTOR;

+    op[0] = a1 * UNIT_QUANT_FACTOR;

+    op[1] = c1 * UNIT_QUANT_FACTOR;

+    op[2] = d1 * UNIT_QUANT_FACTOR;

+    op[3] = b1 * UNIT_QUANT_FACTOR;

     ip += 4;

     op += 4;