Commit b756d247 authored by Debargha Mukherjee's avatar Debargha Mukherjee

Support 64x16 and 16x64 rect intra transform sizes

Change-Id: I701f3a279c5b0f64df10b9c5daae8dd10498080b
parent d6d6a1d1
......@@ -953,6 +953,8 @@ static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
intra_pred_sized(type, 16, 4) \
intra_pred_sized(type, 8, 32) \
intra_pred_sized(type, 32, 8) \
intra_pred_sized(type, 16, 64) \
intra_pred_sized(type, 64, 16) \
intra_pred_highbd_sized(type, 4, 8) \
intra_pred_highbd_sized(type, 8, 4) \
intra_pred_highbd_sized(type, 8, 16) \
......@@ -964,7 +966,9 @@ static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
intra_pred_highbd_sized(type, 4, 16) \
intra_pred_highbd_sized(type, 16, 4) \
intra_pred_highbd_sized(type, 8, 32) \
intra_pred_highbd_sized(type, 32, 8)
intra_pred_highbd_sized(type, 32, 8) \
intra_pred_highbd_sized(type, 16, 64) \
intra_pred_highbd_sized(type, 64, 16)
#define intra_pred_above_4x4(type) \
intra_pred_sized(type, 8, 8) \
intra_pred_sized(type, 16, 16) \
......
......@@ -682,14 +682,21 @@ static const TX_SIZE max_txsize_rect_intra_lookup[BLOCK_SIZES_ALL] = {
TX_4X16, TX_16X4,
// 8x32, 32x8
TX_8X32, TX_32X8,
#if CONFIG_TX64X64
// 16x64, 64x16
TX_16X64, TX_64X16,
#else
// 16x64, 64x16
TX_16X32, TX_32X16,
#endif // CONFIG_TX64X64
#else
// 4x16, 16x4,
TX_4X8, TX_8X4,
// 8x32, 32x8
TX_8X16, TX_16X8,
#endif // CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT_INTRA
// 16x64, 64x16
TX_16X32, TX_32X16,
#endif // CONFIG_EXT_PARTITION_TYPES && CONFIG_RECT_TX_EXT_INTRA
#if CONFIG_EXT_PARTITION
#if CONFIG_TX64X64
// 32x128 128x32
......
......@@ -675,7 +675,9 @@ static void av1_init_intra_predictors_internal(void) {
p[TX_4X16] = aom_##type##_predictor_4x16; \
p[TX_16X4] = aom_##type##_predictor_16x4; \
p[TX_8X32] = aom_##type##_predictor_8x32; \
p[TX_32X8] = aom_##type##_predictor_32x8;
p[TX_32X8] = aom_##type##_predictor_32x8; \
p[TX_16X64] = aom_##type##_predictor_16x64; \
p[TX_64X16] = aom_##type##_predictor_64x16;
#else
#define INIT_RECTANGULAR(p, type) \
p[TX_4X8] = aom_##type##_predictor_4x8; \
......
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