Merge "Fix dropped const qualifier in new_quant experiment" into nextgenv2

vp10/encoder/block.h

@@ -42,7 +42,7 @@ typedef struct macroblock_plane {
   const int16_t *zbin;
   const int16_t *round;
 #if CONFIG_NEW_QUANT
-  cuml_bins_type_nuq *cuml_bins_nuq[QUANT_PROFILES];
+  const cuml_bins_type_nuq *cuml_bins_nuq[QUANT_PROFILES];
 #endif  // CONFIG_NEW_QUANT
 
   int64_t quant_thred[2];

vp10/encoder/quantize.c

@@ -1078,10 +1078,8 @@ void vp10_init_plane_quantizers(const VP10_COMP *cpi, MACROBLOCK *x,
   xd->plane[0].dequant = cpi->y_dequant[qindex];
 #if CONFIG_NEW_QUANT
   for (dq = 0; dq < QUANT_PROFILES; dq++) {
-    x->plane[0].cuml_bins_nuq[dq] =
-        (cuml_bins_type_nuq *)quants->y_cuml_bins_nuq[dq][qindex];
-    xd->plane[0].dequant_val_nuq[dq] =
-        (const dequant_val_type_nuq *)cpi->y_dequant_val_nuq[dq][qindex];
+    x->plane[0].cuml_bins_nuq[dq] = quants->y_cuml_bins_nuq[dq][qindex];
+    xd->plane[0].dequant_val_nuq[dq] = cpi->y_dequant_val_nuq[dq][qindex];
   }
 #endif  // CONFIG_NEW_QUANT
 
@@ -1099,10 +1097,8 @@ void vp10_init_plane_quantizers(const VP10_COMP *cpi, MACROBLOCK *x,
     xd->plane[i].dequant = cpi->uv_dequant[qindex];
 #if CONFIG_NEW_QUANT
     for (dq = 0; dq < QUANT_PROFILES; dq++) {
-      x->plane[i].cuml_bins_nuq[dq] =
-          (cuml_bins_type_nuq *)quants->uv_cuml_bins_nuq[dq][qindex];
-      xd->plane[i].dequant_val_nuq[dq] =
-          (const dequant_val_type_nuq *)cpi->uv_dequant_val_nuq[dq][qindex];
+      x->plane[i].cuml_bins_nuq[dq] = quants->uv_cuml_bins_nuq[dq][qindex];
+      xd->plane[i].dequant_val_nuq[dq] = cpi->uv_dequant_val_nuq[dq][qindex];
     }
 #endif  // CONFIG_NEW_QUANT