commit c9adbbace3735c302c84351f85eeb216e7661bc4
author Hui Su <huisu@google.com> Thu Jul 18 18:12:57 2019 +0000
committer Hui Su <huisu@google.com> Thu Jul 18 20:25:53 2019 +0000
tree 9c84d8ade7fdd2456fde206da99d152c260baf9d
parent 5427c0c0c205f68ce50375e727f4f404b05da8a3

Revert "Adjust RD mult for keyframe in Q mode"

This reverts commit 46d995f85fda2cb2325d0aa150f79eb4a2503b37.

Reason for revert: causes quality regression on AWCY

Change-Id: I4926de2501d7d3cd863740da8c58627846fe29c4

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index a55471e..55ba611 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -351,12 +351,6 @@
   const int q = av1_dc_quant_QTX(qindex, 0, cpi->common.seq_params.bit_depth);
   int rdmult = q * q;
   rdmult = rdmult * 3 + (rdmult * 2 / 3);
-  if (frame_is_intra_only(&cpi->common) && cpi->oxcf.rc_mode == AOM_Q &&
-      qindex > 64 && qindex <= 192) {
-    // Formula is picked experimentally.
-    rdmult = rdmult * 13 / 4;
-  }
-
   switch (cpi->common.seq_params.bit_depth) {
     case AOM_BITS_8: break;
     case AOM_BITS_10: rdmult = ROUND_POWER_OF_TWO(rdmult, 4); break;