tx64x64: Fix build when highbitdepth is on.

This was being worked around by forcing highbitdepth to be off when
enabling tx64x64.

With the fixes, removed the work-around.

Change-Id: I3102f9e17d4037af96a9eff418c5af6a97fd740c

aom_dsp/intrapred.c

@@ -986,6 +986,7 @@ static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride, int bs,
   intra_pred_sized(type, 16) \
   intra_pred_sized(type, 32) \
   intra_pred_sized(type, 64) \
+  intra_pred_highbd_sized(type, 2) \
   intra_pred_highbd_sized(type, 4) \
   intra_pred_highbd_sized(type, 8) \
   intra_pred_highbd_sized(type, 16) \

configure

@@ -504,7 +504,6 @@ post_process_cmdline() {
     soft_enable tempmv_signaling
 
     # Workaround features currently incompatible with highbitdepth
-    enabled tx64x64 && disable_feature highbitdepth
     enabled ext_partition && disable_feature highbitdepth
 
     # Fix up experiment dependencies

test/av1_fht64x64_test.cc

@@ -40,21 +40,6 @@ void iht64x64_ref(const tran_low_t *in, uint8_t *dest, int stride,
   av1_iht64x64_4096_add_c(in, dest, stride, tx_type);
 }
 
-#if CONFIG_HIGHBITDEPTH
-typedef void (*IHbdHtFunc)(const tran_low_t *in, uint8_t *out, int stride,
-                           int tx_type, int bd);
-typedef void (*HbdHtFunc)(const int16_t *input, int32_t *output, int stride,
-                          int tx_type, int bd);
-
-// Target optimized function, tx_type, bit depth
-typedef tuple<HbdHtFunc, int, int> HighbdHt64x64Param;
-
-void highbd_fht64x64_ref(const int16_t *in, int32_t *out, int stride,
-                         int tx_type, int bd) {
-  av1_fwd_txfm2d_64x64_c(in, out, stride, tx_type, bd);
-}
-#endif  // CONFIG_HIGHBITDEPTH
-
 class AV1Trans64x64HT : public libaom_test::TransformTestBase,
                         public ::testing::TestWithParam<Ht64x64Param> {
  public: