Commit 49bcbac0 authored by Urvang Joshi's avatar Urvang Joshi

Fix build when HIGHBITDEPTH and TXMG are off.

Change-Id: I9cedde11c45d84a9604a588cef3ad1ce9888499e
parent da11e697
......@@ -1038,7 +1038,9 @@ static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
intra_pred_sized(type, 4, 16) \
intra_pred_sized(type, 16, 4) \
intra_pred_sized(type, 8, 32) \
intra_pred_sized(type, 32, 8)
intra_pred_sized(type, 32, 8) \
intra_pred_sized(type, 16, 64) \
intra_pred_sized(type, 64, 16)
#define intra_pred_above_4x4(type) \
intra_pred_sized(type, 8, 8) \
intra_pred_sized(type, 16, 16) \
......
......@@ -179,7 +179,6 @@ static void maybe_flip_strides(uint8_t **dst, int *dstride, tran_low_t **src,
}
}
#if CONFIG_HIGHBITDEPTH
#if CONFIG_TX64X64
static void highbd_inv_idtx_add_c(const tran_low_t *input, uint8_t *dest8,
int stride, int bsx, int bsy, TX_TYPE tx_type,
......@@ -198,7 +197,6 @@ static void highbd_inv_idtx_add_c(const tran_low_t *input, uint8_t *dest8,
}
}
#endif // CONFIG_TX64X64
#endif // CONFIG_HIGHBITDEPTH
void av1_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride,
const TxfmParam *txfm_param) {
......
......@@ -414,7 +414,7 @@ static void highbd_fwd_txfm_32x64(const int16_t *src_diff, tran_low_t *coeff,
av1_fwd_txfm2d_32x64_c(src_diff, dst_coeff, diff_stride, DCT_DCT, bd);
break;
case IDTX:
av1_fwd_idtx_c(src_diff, dst_coeff, diff_stride, 32, 64, tx_type);
av1_fwd_idtx_c(src_diff, coeff, diff_stride, 32, 64, tx_type);
break;
default: assert(0); break;
}
......@@ -452,7 +452,7 @@ static void highbd_fwd_txfm_64x32(const int16_t *src_diff, tran_low_t *coeff,
av1_fwd_txfm2d_64x32_c(src_diff, dst_coeff, diff_stride, DCT_DCT, bd);
break;
case IDTX:
av1_fwd_idtx_c(src_diff, dst_coeff, diff_stride, 64, 32, tx_type);
av1_fwd_idtx_c(src_diff, coeff, diff_stride, 64, 32, tx_type);
break;
default: assert(0); break;
}
......@@ -490,7 +490,7 @@ static void highbd_fwd_txfm_16x64(const int16_t *src_diff, tran_low_t *coeff,
av1_fwd_txfm2d_16x64_c(src_diff, dst_coeff, diff_stride, DCT_DCT, bd);
break;
case IDTX:
av1_fwd_idtx_c(src_diff, dst_coeff, diff_stride, 16, 64, tx_type);
av1_fwd_idtx_c(src_diff, coeff, diff_stride, 16, 64, tx_type);
break;
default: assert(0); break;
}
......@@ -528,7 +528,7 @@ static void highbd_fwd_txfm_64x16(const int16_t *src_diff, tran_low_t *coeff,
av1_fwd_txfm2d_64x16_c(src_diff, dst_coeff, diff_stride, DCT_DCT, bd);
break;
case IDTX:
av1_fwd_idtx_c(src_diff, dst_coeff, diff_stride, 64, 16, tx_type);
av1_fwd_idtx_c(src_diff, coeff, diff_stride, 64, 16, tx_type);
break;
default: assert(0); break;
}
......@@ -566,7 +566,7 @@ static void highbd_fwd_txfm_64x64(const int16_t *src_diff, tran_low_t *coeff,
av1_fwd_txfm2d_64x64_c(src_diff, dst_coeff, diff_stride, DCT_DCT, bd);
break;
case IDTX:
av1_fwd_idtx_c(src_diff, dst_coeff, diff_stride, 64, 64, tx_type);
av1_fwd_idtx_c(src_diff, coeff, diff_stride, 64, 64, tx_type);
break;
default: assert(0); break;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment