Rename CONFIG_VPX_HIGHBITDEPTH -> CONFIG_VP9_HIGHBITDEPTH "vpx-highbitdepth" config doesn't exist. Change-Id: Ib6d3691454299bb381ecc75b80657fbebf9f59b2
diff --git a/vp10/common/dering.c b/vp10/common/dering.c index b7b8183..6d61101 100644 --- a/vp10/common/dering.c +++ b/vp10/common/dering.c
@@ -70,7 +70,7 @@ src[pli] = vpx_malloc(sizeof(*src) * cm->mi_rows * cm->mi_cols * 64); for (r = 0; r < bsize[pli] * cm->mi_rows; ++r) { for (c = 0; c < bsize[pli] * cm->mi_cols; ++c) { -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_VP9_HIGHBITDEPTH if (cm->use_highbitdepth) { src[pli][r * stride + c] = CONVERT_TO_SHORTPTR( xd->plane[pli].dst.buf)[r * xd->plane[pli].dst.stride + c]; @@ -78,7 +78,7 @@ #endif src[pli][r * stride + c] = xd->plane[pli].dst.buf[r * xd->plane[pli].dst.stride + c]; -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_VP9_HIGHBITDEPTH } #endif } @@ -124,7 +124,7 @@ cm->mi_cols, threshold, OD_DERING_NO_CHECK_OVERLAP, coeff_shift); for (r = 0; r < bsize[pli] * nvb; ++r) { for (c = 0; c < bsize[pli] * nhb; ++c) { -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_VP9_HIGHBITDEPTH if (cm->use_highbitdepth) { CONVERT_TO_SHORTPTR(xd->plane[pli].dst.buf) [xd->plane[pli].dst.stride * @@ -138,7 +138,7 @@ (bsize[pli] * MI_BLOCK_SIZE * sbr + r) + sbc * bsize[pli] * MI_BLOCK_SIZE + c] = dst[r * MI_BLOCK_SIZE * bsize[pli] + c]; -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_VP9_HIGHBITDEPTH } #endif }
diff --git a/vp10/encoder/pickdering.c b/vp10/encoder/pickdering.c index 45acaa1..323567d 100644 --- a/vp10/encoder/pickdering.c +++ b/vp10/encoder/pickdering.c
@@ -64,7 +64,7 @@ stride = bsize[0] * cm->mi_cols; for (r = 0; r < bsize[0] * cm->mi_rows; ++r) { for (c = 0; c < bsize[0] * cm->mi_cols; ++c) { -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_VP9_HIGHBITDEPTH if (cm->use_highbitdepth) { src[r * stride + c] = CONVERT_TO_SHORTPTR( xd->plane[0].dst.buf)[r * xd->plane[0].dst.stride + c]; @@ -75,7 +75,7 @@ src[r * stride + c] = xd->plane[0].dst.buf[r * xd->plane[0].dst.stride + c]; ref_coeff[r * stride + c] = ref->y_buffer[r * ref->y_stride + c]; -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_VP9_HIGHBITDEPTH } #endif }
diff --git a/vpx_dsp/quantize.c b/vpx_dsp/quantize.c index 6836556..78a7c2b 100644 --- a/vpx_dsp/quantize.c +++ b/vpx_dsp/quantize.c
@@ -40,7 +40,7 @@ *eob_ptr = eob + 1; } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_VP9_HIGHBITDEPTH void vpx_highbd_quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs, int skip_block, const int16_t *round_ptr, const int16_t quant, tran_low_t *qcoeff_ptr, @@ -99,7 +99,7 @@ *eob_ptr = eob + 1; } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_VP9_HIGHBITDEPTH void vpx_highbd_quantize_dc_32x32(const tran_low_t *coeff_ptr, int skip_block, const int16_t *round_ptr, const int16_t quant, tran_low_t *qcoeff_ptr, @@ -192,7 +192,7 @@ *eob_ptr = eob + 1; } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_VP9_HIGHBITDEPTH void vpx_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, @@ -316,7 +316,7 @@ *eob_ptr = eob + 1; } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_VP9_HIGHBITDEPTH void vpx_highbd_quantize_b_32x32_c( const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr,