Add rdmult adjustment for perceptual AQ mode

Compute the Lagrangian multiplier for the adaptive quantization
settings.

Change-Id: Ieebe074d6f8163e7541264cb0ead22432273e338

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 17d57f9..b5bf183 100644 (file)
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1927,6 +1927,13 @@ static void set_segment_rdmult(VP9_COMP *const cpi, MACROBLOCK *const x,
   }
 
   x->rdmult = vp9_compute_rd_mult(cpi, cm->base_qindex + cm->y_dc_delta_q);
+
+  if (cpi->sf.enable_wiener_variance && cm->show_frame) {
+    if (cm->seg.enabled)
+      x->rdmult = vp9_compute_rd_mult(
+          cpi, vp9_get_qindex(&cm->seg, x->e_mbd.mi[0]->segment_id,
+                              cm->base_qindex));
+  }
 }
 
 static void rd_pick_sb_modes(VP9_COMP *cpi, TileDataEnc *tile_data,