Commit 3d45c0e1 authored by Jingning Han's avatar Jingning Han
Browse files

Fix logic in rd_pick_intra4x4block()

Fix the merge issue due to pvq. This fixes significant key frame
performance loss.

Change-Id: I5fef4648cfc9e94f63b553ac15e051a6c4d4ca13
parent 4ca8b1c2
...@@ -2257,6 +2257,9 @@ static int64_t rd_pick_intra4x4block( ...@@ -2257,6 +2257,9 @@ static int64_t rd_pick_intra4x4block(
ratey += av1_cost_coeffs(cm, x, 0, block, coeff_ctx, TX_4X4, ratey += av1_cost_coeffs(cm, x, 0, block, coeff_ctx, TX_4X4,
scan_order->scan, scan_order->neighbors, scan_order->scan, scan_order->neighbors,
cpi->sf.use_fast_coef_costing); cpi->sf.use_fast_coef_costing);
*(tempa + idx) = !(p->eobs[block] == 0);
*(templ + idy) = !(p->eobs[block] == 0);
can_skip &= (p->eobs[block] == 0);
#else #else
skip = av1_pvq_encode_helper(&x->daala_enc, coeff, ref_coeff, dqcoeff, skip = av1_pvq_encode_helper(&x->daala_enc, coeff, ref_coeff, dqcoeff,
&p->eobs[block], pd->dequant, 0, TX_4X4, &p->eobs[block], pd->dequant, 0, TX_4X4,
......
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