shithub: libvpx

Info  •  Files  •  Log  •  Branches

Move bit_depth init out of setup_quantization

This also fixes a compiling error under --enable-vp9_highbitdepth.

Change-Id: I9d1dcb95d3336d797eb3c23a4702c30b04355357

--- a/vp10/decoder/decodeframe.c

+++ b/vp10/decoder/decodeframe.c

@@ -1150,10 +1150,6 @@

   cm->uv_dc_delta_q = read_delta_q(rb);

   cm->uv_ac_delta_q = read_delta_q(rb);

   cm->dequant_bit_depth = cm->bit_depth;

-

-#if CONFIG_VP9_HIGHBITDEPTH

-  xd->bd = (int)cm->bit_depth;

-#endif

 }

 static void setup_segmentation_dequant(VP10_COMMON *const cm) {

@@ -2092,6 +2088,10 @@

   setup_loopfilter(&cm->lf, rb);

   setup_quantization(cm, rb);

+#if CONFIG_VP9_HIGHBITDEPTH

+  xd->bd = (int)cm->bit_depth;

+#endif

+

   setup_segmentation(cm, rb);

   {