summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2019-03-18 22:30:17 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-03-18 22:30:17 +0000
commit8af27dcd90cf3781097dce665d734e68fa9f5c78 (patch)
tree8e967d24c9cf7f8cef6b24b629212726b33b9073
parent34576dab60758e66fd66aa4c78e038efe21e8d69 (diff)
parent8c52776ec1eb175f008581835ecfaf52eb07b453 (diff)
downloadlibvpx-8af27dcd90cf3781097dce665d734e68fa9f5c78.tar
libvpx-8af27dcd90cf3781097dce665d734e68fa9f5c78.tar.gz
libvpx-8af27dcd90cf3781097dce665d734e68fa9f5c78.tar.bz2
libvpx-8af27dcd90cf3781097dce665d734e68fa9f5c78.zip
Merge "Add rdmult adjustment for perceptual AQ mode"
-rw-r--r--vp9/encoder/vp9_encodeframe.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index d0ebbae8d..f624de1f1 100644
--- 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,