Fix lbd/hbd fwd txfm mismatch

STATS_CHANGED expected.

Change-Id: I946c6bb4e8488fa0cdc7c51ced6a1854b45183fd

av1/common/av1_rtcd_defs.pl

diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl
index 344e071..42c1869 100755
--- a/av1/common/av1_rtcd_defs.pl
+++ b/av1/common/av1_rtcd_defs.pl
@@ -174,8 +174,6 @@
 
   add_proto qw/void av1_fwht4x4/, "const int16_t *input, tran_low_t *output, int stride";
 
-  add_proto qw/void av1_fwd_idtx/, "const int16_t *src_diff, tran_low_t *coeff, int stride, int bsx, int bsy, TX_TYPE tx_type";
-
   #fwd txfm
   add_proto qw/void av1_lowbd_fwd_txfm/, "const int16_t *src_diff, tran_low_t *coeff, int diff_stride, TxfmParam *txfm_param";
   specialize qw/av1_lowbd_fwd_txfm sse2 sse4_1/;

av1/encoder/dct.c

diff --git a/av1/encoder/dct.c b/av1/encoder/dct.c
index a3583f5..3e75880 100644
--- a/av1/encoder/dct.c
+++ b/av1/encoder/dct.c
@@ -1252,19 +1252,4 @@
                           int stride) {
   av1_fwht4x4_c(input, output, stride);
 }
-
-// Forward identity transform.
-void av1_fwd_idtx_c(const int16_t *src_diff, tran_low_t *coeff, int stride,
-                    int bsx, int bsy, TX_TYPE tx_type) {
-  int r, c;
-  const int pels = bsx * bsy;
-  const int shift = 3 - ((pels > 256) + (pels > 1024));
-  if (tx_type == IDTX) {
-    for (r = 0; r < bsy; ++r) {
-      for (c = 0; c < bsx; ++c) coeff[c] = src_diff[c] * (1 << shift);
-      src_diff += stride;
-      coeff += bsx;
-    }
-  }
-}
 #endif  // !AV1_DCT_GTEST

av1/encoder/hybrid_fwd_txfm.c

diff --git a/av1/encoder/hybrid_fwd_txfm.c b/av1/encoder/hybrid_fwd_txfm.c
index 7315697..67b45d4 100644
--- a/av1/encoder/hybrid_fwd_txfm.c
+++ b/av1/encoder/hybrid_fwd_txfm.c
@@ -211,7 +211,7 @@
       av1_fwd_txfm2d_32x64_c(src_diff, dst_coeff, diff_stride, DCT_DCT, bd);
       break;
     case IDTX:
-      av1_fwd_idtx_c(src_diff, coeff, diff_stride, 32, 64, tx_type);
+      av1_fwd_txfm2d_32x64_c(src_diff, dst_coeff, diff_stride, tx_type, bd);
       break;
     default: assert(0); break;
   }
@@ -249,7 +249,7 @@
       av1_fwd_txfm2d_64x32_c(src_diff, dst_coeff, diff_stride, DCT_DCT, bd);
       break;
     case IDTX:
-      av1_fwd_idtx_c(src_diff, coeff, diff_stride, 64, 32, tx_type);
+      av1_fwd_txfm2d_64x32_c(src_diff, dst_coeff, diff_stride, tx_type, bd);
       break;
     default: assert(0); break;
   }
@@ -287,7 +287,7 @@
       av1_fwd_txfm2d_16x64_c(src_diff, dst_coeff, diff_stride, DCT_DCT, bd);
       break;
     case IDTX:
-      av1_fwd_idtx_c(src_diff, coeff, diff_stride, 16, 64, tx_type);
+      av1_fwd_txfm2d_16x64_c(src_diff, dst_coeff, diff_stride, tx_type, bd);
       break;
     default: assert(0); break;
   }
@@ -325,7 +325,7 @@
       av1_fwd_txfm2d_64x16_c(src_diff, dst_coeff, diff_stride, DCT_DCT, bd);
       break;
     case IDTX:
-      av1_fwd_idtx_c(src_diff, coeff, diff_stride, 64, 16, tx_type);
+      av1_fwd_txfm2d_64x16_c(src_diff, dst_coeff, diff_stride, tx_type, bd);
       break;
     default: assert(0); break;
   }
@@ -363,7 +363,7 @@
       av1_fwd_txfm2d_64x64_c(src_diff, dst_coeff, diff_stride, DCT_DCT, bd);
       break;
     case IDTX:
-      av1_fwd_idtx_c(src_diff, coeff, diff_stride, 64, 64, tx_type);
+      av1_fwd_txfm2d_64x64_c(src_diff, dst_coeff, diff_stride, tx_type, bd);
       break;
     default: assert(0); break;
   }