commit 178146264b7553436cd9e93571cc853dcb771eee
author Urvang Joshi <urvang@google.com> Fri Mar 27 17:26:17 2020 -0700
committer Urvang Joshi <urvang@google.com> Mon Mar 30 20:32:10 2020 +0000
tree 7302346227218f3a20482741d3129aeac4f10dbf
parent 7787d5cc6c668e154bd3f717b4ff5106e87dce5c

Refactor CommonQuantParams from AV1_COMMON struct.

BUG=aomedia:2610

Change-Id: Ib2346b445946d3c2275c866b222313c2d0db659f

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 0e25acc..f7864e9 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -3430,7 +3430,7 @@
    * av1_init_quantizer() for every frame.
    */
   av1_init_quantizer(cpi);
-  av1_qm_init(cm);
+  av1_qm_init(&cm->quant_params, av1_num_planes(cm));
 
   av1_loop_filter_init(cm);
   cm->superres_scale_denominator = SCALE_NUMERATOR;
@@ -5837,7 +5837,7 @@
 
   // Note: Both use common rdmult based on base qindex of fullres.
   const int64_t rdmult =
-      av1_compute_rd_mult_based_on_qindex(cpi, cm->base_qindex);
+      av1_compute_rd_mult_based_on_qindex(cpi, cm->quant_params.base_qindex);
 
 #if SUPERRES_RECODE_ALL_RATIOS
   // Find the best rdcost among all superres denoms.
@@ -6904,7 +6904,9 @@
   return 0;
 }
 
-int av1_get_quantizer(AV1_COMP *cpi) { return cpi->common.base_qindex; }
+int av1_get_quantizer(AV1_COMP *cpi) {
+  return cpi->common.quant_params.base_qindex;
+}
 
 int av1_convert_sect5obus_to_annexb(uint8_t *buffer, size_t *frame_size) {
   size_t output_size = 0;