Remove PVQ_CHROMA_RD codes
Which was a workaround to balance the quality between
luma and chroma when PVQ is enabled, by
1) skipping PVQ DC RDO for chroma and
2) using smaller lambda value (x0.5) for intra prediction of chroma,
intended to spend more bits and thus improve quality for chroma.
The change in metric for 5 frames of objective-1-fast is:
PSNR PSNR-HVS SSIM CIEDE-2000 PSNR Cb PSNR Cr MS-SSIM
-1.45 -1.54 -1.46 4.62 13.71 14.87 -1.47
For still images (subset1)
PSNR PSNR-HVS SSIM CIEDE-2000 PSNR Cb PSNR Cr MS-SSIM VMAF
-1.52 -1.54 -1.60 2.56 11.92 12.17 -1.52 -1.66
Change-Id: I31c4d7a7de2939f6004c112649f7303f0e944156
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 1320568..8717c0c 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4768,20 +4768,9 @@
#endif // CONFIG_PALETTE
#if CONFIG_PVQ
- // For chroma channels, multiply lambda by 0.5 when doing intra prediction
- // NOTE: Chroma intra prediction itself has a separate RDO,
- // though final chroma intra mode's D and R is simply added to
- // those of luma then global RDO is performed to decide the modes of SB.
- // Also, for chroma, the RDO cannot decide tx_size (follow luma's decision)
- // or tx_type (DCT only), then only the intra prediction is
- // chroma's own mode decision based on separate RDO.
- // TODO(yushin) : Seek for more reasonable solution than this.
- this_rd = RDCOST(x->rdmult >> (1 * PVQ_CHROMA_RD), x->rddiv, this_rate,
- tokenonly_rd_stats.dist);
od_encode_rollback(&x->daala_enc, &buf);
-#else
- this_rd = RDCOST(x->rdmult, x->rddiv, this_rate, tokenonly_rd_stats.dist);
#endif
+ this_rd = RDCOST(x->rdmult, x->rddiv, this_rate, tokenonly_rd_stats.dist);
if (this_rd < best_rd) {
best_mbmi = *mbmi;
