Use a consistent tx size in first pass
The tx_size used during intra mode of first pass is inconsistent
depending on the location of the current coding block. This is a
leftover of old code from VP8, where different intra predictor is used
at different blocks during the first pass.
This commit makes the first pass to consistently use the same tx_size
TX_4X4 for the encode.
The performance is noisy, but overall there is a slight gain (~0.1%) on
hdres with small speed change (<1%).
Performance:
SPD_SET | TESTSET | OVR_PSNR | AVG_PSNR | SSIM | SPD
---------+---------+----------+----------+---------+--------
| HDRES | -0.186% | -0.112% | -0.004% | -0.0%
1 | MIDRES | -0.057% | -0.048% | +0.147% | -0.4%
| LOWRES | +0.046% | -0.007% | +0.301% | -0.6%
---------+---------+----------+----------+---------+--------
| HDRES | -0.057% | -0.014% | +0.063% | -0.0%
2 | MIDRES | -0.039% | -0.027% | +0.128% | -0.5%
| LOWRES | +0.003% | -0.058% | +0.223% | -0.5%
---------+---------+----------+----------+---------+--------
| HDRES | -0.109% | -0.037% | -0.094% | -0.1%
3 | MIDRES | +0.020% | +0.015% | +0.116% | -0.6%
| LOWRES | -0.003% | -0.046% | +0.218% | -0.4%
---------+---------+----------+----------+---------+--------
| HDRES | -0.112% | -0.057% | -0.032% | -0.1%
4 | MIDRES | -0.033% | -0.039% | -0.058% | -0.3%
| LOWRES | +0.049% | +0.006% | +0.217% | -0.3%
---------+---------+----------+----------+---------+--------
| HDRES | -0.227% | -0.046% | -0.011% | +0.2%
5 | MIDRES | -0.103% | -0.098% | -0.001% | -0.2%
| LOWRES | +0.126% | +0.071% | +0.234% | -0.34
---------+---------+----------+----------+---------+--------
| HDRES | -0.102% | -0.040% | +0.015% | +0.0%
6 | MIDRES | +0.057% | +0.064% | +0.205% | -0.2%
| LOWRES | -0.114% | -0.083% | +0.058% | -0.5%
---------+---------+----------+----------+---------+--------
STATS_CHANGED
Change-Id: I7592d28b389d933640524634faf623558a1724b0
diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c
index f1b859d..8fd4dcb 100644
--- a/av1/encoder/firstpass.c
+++ b/av1/encoder/firstpass.c
@@ -393,7 +393,6 @@
MACROBLOCK *const x = &td->mb;
MACROBLOCKD *const xd = &x->e_mbd;
const int unit_scale = mi_size_wide[fp_block_size];
- const int use_dc_pred = (unit_col || unit_row) && (!unit_col || !unit_row);
const int num_planes = av1_num_planes(cm);
const BLOCK_SIZE bsize =
get_bsize(mi_params, fp_block_size, unit_row, unit_col);
@@ -413,7 +412,7 @@
xd->mi[0]->segment_id = 0;
xd->lossless[xd->mi[0]->segment_id] = (qindex == 0);
xd->mi[0]->mode = DC_PRED;
- xd->mi[0]->tx_size = use_dc_pred ? max_txsize_lookup[bsize] : TX_4X4;
+ xd->mi[0]->tx_size = TX_4X4;
av1_encode_intra_block_plane(cpi, x, bsize, 0, DRY_RUN_NORMAL, 0);
int this_intra_error = aom_get_mb_ss(x->plane[0].src_diff);
