Commit 35fb461e authored by Debargha Mukherjee's avatar Debargha Mukherjee

Fix pvq build

Various fixes for pvq build.

Change-Id: Ideebdb072ed5786f3224e93ded5ec75a23e68dab
parent 69d9e878
......@@ -844,7 +844,7 @@ static const int32_t intra_tx_size_cat_lookup[BLOCK_SIZES_ALL] = {
// 4x16, 16x4, 8x32
TX_8X8 - TX_8X8, TX_8X8 - TX_8X8, TX_8X8 - TX_8X8,
// 32x8 16x64, 64x16
TX_8X8 - TX_8X8, TX_16X16 - TX_8X8, TX_16X16 - TX_8X8
TX_8X8 - TX_8X8, TX_16X16 - TX_8X8, TX_16X16 - TX_8X8,
#if CONFIG_EXT_PARTITION
// 32x128, 128x32
TX_32X32 - TX_8X8, TX_32X32 - TX_8X8
......
......@@ -4394,7 +4394,11 @@ static void rd_pick_partition(const AV1_COMP *const cpi, ThreadData *td,
mi_row, mi_col, bsize2, mi_row, mi_col + mi_step, bsize2,
mi_row + mi_step, mi_col, subsize);
#endif
#if !CONFIG_PVQ
restore_context(x, &x_ctx, mi_row, mi_col, bsize);
#else
restore_context(x, &x_ctx, mi_row, mi_col, &pre_rdo_buf, bsize);
#endif // !CONFIG_PVQ
}
// PARTITION_HORZ_B
if (partition_horz_allowed && ab_partition_allowed) {
......@@ -4419,7 +4423,11 @@ static void rd_pick_partition(const AV1_COMP *const cpi, ThreadData *td,
mi_row, mi_col, subsize, mi_row + mi_step, mi_col,
bsize2, mi_row + mi_step, mi_col + mi_step, bsize2);
#endif
#if !CONFIG_PVQ
restore_context(x, &x_ctx, mi_row, mi_col, bsize);
#else
restore_context(x, &x_ctx, mi_row, mi_col, &pre_rdo_buf, bsize);
#endif // !CONFIG_PVQ
}
// PARTITION_VERT_A
if (partition_vert_allowed && ab_partition_allowed) {
......@@ -4444,7 +4452,11 @@ static void rd_pick_partition(const AV1_COMP *const cpi, ThreadData *td,
mi_row, mi_col, bsize2, mi_row + mi_step, mi_col, bsize2,
mi_row, mi_col + mi_step, subsize);
#endif
#if !CONFIG_PVQ
restore_context(x, &x_ctx, mi_row, mi_col, bsize);
#else
restore_context(x, &x_ctx, mi_row, mi_col, &pre_rdo_buf, bsize);
#endif // !CONFIG_PVQ
}
// PARTITION_VERT_B
if (partition_vert_allowed && ab_partition_allowed) {
......@@ -4469,7 +4481,11 @@ static void rd_pick_partition(const AV1_COMP *const cpi, ThreadData *td,
mi_row, mi_col, subsize, mi_row, mi_col + mi_step,
bsize2, mi_row + mi_step, mi_col + mi_step, bsize2);
#endif
#if !CONFIG_PVQ
restore_context(x, &x_ctx, mi_row, mi_col, bsize);
#else
restore_context(x, &x_ctx, mi_row, mi_col, &pre_rdo_buf, bsize);
#endif // !CONFIG_PVQ
}
#if CONFIG_EXT_PARTITION
......
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