shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Replace highbd_dct_const_round_shift with dct_const_round_shift"

--- a/vpx_dsp/inv_txfm.c

+++ b/vpx_dsp/inv_txfm.c

@@ -1372,12 +1372,12 @@

   // stage 1

   temp1 = (input[0] + input[2]) * cospi_16_64;

   temp2 = (input[0] - input[2]) * cospi_16_64;

-  step[0] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step[1] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step[0] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step[1] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = input[1] * cospi_24_64 - input[3] * cospi_8_64;

   temp2 = input[1] * cospi_8_64 + input[3] * cospi_24_64;

-  step[2] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step[3] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step[2] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step[3] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   // stage 2

   output[0] = HIGHBD_WRAPLOW(step[0] + step[3], bd);

@@ -1417,10 +1417,10 @@

   int i;

   tran_high_t a1;

   tran_low_t out =

-      HIGHBD_WRAPLOW(highbd_dct_const_round_shift(input[0] * cospi_16_64), bd);

+      HIGHBD_WRAPLOW(dct_const_round_shift(input[0] * cospi_16_64), bd);

   uint16_t *dest = CONVERT_TO_SHORTPTR(dest8);

-  out = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(out * cospi_16_64), bd);

+  out = HIGHBD_WRAPLOW(dct_const_round_shift(out * cospi_16_64), bd);

   a1 = ROUND_POWER_OF_TWO(out, 4);

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

@@ -1451,12 +1451,12 @@

   step1[3] = input[6];

   temp1 = input[1] * cospi_28_64 - input[7] * cospi_4_64;

   temp2 = input[1] * cospi_4_64 + input[7] * cospi_28_64;

-  step1[4] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[7] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[4] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[7] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = input[5] * cospi_12_64 - input[3] * cospi_20_64;

   temp2 = input[5] * cospi_20_64 + input[3] * cospi_12_64;

-  step1[5] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[6] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[5] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[6] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   // stage 2 & stage 3 - even half

   vpx_highbd_idct4_c(step1, step1, bd);

@@ -1471,8 +1471,8 @@

   step1[4] = step2[4];

   temp1 = (step2[6] - step2[5]) * cospi_16_64;

   temp2 = (step2[5] + step2[6]) * cospi_16_64;

-  step1[5] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[6] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[5] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[6] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step1[7] = step2[7];

   // stage 4

@@ -1517,10 +1517,10 @@

   int i, j;

   tran_high_t a1;

   tran_low_t out =

-      HIGHBD_WRAPLOW(highbd_dct_const_round_shift(input[0] * cospi_16_64), bd);

+      HIGHBD_WRAPLOW(dct_const_round_shift(input[0] * cospi_16_64), bd);

   uint16_t *dest = CONVERT_TO_SHORTPTR(dest8);

-  out = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(out * cospi_16_64), bd);

+  out = HIGHBD_WRAPLOW(dct_const_round_shift(out * cospi_16_64), bd);

   a1 = ROUND_POWER_OF_TWO(out, 5);

   for (j = 0; j < 8; ++j) {

     for (i = 0; i < 8; ++i) dest[i] = highbd_clip_pixel_add(dest[i], a1, bd);

@@ -1567,10 +1567,10 @@

   // The overall dynamic range is 14b (input) + 14b (multiplication scaling)

   // + 1b (addition) = 29b.

   // Hence the output bit depth is 15b.

-  output[0] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s0 + s3), bd);

-  output[1] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s1 + s3), bd);

-  output[2] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s2), bd);

-  output[3] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s0 + s1 - s3), bd);

+  output[0] = HIGHBD_WRAPLOW(dct_const_round_shift(s0 + s3), bd);

+  output[1] = HIGHBD_WRAPLOW(dct_const_round_shift(s1 + s3), bd);

+  output[2] = HIGHBD_WRAPLOW(dct_const_round_shift(s2), bd);

+  output[3] = HIGHBD_WRAPLOW(dct_const_round_shift(s0 + s1 - s3), bd);

 }

 void vpx_highbd_iadst8_c(const tran_low_t *input, tran_low_t *output, int bd) {

@@ -1608,14 +1608,14 @@

   s6 = cospi_26_64 * x6 + cospi_6_64 * x7;

   s7 = cospi_6_64 * x6 - cospi_26_64 * x7;

-  x0 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s0 + s4), bd);

-  x1 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s1 + s5), bd);

