Commit e6501296 authored by Yaowu Xu's avatar Yaowu Xu

Move bit_depth init out of setup_quantization

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

Change-Id: I9d1dcb95d3336d797eb3c23a4702c30b04355357
parent f73a511d
...@@ -1150,10 +1150,6 @@ static void setup_quantization(VP10_COMMON *const cm, ...@@ -1150,10 +1150,6 @@ static void setup_quantization(VP10_COMMON *const cm,
cm->uv_dc_delta_q = read_delta_q(rb); cm->uv_dc_delta_q = read_delta_q(rb);
cm->uv_ac_delta_q = read_delta_q(rb); cm->uv_ac_delta_q = read_delta_q(rb);
cm->dequant_bit_depth = cm->bit_depth; 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) { static void setup_segmentation_dequant(VP10_COMMON *const cm) {
...@@ -2092,6 +2088,10 @@ static size_t read_uncompressed_header(VP10Decoder *pbi, ...@@ -2092,6 +2088,10 @@ static size_t read_uncompressed_header(VP10Decoder *pbi,
setup_loopfilter(&cm->lf, rb); setup_loopfilter(&cm->lf, rb);
setup_quantization(cm, rb); setup_quantization(cm, rb);
#if CONFIG_VP9_HIGHBITDEPTH
xd->bd = (int)cm->bit_depth;
#endif
setup_segmentation(cm, rb); setup_segmentation(cm, rb);
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment