Commit e38d63c8 authored by Jingning Han's avatar Jingning Han

Clean up pvq experimental flag in encode_block_pass1()

Remove redundant #if statements there.

Change-Id: If6e6000c76899b0c3072e741a22bc3efa7d33739
parent 94ea1aa6
......@@ -1029,8 +1029,6 @@ static void encode_block_pass1(int plane, int block, int blk_row, int blk_col,
if (p->eobs[block] > 0) {
#else
if (!x->pvq_skip[plane]) {
#endif
#if CONFIG_PVQ
{
int tx_blk_size;
int i, j;
......@@ -1044,7 +1042,6 @@ static void encode_block_pass1(int plane, int block, int blk_row, int blk_col,
for (j = 0; j < tx_blk_size; j++)
for (i = 0; i < tx_blk_size; i++) dst[j * pd->dst.stride + i] = 0;
}
#endif
#if CONFIG_AOM_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
if (xd->lossless[xd->mi[0]->mbmi.segment_id]) {
......@@ -1056,7 +1053,8 @@ static void encode_block_pass1(int plane, int block, int blk_row, int blk_col,
}
return;
}
#endif // CONFIG_AOM_HIGHBITDEPTH
#endif // CONFIG_AOM_HIGHBITDEPTH
#endif // !CONFIG_PVQ
if (xd->lossless[xd->mi[0]->mbmi.segment_id]) {
av1_iwht4x4_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]);
} else {
......
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