-  x2 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s2 + s6), bd);

-  x3 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s3 + s7), bd);

-  x4 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s0 - s4), bd);

-  x5 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s1 - s5), bd);

-  x6 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s2 - s6), bd);

-  x7 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s3 - s7), bd);

+  x0 = HIGHBD_WRAPLOW(dct_const_round_shift(s0 + s4), bd);

+  x1 = HIGHBD_WRAPLOW(dct_const_round_shift(s1 + s5), bd);

+  x2 = HIGHBD_WRAPLOW(dct_const_round_shift(s2 + s6), bd);

+  x3 = HIGHBD_WRAPLOW(dct_const_round_shift(s3 + s7), bd);

+  x4 = HIGHBD_WRAPLOW(dct_const_round_shift(s0 - s4), bd);

+  x5 = HIGHBD_WRAPLOW(dct_const_round_shift(s1 - s5), bd);

+  x6 = HIGHBD_WRAPLOW(dct_const_round_shift(s2 - s6), bd);

+  x7 = HIGHBD_WRAPLOW(dct_const_round_shift(s3 - s7), bd);

   // stage 2

   s0 = x0;

@@ -1631,10 +1631,10 @@

   x1 = HIGHBD_WRAPLOW(s1 + s3, bd);

   x2 = HIGHBD_WRAPLOW(s0 - s2, bd);

   x3 = HIGHBD_WRAPLOW(s1 - s3, bd);

-  x4 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s4 + s6), bd);

-  x5 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s5 + s7), bd);

-  x6 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s4 - s6), bd);

-  x7 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s5 - s7), bd);

+  x4 = HIGHBD_WRAPLOW(dct_const_round_shift(s4 + s6), bd);

+  x5 = HIGHBD_WRAPLOW(dct_const_round_shift(s5 + s7), bd);

+  x6 = HIGHBD_WRAPLOW(dct_const_round_shift(s4 - s6), bd);

+  x7 = HIGHBD_WRAPLOW(dct_const_round_shift(s5 - s7), bd);

   // stage 3

   s2 = cospi_16_64 * (x2 + x3);

@@ -1642,10 +1642,10 @@

   s6 = cospi_16_64 * (x6 + x7);

   s7 = cospi_16_64 * (x6 - x7);

-  x2 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s2), bd);

-  x3 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s3), bd);

-  x6 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s6), bd);

-  x7 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s7), bd);

+  x2 = HIGHBD_WRAPLOW(dct_const_round_shift(s2), bd);

+  x3 = HIGHBD_WRAPLOW(dct_const_round_shift(s3), bd);

+  x6 = HIGHBD_WRAPLOW(dct_const_round_shift(s6), bd);

+  x7 = HIGHBD_WRAPLOW(dct_const_round_shift(s7), bd);

   output[0] = HIGHBD_WRAPLOW(x0, bd);

   output[1] = HIGHBD_WRAPLOW(-x4, bd);

@@ -1727,23 +1727,23 @@

   temp1 = step1[8] * cospi_30_64 - step1[15] * cospi_2_64;

   temp2 = step1[8] * cospi_2_64 + step1[15] * cospi_30_64;

-  step2[8] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[15] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[8] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[15] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = step1[9] * cospi_14_64 - step1[14] * cospi_18_64;

   temp2 = step1[9] * cospi_18_64 + step1[14] * cospi_14_64;

-  step2[9] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[14] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[9] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[14] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = step1[10] * cospi_22_64 - step1[13] * cospi_10_64;

   temp2 = step1[10] * cospi_10_64 + step1[13] * cospi_22_64;

-  step2[10] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[13] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[10] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[13] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = step1[11] * cospi_6_64 - step1[12] * cospi_26_64;

   temp2 = step1[11] * cospi_26_64 + step1[12] * cospi_6_64;

-  step2[11] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[12] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[11] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[12] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   // stage 3

   step1[0] = step2[0];

@@ -1753,12 +1753,12 @@

   temp1 = step2[4] * cospi_28_64 - step2[7] * cospi_4_64;

   temp2 = step2[4] * cospi_4_64 + step2[7] * cospi_28_64;

-  step1[4] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[7] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[4] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[7] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = step2[5] * cospi_12_64 - step2[6] * cospi_20_64;

   temp2 = step2[5] * cospi_20_64 + step2[6] * cospi_12_64;

-  step1[5] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[6] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[5] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[6] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step1[8] = HIGHBD_WRAPLOW(step2[8] + step2[9], bd);

   step1[9] = HIGHBD_WRAPLOW(step2[8] - step2[9], bd);

@@ -1772,12 +1772,12 @@

   // stage 4

   temp1 = (step1[0] + step1[1]) * cospi_16_64;

   temp2 = (step1[0] - step1[1]) * cospi_16_64;

-  step2[0] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[1] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[0] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[1] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = step1[2] * cospi_24_64 - step1[3] * cospi_8_64;

   temp2 = step1[2] * cospi_8_64 + step1[3] * cospi_24_64;

-  step2[2] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[3] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[2] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[3] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step2[4] = HIGHBD_WRAPLOW(step1[4] + step1[5], bd);

   step2[5] = HIGHBD_WRAPLOW(step1[4] - step1[5], bd);

   step2[6] = HIGHBD_WRAPLOW(-step1[6] + step1[7], bd);

@@ -1787,12 +1787,12 @@

   step2[15] = step1[15];

   temp1 = -step1[9] * cospi_8_64 + step1[14] * cospi_24_64;

   temp2 = step1[9] * cospi_24_64 + step1[14] * cospi_8_64;

-  step2[9] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[14] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[9] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[14] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = -step1[10] * cospi_24_64 - step1[13] * cospi_8_64;

   temp2 = -step1[10] * cospi_8_64 + step1[13] * cospi_24_64;

-  step2[10] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[13] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[10] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[13] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step2[11] = step1[11];

   step2[12] = step1[12];

@@ -1804,8 +1804,8 @@

   step1[4] = step2[4];

   temp1 = (step2[6] - step2[5]) * cospi_16_64;

   temp2 = (step2[5] + step2[6]) * cospi_16_64;

-  step1[5] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[6] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[5] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[6] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step1[7] = step2[7];

   step1[8] = HIGHBD_WRAPLOW(step2[8] + step2[11], bd);

@@ -1830,12 +1830,12 @@

   step2[9] = step1[9];

   temp1 = (-step1[10] + step1[13]) * cospi_16_64;

   temp2 = (step1[10] + step1[13]) * cospi_16_64;

-  step2[10] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[13] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[10] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[13] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = (-step1[11] + step1[12]) * cospi_16_64;

   temp2 = (step1[11] + step1[12]) * cospi_16_64;

-  step2[11] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[12] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[11] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[12] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step2[14] = step1[14];

   step2[15] = step1[15];

@@ -1937,22 +1937,22 @@

   s14 = x14 * cospi_29_64 + x15 * cospi_3_64;

   s15 = x14 * cospi_3_64 - x15 * cospi_29_64;

-  x0 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s0 + s8), bd);

-  x1 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s1 + s9), bd);

-  x2 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s2 + s10), bd);

-  x3 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s3 + s11), bd);

-  x4 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s4 + s12), bd);

-  x5 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s5 + s13), bd);

-  x6 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s6 + s14), bd);

-  x7 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s7 + s15), bd);

-  x8 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s0 - s8), bd);

-  x9 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s1 - s9), bd);

-  x10 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s2 - s10), bd);

-  x11 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s3 - s11), bd);

-  x12 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s4 - s12), bd);

-  x13 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s5 - s13), bd);

-  x14 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s6 - s14), bd);

-  x15 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s7 - s15), bd);

+  x0 = HIGHBD_WRAPLOW(dct_const_round_shift(s0 + s8), bd);

+  x1 = HIGHBD_WRAPLOW(dct_const_round_shift(s1 + s9), bd);

+  x2 = HIGHBD_WRAPLOW(dct_const_round_shift(s2 + s10), bd);

+  x3 = HIGHBD_WRAPLOW(dct_const_round_shift(s3 + s11), bd);

+  x4 = HIGHBD_WRAPLOW(dct_const_round_shift(s4 + s12), bd);

+  x5 = HIGHBD_WRAPLOW(dct_const_round_shift(s5 + s13), bd);

+  x6 = HIGHBD_WRAPLOW(dct_const_round_shift(s6 + s14), bd);

+  x7 = HIGHBD_WRAPLOW(dct_const_round_shift(s7 + s15), bd);

+  x8 = HIGHBD_WRAPLOW(dct_const_round_shift(s0 - s8), bd);

