commit 3d45c0e11c4d6dbac58a937bd4acf83a6b1810f7
author Jingning Han <jingning@google.com> Tue Nov 08 12:35:04 2016 -0800
committer Jingning Han <jingning@google.com> Tue Nov 08 17:55:08 2016 -0800
tree d96dd1dfb9833cfc0b7e7b0ca4f7d0888aa1acfc
parent 4ca8b1c2c6fd6b02f28964a97cb03d36703ee3cd

Fix logic in rd_pick_intra4x4block()

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

Change-Id: I5fef4648cfc9e94f63b553ac15e051a6c4d4ca13

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 88c450d..f39034d 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2257,6 +2257,9 @@
           ratey += av1_cost_coeffs(cm, x, 0, block, coeff_ctx, TX_4X4,
                                    scan_order->scan, scan_order->neighbors,
                                    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
           skip = av1_pvq_encode_helper(&x->daala_enc, coeff, ref_coeff, dqcoeff,
                                        &p->eobs[block], pd->dequant, 0, TX_4X4,