+  x9 = HIGHBD_WRAPLOW(dct_const_round_shift(s1 - s9), bd);

+  x10 = HIGHBD_WRAPLOW(dct_const_round_shift(s2 - s10), bd);

+  x11 = HIGHBD_WRAPLOW(dct_const_round_shift(s3 - s11), bd);

+  x12 = HIGHBD_WRAPLOW(dct_const_round_shift(s4 - s12), bd);

+  x13 = HIGHBD_WRAPLOW(dct_const_round_shift(s5 - s13), bd);

+  x14 = HIGHBD_WRAPLOW(dct_const_round_shift(s6 - s14), bd);

+  x15 = HIGHBD_WRAPLOW(dct_const_round_shift(s7 - s15), bd);

   // stage 2

   s0 = x0;

@@ -1980,14 +1980,14 @@

   x5 = HIGHBD_WRAPLOW(s1 - s5, bd);

   x6 = HIGHBD_WRAPLOW(s2 - s6, bd);

   x7 = HIGHBD_WRAPLOW(s3 - s7, bd);

-  x8 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s8 + s12), bd);

-  x9 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s9 + s13), bd);

-  x10 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s10 + s14), bd);

-  x11 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s11 + s15), bd);

-  x12 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s8 - s12), bd);

-  x13 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s9 - s13), bd);

-  x14 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s10 - s14), bd);

-  x15 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s11 - s15), bd);

+  x8 = HIGHBD_WRAPLOW(dct_const_round_shift(s8 + s12), bd);

+  x9 = HIGHBD_WRAPLOW(dct_const_round_shift(s9 + s13), bd);

+  x10 = HIGHBD_WRAPLOW(dct_const_round_shift(s10 + s14), bd);

+  x11 = HIGHBD_WRAPLOW(dct_const_round_shift(s11 + s15), bd);

+  x12 = HIGHBD_WRAPLOW(dct_const_round_shift(s8 - s12), bd);

+  x13 = HIGHBD_WRAPLOW(dct_const_round_shift(s9 - s13), bd);

+  x14 = HIGHBD_WRAPLOW(dct_const_round_shift(s10 - s14), bd);

+  x15 = HIGHBD_WRAPLOW(dct_const_round_shift(s11 - s15), bd);

   // stage 3

   s0 = x0;

@@ -2011,18 +2011,18 @@

   x1 = HIGHBD_WRAPLOW(s1 + s3, bd);

   x2 = HIGHBD_WRAPLOW(s0 - s2, bd);

   x3 = HIGHBD_WRAPLOW(s1 - s3, bd);

-  x4 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s4 + s6), bd);

-  x5 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s5 + s7), bd);

-  x6 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s4 - s6), bd);

-  x7 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s5 - s7), bd);

+  x4 = HIGHBD_WRAPLOW(dct_const_round_shift(s4 + s6), bd);

+  x5 = HIGHBD_WRAPLOW(dct_const_round_shift(s5 + s7), bd);

+  x6 = HIGHBD_WRAPLOW(dct_const_round_shift(s4 - s6), bd);

+  x7 = HIGHBD_WRAPLOW(dct_const_round_shift(s5 - s7), bd);

   x8 = HIGHBD_WRAPLOW(s8 + s10, bd);

   x9 = HIGHBD_WRAPLOW(s9 + s11, bd);

   x10 = HIGHBD_WRAPLOW(s8 - s10, bd);

   x11 = HIGHBD_WRAPLOW(s9 - s11, bd);

-  x12 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s12 + s14), bd);

-  x13 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s13 + s15), bd);

-  x14 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s12 - s14), bd);

-  x15 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s13 - s15), bd);

+  x12 = HIGHBD_WRAPLOW(dct_const_round_shift(s12 + s14), bd);

+  x13 = HIGHBD_WRAPLOW(dct_const_round_shift(s13 + s15), bd);

+  x14 = HIGHBD_WRAPLOW(dct_const_round_shift(s12 - s14), bd);

+  x15 = HIGHBD_WRAPLOW(dct_const_round_shift(s13 - s15), bd);

   // stage 4

   s2 = (-cospi_16_64) * (x2 + x3);

@@ -2034,14 +2034,14 @@

   s14 = (-cospi_16_64) * (x14 + x15);

   s15 = cospi_16_64 * (x14 - x15);

-  x2 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s2), bd);

-  x3 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s3), bd);

-  x6 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s6), bd);

-  x7 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s7), bd);

-  x10 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s10), bd);

-  x11 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s11), bd);

-  x14 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s14), bd);

-  x15 = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(s15), bd);

+  x2 = HIGHBD_WRAPLOW(dct_const_round_shift(s2), bd);

+  x3 = HIGHBD_WRAPLOW(dct_const_round_shift(s3), bd);

+  x6 = HIGHBD_WRAPLOW(dct_const_round_shift(s6), bd);

+  x7 = HIGHBD_WRAPLOW(dct_const_round_shift(s7), bd);

+  x10 = HIGHBD_WRAPLOW(dct_const_round_shift(s10), bd);

+  x11 = HIGHBD_WRAPLOW(dct_const_round_shift(s11), bd);

+  x14 = HIGHBD_WRAPLOW(dct_const_round_shift(s14), bd);

+  x15 = HIGHBD_WRAPLOW(dct_const_round_shift(s15), bd);

   output[0] = HIGHBD_WRAPLOW(x0, bd);

   output[1] = HIGHBD_WRAPLOW(-x8, bd);

@@ -2093,10 +2093,10 @@

   int i, j;

   tran_high_t a1;

   tran_low_t out =

-      HIGHBD_WRAPLOW(highbd_dct_const_round_shift(input[0] * cospi_16_64), bd);

+      HIGHBD_WRAPLOW(dct_const_round_shift(input[0] * cospi_16_64), bd);

   uint16_t *dest = CONVERT_TO_SHORTPTR(dest8);

-  out = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(out * cospi_16_64), bd);

+  out = HIGHBD_WRAPLOW(dct_const_round_shift(out * cospi_16_64), bd);

   a1 = ROUND_POWER_OF_TWO(out, 6);

   for (j = 0; j < 16; ++j) {

     for (i = 0; i < 16; ++i) dest[i] = highbd_clip_pixel_add(dest[i], a1, bd);

@@ -2138,43 +2138,43 @@

   temp1 = input[1] * cospi_31_64 - input[31] * cospi_1_64;

   temp2 = input[1] * cospi_1_64 + input[31] * cospi_31_64;

-  step1[16] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[31] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[16] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[31] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = input[17] * cospi_15_64 - input[15] * cospi_17_64;

   temp2 = input[17] * cospi_17_64 + input[15] * cospi_15_64;

-  step1[17] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[30] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[17] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[30] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = input[9] * cospi_23_64 - input[23] * cospi_9_64;

   temp2 = input[9] * cospi_9_64 + input[23] * cospi_23_64;

-  step1[18] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[29] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[18] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[29] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = input[25] * cospi_7_64 - input[7] * cospi_25_64;

   temp2 = input[25] * cospi_25_64 + input[7] * cospi_7_64;

-  step1[19] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[28] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[19] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[28] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = input[5] * cospi_27_64 - input[27] * cospi_5_64;

   temp2 = input[5] * cospi_5_64 + input[27] * cospi_27_64;

-  step1[20] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[27] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[20] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[27] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = input[21] * cospi_11_64 - input[11] * cospi_21_64;

   temp2 = input[21] * cospi_21_64 + input[11] * cospi_11_64;

-  step1[21] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[26] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[21] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[26] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = input[13] * cospi_19_64 - input[19] * cospi_13_64;

   temp2 = input[13] * cospi_13_64 + input[19] * cospi_19_64;

-  step1[22] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[25] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[22] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[25] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = input[29] * cospi_3_64 - input[3] * cospi_29_64;

   temp2 = input[29] * cospi_29_64 + input[3] * cospi_3_64;

-  step1[23] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[24] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[23] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[24] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   // stage 2

   step2[0] = step1[0];

@@ -2188,23 +2188,23 @@

   temp1 = step1[8] * cospi_30_64 - step1[15] * cospi_2_64;

   temp2 = step1[8] * cospi_2_64 + step1[15] * cospi_30_64;

-  step2[8] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[15] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[8] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[15] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = step1[9] * cospi_14_64 - step1[14] * cospi_18_64;

   temp2 = step1[9] * cospi_18_64 + step1[14] * cospi_14_64;

-  step2[9] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[14] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[9] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[14] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = step1[10] * cospi_22_64 - step1[13] * cospi_10_64;

   temp2 = step1[10] * cospi_10_64 + step1[13] * cospi_22_64;

-  step2[10] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[13] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[10] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[13] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = step1[11] * cospi_6_64 - step1[12] * cospi_26_64;

   temp2 = step1[11] * cospi_26_64 + step1[12] * cospi_6_64;

-  step2[11] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[12] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[11] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[12] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step2[16] = HIGHBD_WRAPLOW(step1[16] + step1[17], bd);

   step2[17] = HIGHBD_WRAPLOW(step1[16] - step1[17], bd);

@@ -2231,12 +2231,12 @@

   temp1 = step2[4] * cospi_28_64 - step2[7] * cospi_4_64;

   temp2 = step2[4] * cospi_4_64 + step2[7] * cospi_28_64;

-  step1[4] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[7] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[4] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[7] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = step2[5] * cospi_12_64 - step2[6] * cospi_20_64;

   temp2 = step2[5] * cospi_20_64 + step2[6] * cospi_12_64;

-  step1[5] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[6] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[5] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[6] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step1[8] = HIGHBD_WRAPLOW(step2[8] + step2[9], bd);

   step1[9] = HIGHBD_WRAPLOW(step2[8] - step2[9], bd);

@@ -2251,22 +2251,22 @@

   step1[31] = step2[31];

   temp1 = -step2[17] * cospi_4_64 + step2[30] * cospi_28_64;

   temp2 = step2[17] * cospi_28_64 + step2[30] * cospi_4_64;

-  step1[17] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[30] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[17] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[30] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = -step2[18] * cospi_28_64 - step2[29] * cospi_4_64;

   temp2 = -step2[18] * cospi_4_64 + step2[29] * cospi_28_64;

-  step1[18] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[29] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[18] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[29] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step1[19] = step2[19];

   step1[20] = step2[20];

   temp1 = -step2[21] * cospi_20_64 + step2[26] * cospi_12_64;

   temp2 = step2[21] * cospi_12_64 + step2[26] * cospi_20_64;

-  step1[21] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[26] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[21] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[26] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = -step2[22] * cospi_12_64 - step2[25] * cospi_20_64;

   temp2 = -step2[22] * cospi_20_64 + step2[25] * cospi_12_64;

-  step1[22] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[25] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[22] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[25] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step1[23] = step2[23];

   step1[24] = step2[24];

   step1[27] = step2[27];

@@ -2275,12 +2275,12 @@

   // stage 4

   temp1 = (step1[0] + step1[1]) * cospi_16_64;

   temp2 = (step1[0] - step1[1]) * cospi_16_64;

-  step2[0] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[1] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[0] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[1] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = step1[2] * cospi_24_64 - step1[3] * cospi_8_64;

   temp2 = step1[2] * cospi_8_64 + step1[3] * cospi_24_64;

-  step2[2] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[3] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[2] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[3] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step2[4] = HIGHBD_WRAPLOW(step1[4] + step1[5], bd);

   step2[5] = HIGHBD_WRAPLOW(step1[4] - step1[5], bd);

   step2[6] = HIGHBD_WRAPLOW(-step1[6] + step1[7], bd);

@@ -2290,12 +2290,12 @@

   step2[15] = step1[15];

   temp1 = -step1[9] * cospi_8_64 + step1[14] * cospi_24_64;

   temp2 = step1[9] * cospi_24_64 + step1[14] * cospi_8_64;

-  step2[9] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[14] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[9] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[14] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = -step1[10] * cospi_24_64 - step1[13] * cospi_8_64;

   temp2 = -step1[10] * cospi_8_64 + step1[13] * cospi_24_64;

-  step2[10] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[13] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[10] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[13] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step2[11] = step1[11];

   step2[12] = step1[12];

@@ -2325,8 +2325,8 @@

   step1[4] = step2[4];

   temp1 = (step2[6] - step2[5]) * cospi_16_64;

   temp2 = (step2[5] + step2[6]) * cospi_16_64;

-  step1[5] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[6] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[5] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[6] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step1[7] = step2[7];

   step1[8] = HIGHBD_WRAPLOW(step2[8] + step2[11], bd);

@@ -2342,20 +2342,20 @@

   step1[17] = step2[17];

   temp1 = -step2[18] * cospi_8_64 + step2[29] * cospi_24_64;

   temp2 = step2[18] * cospi_24_64 + step2[29] * cospi_8_64;

-  step1[18] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[29] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[18] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[29] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = -step2[19] * cospi_8_64 + step2[28] * cospi_24_64;

   temp2 = step2[19] * cospi_24_64 + step2[28] * cospi_8_64;

-  step1[19] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[28] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[19] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[28] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = -step2[20] * cospi_24_64 - step2[27] * cospi_8_64;

   temp2 = -step2[20] * cospi_8_64 + step2[27] * cospi_24_64;

-  step1[20] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[27] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[20] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[27] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = -step2[21] * cospi_24_64 - step2[26] * cospi_8_64;

   temp2 = -step2[21] * cospi_8_64 + step2[26] * cospi_24_64;

-  step1[21] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[26] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[21] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[26] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step1[22] = step2[22];

   step1[23] = step2[23];

   step1[24] = step2[24];

@@ -2376,12 +2376,12 @@

   step2[9] = step1[9];

   temp1 = (-step1[10] + step1[13]) * cospi_16_64;

   temp2 = (step1[10] + step1[13]) * cospi_16_64;

-  step2[10] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[13] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[10] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[13] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = (-step1[11] + step1[12]) * cospi_16_64;

   temp2 = (step1[11] + step1[12]) * cospi_16_64;

-  step2[11] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step2[12] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step2[11] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step2[12] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step2[14] = step1[14];

   step2[15] = step1[15];

@@ -2427,20 +2427,20 @@

   step1[19] = step2[19];

   temp1 = (-step2[20] + step2[27]) * cospi_16_64;

   temp2 = (step2[20] + step2[27]) * cospi_16_64;

-  step1[20] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[27] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[20] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[27] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = (-step2[21] + step2[26]) * cospi_16_64;

   temp2 = (step2[21] + step2[26]) * cospi_16_64;

-  step1[21] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[26] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[21] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[26] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = (-step2[22] + step2[25]) * cospi_16_64;

   temp2 = (step2[22] + step2[25]) * cospi_16_64;

-  step1[22] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[25] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[22] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[25] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   temp1 = (-step2[23] + step2[24]) * cospi_16_64;

   temp2 = (step2[23] + step2[24]) * cospi_16_64;

-  step1[23] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp1), bd);

-  step1[24] = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(temp2), bd);

+  step1[23] = HIGHBD_WRAPLOW(dct_const_round_shift(temp1), bd);

+  step1[24] = HIGHBD_WRAPLOW(dct_const_round_shift(temp2), bd);

   step1[28] = step2[28];

   step1[29] = step2[29];

   step1[30] = step2[30];

@@ -2552,9 +2552,9 @@

   int a1;

   uint16_t *dest = CONVERT_TO_SHORTPTR(dest8);

   tran_low_t out =

-      HIGHBD_WRAPLOW(highbd_dct_const_round_shift(input[0] * cospi_16_64), bd);

+      HIGHBD_WRAPLOW(dct_const_round_shift(input[0] * cospi_16_64), bd);

-  out = HIGHBD_WRAPLOW(highbd_dct_const_round_shift(out * cospi_16_64), bd);

+  out = HIGHBD_WRAPLOW(dct_const_round_shift(out * cospi_16_64), bd);

   a1 = ROUND_POWER_OF_TWO(out, 6);

   for (j = 0; j < 32; ++j) {

--- a/vpx_dsp/inv_txfm.h

+++ b/vpx_dsp/inv_txfm.h

@@ -57,11 +57,6 @@

   (void)bd;

   return input;

 }

-

-static INLINE tran_high_t highbd_dct_const_round_shift(tran_high_t input) {

-  tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS);

-  return (tran_high_t)rv;

-}

 #endif  // CONFIG_VP9_HIGHBITDEPTH

 #if CONFIG_EMULATE_HARDWARE

--- a/vpx_dsp/x86/inv_txfm_sse2.c

+++ b/vpx_dsp/x86/inv_txfm_sse2.c

@@ -4017,8 +4017,8 @@

   uint16_t *dest = CONVERT_TO_SHORTPTR(dest8);

   tran_low_t out;

-  out = highbd_dct_const_round_shift(input[0] * cospi_16_64);

-  out = highbd_dct_const_round_shift(out * cospi_16_64);

+  out = dct_const_round_shift(input[0] * cospi_16_64);

+  out = dct_const_round_shift(out * cospi_16_64);

   a = ROUND_POWER_OF_TWO(out, 6);

   d = _mm_set1_epi32(a);