Commit 01dee0bb authored by Yaowu Xu's avatar Yaowu Xu

Change "vp10" to "av1" in source code

Change-Id: Ifd0d08b97538dcc04227eceb6fb087224c760c59
parent cebe6f0c
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
API_EXPORTS += exports API_EXPORTS += exports
API_SRCS-$(CONFIG_V10_ENCODER) += vp8.h API_SRCS-$(CONFIG_V10_ENCODER) += vp8.h
API_SRCS-$(CONFIG_VP10_ENCODER) += vp8cx.h API_SRCS-$(CONFIG_AV1_ENCODER) += vp8cx.h
API_DOC_SRCS-$(CONFIG_VP10_ENCODER) += vp8.h API_DOC_SRCS-$(CONFIG_AV1_ENCODER) += vp8.h
API_DOC_SRCS-$(CONFIG_VP10_ENCODER) += vp8cx.h API_DOC_SRCS-$(CONFIG_AV1_ENCODER) += vp8cx.h
API_SRCS-$(CONFIG_VP10_DECODER) += vp8.h API_SRCS-$(CONFIG_AV1_DECODER) += vp8.h
API_SRCS-$(CONFIG_VP10_DECODER) += vp8dx.h API_SRCS-$(CONFIG_AV1_DECODER) += vp8dx.h
API_DOC_SRCS-$(CONFIG_VP10_DECODER) += vp8.h API_DOC_SRCS-$(CONFIG_AV1_DECODER) += vp8.h
API_DOC_SRCS-$(CONFIG_VP10_DECODER) += vp8dx.h API_DOC_SRCS-$(CONFIG_AV1_DECODER) += vp8dx.h
API_DOC_SRCS-yes += aom_codec.h API_DOC_SRCS-yes += aom_codec.h
API_DOC_SRCS-yes += aom_decoder.h API_DOC_SRCS-yes += aom_decoder.h
......
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
extern "C" { extern "C" {
#endif #endif
/*!\name Algorithm interface for VP10 /*!\name Algorithm interface for AV1
* *
* This interface provides the capability to encode raw VP10 streams. * This interface provides the capability to encode raw AV1 streams.
* @{ * @{
*/ */
extern aom_codec_iface_t aom_codec_vp10_cx_algo; extern aom_codec_iface_t aom_codec_av1_cx_algo;
extern aom_codec_iface_t *aom_codec_vp10_cx(void); extern aom_codec_iface_t *aom_codec_av1_cx(void);
/*!@} - end algorithm interface member group*/ /*!@} - end algorithm interface member group*/
/* /*
......
...@@ -28,13 +28,13 @@ extern "C" { ...@@ -28,13 +28,13 @@ extern "C" {
/* Include controls common to both the encoder and decoder */ /* Include controls common to both the encoder and decoder */
#include "./vp8.h" #include "./vp8.h"
/*!\name Algorithm interface for VP10 /*!\name Algorithm interface for AV1
* *
* This interface provides the capability to decode VP10 streams. * This interface provides the capability to decode AV1 streams.
* @{ * @{
*/ */
extern aom_codec_iface_t aom_codec_vp10_dx_algo; extern aom_codec_iface_t aom_codec_av1_dx_algo;
extern aom_codec_iface_t *aom_codec_vp10_dx(void); extern aom_codec_iface_t *aom_codec_av1_dx(void);
/*!@} - end algorithm interface member group*/ /*!@} - end algorithm interface member group*/
/*!\enum vp8_dec_control_id /*!\enum vp8_dec_control_id
......
...@@ -329,7 +329,7 @@ void aom_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ...@@ -329,7 +329,7 @@ void aom_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst,
filter_y, y_step_q4, w, h); filter_y, y_step_q4, w, h);
} }
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
static void highbd_convolve_horiz(const uint8_t *src8, ptrdiff_t src_stride, static void highbd_convolve_horiz(const uint8_t *src8, ptrdiff_t src_stride,
uint8_t *dst8, ptrdiff_t dst_stride, uint8_t *dst8, ptrdiff_t dst_stride,
const InterpKernel *x_filters, int x0_q4, const InterpKernel *x_filters, int x0_q4,
......
...@@ -24,7 +24,7 @@ typedef void (*convolve_fn_t)(const uint8_t *src, ptrdiff_t src_stride, ...@@ -24,7 +24,7 @@ typedef void (*convolve_fn_t)(const uint8_t *src, ptrdiff_t src_stride,
const int16_t *filter_y, int y_step_q4, int w, const int16_t *filter_y, int y_step_q4, int w,
int h); int h);
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
typedef void (*highbd_convolve_fn_t)(const uint8_t *src, ptrdiff_t src_stride, typedef void (*highbd_convolve_fn_t)(const uint8_t *src, ptrdiff_t src_stride,
uint8_t *dst, ptrdiff_t dst_stride, uint8_t *dst, ptrdiff_t dst_stride,
const int16_t *filter_x, int x_step_q4, const int16_t *filter_x, int x_step_q4,
......
...@@ -45,12 +45,12 @@ DSP_SRCS-$(HAVE_SSSE3) += x86/intrapred_ssse3.asm ...@@ -45,12 +45,12 @@ DSP_SRCS-$(HAVE_SSSE3) += x86/intrapred_ssse3.asm
DSP_SRCS-$(HAVE_SSSE3) += x86/aom_subpixel_8t_ssse3.asm DSP_SRCS-$(HAVE_SSSE3) += x86/aom_subpixel_8t_ssse3.asm
endif # CONFIG_USE_X86INC endif # CONFIG_USE_X86INC
ifeq ($(CONFIG_VPX_HIGHBITDEPTH),yes) ifeq ($(CONFIG_AOM_HIGHBITDEPTH),yes)
ifeq ($(CONFIG_USE_X86INC),yes) ifeq ($(CONFIG_USE_X86INC),yes)
DSP_SRCS-$(HAVE_SSE) += x86/highbd_intrapred_sse2.asm DSP_SRCS-$(HAVE_SSE) += x86/highbd_intrapred_sse2.asm
DSP_SRCS-$(HAVE_SSE2) += x86/highbd_intrapred_sse2.asm DSP_SRCS-$(HAVE_SSE2) += x86/highbd_intrapred_sse2.asm
endif # CONFIG_USE_X86INC endif # CONFIG_USE_X86INC
endif # CONFIG_VPX_HIGHBITDEPTH endif # CONFIG_AOM_HIGHBITDEPTH
DSP_SRCS-$(HAVE_NEON_ASM) += arm/intrapred_neon_asm$(ASM) DSP_SRCS-$(HAVE_NEON_ASM) += arm/intrapred_neon_asm$(ASM)
DSP_SRCS-$(HAVE_NEON) += arm/intrapred_neon.c DSP_SRCS-$(HAVE_NEON) += arm/intrapred_neon.c
...@@ -75,7 +75,7 @@ DSP_SRCS-$(HAVE_SSSE3) += x86/aom_subpixel_8t_ssse3.asm ...@@ -75,7 +75,7 @@ DSP_SRCS-$(HAVE_SSSE3) += x86/aom_subpixel_8t_ssse3.asm
DSP_SRCS-$(HAVE_SSSE3) += x86/aom_subpixel_bilinear_ssse3.asm DSP_SRCS-$(HAVE_SSSE3) += x86/aom_subpixel_bilinear_ssse3.asm
DSP_SRCS-$(HAVE_AVX2) += x86/aom_subpixel_8t_intrin_avx2.c DSP_SRCS-$(HAVE_AVX2) += x86/aom_subpixel_8t_intrin_avx2.c
DSP_SRCS-$(HAVE_SSSE3) += x86/aom_subpixel_8t_intrin_ssse3.c DSP_SRCS-$(HAVE_SSSE3) += x86/aom_subpixel_8t_intrin_ssse3.c
ifeq ($(CONFIG_VPX_HIGHBITDEPTH),yes) ifeq ($(CONFIG_AOM_HIGHBITDEPTH),yes)
DSP_SRCS-$(HAVE_SSE2) += x86/aom_high_subpixel_8t_sse2.asm DSP_SRCS-$(HAVE_SSE2) += x86/aom_high_subpixel_8t_sse2.asm
DSP_SRCS-$(HAVE_SSE2) += x86/aom_high_subpixel_bilinear_sse2.asm DSP_SRCS-$(HAVE_SSE2) += x86/aom_high_subpixel_bilinear_sse2.asm
endif endif
...@@ -156,15 +156,15 @@ DSP_SRCS-$(HAVE_DSPR2) += mips/loopfilter_mb_dspr2.c ...@@ -156,15 +156,15 @@ DSP_SRCS-$(HAVE_DSPR2) += mips/loopfilter_mb_dspr2.c
DSP_SRCS-$(HAVE_DSPR2) += mips/loopfilter_mb_horiz_dspr2.c DSP_SRCS-$(HAVE_DSPR2) += mips/loopfilter_mb_horiz_dspr2.c
DSP_SRCS-$(HAVE_DSPR2) += mips/loopfilter_mb_vert_dspr2.c DSP_SRCS-$(HAVE_DSPR2) += mips/loopfilter_mb_vert_dspr2.c
ifeq ($(CONFIG_VPX_HIGHBITDEPTH),yes) ifeq ($(CONFIG_AOM_HIGHBITDEPTH),yes)
DSP_SRCS-$(HAVE_SSE2) += x86/highbd_loopfilter_sse2.c DSP_SRCS-$(HAVE_SSE2) += x86/highbd_loopfilter_sse2.c
endif # CONFIG_VPX_HIGHBITDEPTH endif # CONFIG_AOM_HIGHBITDEPTH
DSP_SRCS-yes += txfm_common.h DSP_SRCS-yes += txfm_common.h
DSP_SRCS-$(HAVE_SSE2) += x86/txfm_common_sse2.h DSP_SRCS-$(HAVE_SSE2) += x86/txfm_common_sse2.h
DSP_SRCS-$(HAVE_MSA) += mips/txfm_macros_msa.h DSP_SRCS-$(HAVE_MSA) += mips/txfm_macros_msa.h
# forward transform # forward transform
ifneq ($(filter yes,$(CONFIG_VP10_ENCODER)),) ifneq ($(filter yes,$(CONFIG_AV1_ENCODER)),)
DSP_SRCS-yes += fwd_txfm.c DSP_SRCS-yes += fwd_txfm.c
DSP_SRCS-yes += fwd_txfm.h DSP_SRCS-yes += fwd_txfm.h
DSP_SRCS-$(HAVE_SSE2) += x86/fwd_txfm_sse2.h DSP_SRCS-$(HAVE_SSE2) += x86/fwd_txfm_sse2.h
...@@ -182,10 +182,10 @@ DSP_SRCS-$(HAVE_NEON) += arm/fwd_txfm_neon.c ...@@ -182,10 +182,10 @@ DSP_SRCS-$(HAVE_NEON) += arm/fwd_txfm_neon.c
DSP_SRCS-$(HAVE_MSA) += mips/fwd_txfm_msa.h DSP_SRCS-$(HAVE_MSA) += mips/fwd_txfm_msa.h
DSP_SRCS-$(HAVE_MSA) += mips/fwd_txfm_msa.c DSP_SRCS-$(HAVE_MSA) += mips/fwd_txfm_msa.c
DSP_SRCS-$(HAVE_MSA) += mips/fwd_dct32x32_msa.c DSP_SRCS-$(HAVE_MSA) += mips/fwd_dct32x32_msa.c
endif # CONFIG_VP10_ENCODER endif # CONFIG_AV1_ENCODER
# inverse transform # inverse transform
ifneq ($(filter yes,$(CONFIG_VP10)),) ifneq ($(filter yes,$(CONFIG_AV1)),)
DSP_SRCS-yes += inv_txfm.h DSP_SRCS-yes += inv_txfm.h
DSP_SRCS-yes += inv_txfm.c DSP_SRCS-yes += inv_txfm.c
DSP_SRCS-$(HAVE_SSE2) += x86/inv_txfm_sse2.h DSP_SRCS-$(HAVE_SSE2) += x86/inv_txfm_sse2.h
...@@ -227,23 +227,23 @@ DSP_SRCS-$(HAVE_MSA) += mips/idct8x8_msa.c ...@@ -227,23 +227,23 @@ DSP_SRCS-$(HAVE_MSA) += mips/idct8x8_msa.c
DSP_SRCS-$(HAVE_MSA) += mips/idct16x16_msa.c DSP_SRCS-$(HAVE_MSA) += mips/idct16x16_msa.c
DSP_SRCS-$(HAVE_MSA) += mips/idct32x32_msa.c DSP_SRCS-$(HAVE_MSA) += mips/idct32x32_msa.c
ifneq ($(CONFIG_VPX_HIGHBITDEPTH),yes) ifneq ($(CONFIG_AOM_HIGHBITDEPTH),yes)
DSP_SRCS-$(HAVE_DSPR2) += mips/inv_txfm_dspr2.h DSP_SRCS-$(HAVE_DSPR2) += mips/inv_txfm_dspr2.h
DSP_SRCS-$(HAVE_DSPR2) += mips/itrans4_dspr2.c DSP_SRCS-$(HAVE_DSPR2) += mips/itrans4_dspr2.c
DSP_SRCS-$(HAVE_DSPR2) += mips/itrans8_dspr2.c DSP_SRCS-$(HAVE_DSPR2) += mips/itrans8_dspr2.c
DSP_SRCS-$(HAVE_DSPR2) += mips/itrans16_dspr2.c DSP_SRCS-$(HAVE_DSPR2) += mips/itrans16_dspr2.c
DSP_SRCS-$(HAVE_DSPR2) += mips/itrans32_dspr2.c DSP_SRCS-$(HAVE_DSPR2) += mips/itrans32_dspr2.c
DSP_SRCS-$(HAVE_DSPR2) += mips/itrans32_cols_dspr2.c DSP_SRCS-$(HAVE_DSPR2) += mips/itrans32_cols_dspr2.c
endif # CONFIG_VPX_HIGHBITDEPTH endif # CONFIG_AOM_HIGHBITDEPTH
endif # CONFIG_VP10 endif # CONFIG_AV1
# quantization # quantization
ifneq ($(filter yes, $(CONFIG_VP10_ENCODER)),) ifneq ($(filter yes, $(CONFIG_AV1_ENCODER)),)
DSP_SRCS-yes += quantize.c DSP_SRCS-yes += quantize.c
DSP_SRCS-yes += quantize.h DSP_SRCS-yes += quantize.h
DSP_SRCS-$(HAVE_SSE2) += x86/quantize_sse2.c DSP_SRCS-$(HAVE_SSE2) += x86/quantize_sse2.c
ifeq ($(CONFIG_VPX_HIGHBITDEPTH),yes) ifeq ($(CONFIG_AOM_HIGHBITDEPTH),yes)
DSP_SRCS-$(HAVE_SSE2) += x86/highbd_quantize_intrin_sse2.c DSP_SRCS-$(HAVE_SSE2) += x86/highbd_quantize_intrin_sse2.c
endif endif
ifeq ($(ARCH_X86_64),yes) ifeq ($(ARCH_X86_64),yes)
...@@ -264,7 +264,7 @@ DSP_SRCS-$(HAVE_SSSE3) += x86/avg_ssse3_x86_64.asm ...@@ -264,7 +264,7 @@ DSP_SRCS-$(HAVE_SSSE3) += x86/avg_ssse3_x86_64.asm
endif endif
endif endif
endif # CONFIG_VP10_ENCODER endif # CONFIG_AV1_ENCODER
ifeq ($(CONFIG_ENCODERS),yes) ifeq ($(CONFIG_ENCODERS),yes)
DSP_SRCS-yes += sad.c DSP_SRCS-yes += sad.c
...@@ -292,10 +292,10 @@ DSP_SRCS-$(HAVE_SSE2) += x86/sad4d_sse2.asm ...@@ -292,10 +292,10 @@ DSP_SRCS-$(HAVE_SSE2) += x86/sad4d_sse2.asm
DSP_SRCS-$(HAVE_SSE2) += x86/sad_sse2.asm DSP_SRCS-$(HAVE_SSE2) += x86/sad_sse2.asm
DSP_SRCS-$(HAVE_SSE2) += x86/subtract_sse2.asm DSP_SRCS-$(HAVE_SSE2) += x86/subtract_sse2.asm
ifeq ($(CONFIG_VPX_HIGHBITDEPTH),yes) ifeq ($(CONFIG_AOM_HIGHBITDEPTH),yes)
DSP_SRCS-$(HAVE_SSE2) += x86/highbd_sad4d_sse2.asm DSP_SRCS-$(HAVE_SSE2) += x86/highbd_sad4d_sse2.asm
DSP_SRCS-$(HAVE_SSE2) += x86/highbd_sad_sse2.asm DSP_SRCS-$(HAVE_SSE2) += x86/highbd_sad_sse2.asm
endif # CONFIG_VPX_HIGHBITDEPTH endif # CONFIG_AOM_HIGHBITDEPTH
endif # CONFIG_USE_X86INC endif # CONFIG_USE_X86INC
endif # CONFIG_ENCODERS endif # CONFIG_ENCODERS
...@@ -334,13 +334,13 @@ DSP_SRCS-$(HAVE_SSE) += x86/subpel_variance_sse2.asm ...@@ -334,13 +334,13 @@ DSP_SRCS-$(HAVE_SSE) += x86/subpel_variance_sse2.asm
DSP_SRCS-$(HAVE_SSE2) += x86/subpel_variance_sse2.asm # Contains SSE2 and SSSE3 DSP_SRCS-$(HAVE_SSE2) += x86/subpel_variance_sse2.asm # Contains SSE2 and SSSE3
endif # CONFIG_USE_X86INC endif # CONFIG_USE_X86INC
ifeq ($(CONFIG_VPX_HIGHBITDEPTH),yes) ifeq ($(CONFIG_AOM_HIGHBITDEPTH),yes)
DSP_SRCS-$(HAVE_SSE2) += x86/highbd_variance_sse2.c DSP_SRCS-$(HAVE_SSE2) += x86/highbd_variance_sse2.c
DSP_SRCS-$(HAVE_SSE2) += x86/highbd_variance_impl_sse2.asm DSP_SRCS-$(HAVE_SSE2) += x86/highbd_variance_impl_sse2.asm
ifeq ($(CONFIG_USE_X86INC),yes) ifeq ($(CONFIG_USE_X86INC),yes)
DSP_SRCS-$(HAVE_SSE2) += x86/highbd_subpel_variance_impl_sse2.asm DSP_SRCS-$(HAVE_SSE2) += x86/highbd_subpel_variance_impl_sse2.asm
endif # CONFIG_USE_X86INC endif # CONFIG_USE_X86INC
endif # CONFIG_VPX_HIGHBITDEPTH endif # CONFIG_AOM_HIGHBITDEPTH
endif # CONFIG_ENCODERS endif # CONFIG_ENCODERS
DSP_SRCS-no += $(DSP_SRCS_REMOVE-yes) DSP_SRCS-no += $(DSP_SRCS_REMOVE-yes)
......
...@@ -29,7 +29,7 @@ typedef uint16_t qm_val_t; ...@@ -29,7 +29,7 @@ typedef uint16_t qm_val_t;
#define AOM_QM_BITS 6 #define AOM_QM_BITS 6
#endif #endif
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
// Note: // Note:
// tran_low_t is the datatype used for final transform coefficients. // tran_low_t is the datatype used for final transform coefficients.
// tran_high_t is the datatype used for intermediate transform stages. // tran_high_t is the datatype used for intermediate transform stages.
...@@ -41,7 +41,7 @@ typedef int32_t tran_low_t; ...@@ -41,7 +41,7 @@ typedef int32_t tran_low_t;
// tran_high_t is the datatype used for intermediate transform stages. // tran_high_t is the datatype used for intermediate transform stages.
typedef int32_t tran_high_t; typedef int32_t tran_high_t;
typedef int16_t tran_low_t; typedef int16_t tran_low_t;
#endif // CONFIG_VPX_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
static INLINE uint8_t clip_pixel(int val) { static INLINE uint8_t clip_pixel(int val) {
return (val > 255) ? 255 : (val < 0) ? 0 : val; return (val > 255) ? 255 : (val < 0) ? 0 : val;
...@@ -55,7 +55,7 @@ static INLINE double fclamp(double value, double low, double high) { ...@@ -55,7 +55,7 @@ static INLINE double fclamp(double value, double low, double high) {
return value < low ? low : (value > high ? high : value); return value < low ? low : (value > high ? high : value);
} }
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
static INLINE uint16_t clip_pixel_highbd(int val, int bd) { static INLINE uint16_t clip_pixel_highbd(int val, int bd) {
switch (bd) { switch (bd) {
case 8: case 8:
...@@ -64,7 +64,7 @@ static INLINE uint16_t clip_pixel_highbd(int val, int bd) { ...@@ -64,7 +64,7 @@ static INLINE uint16_t clip_pixel_highbd(int val, int bd) {
case 12: return (uint16_t)clamp(val, 0, 4095); case 12: return (uint16_t)clamp(val, 0, 4095);
} }
} }
#endif // CONFIG_VPX_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
......
This diff is collapsed.
...@@ -189,7 +189,7 @@ void aom_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, ...@@ -189,7 +189,7 @@ void aom_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp,
} }
} }
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
unsigned int aom_highbd_avg_8x8_c(const uint8_t *s8, int p) { unsigned int aom_highbd_avg_8x8_c(const uint8_t *s8, int p) {
int i, j; int i, j;
int sum = 0; int sum = 0;
...@@ -227,4 +227,4 @@ void aom_highbd_minmax_8x8_c(const uint8_t *s8, int p, const uint8_t *d8, ...@@ -227,4 +227,4 @@ void aom_highbd_minmax_8x8_c(const uint8_t *s8, int p, const uint8_t *d8,
} }
} }
} }
#endif // CONFIG_VPX_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
...@@ -770,7 +770,7 @@ void aom_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride) { ...@@ -770,7 +770,7 @@ void aom_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride) {
output[1] = 0; output[1] = 0;
} }
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
void aom_highbd_fdct4x4_c(const int16_t *input, tran_low_t *output, void aom_highbd_fdct4x4_c(const int16_t *input, tran_low_t *output,
int stride) { int stride) {
aom_fdct4x4_c(input, output, stride); aom_fdct4x4_c(input, output, stride);
...@@ -809,4 +809,4 @@ void aom_highbd_fdct32x32_1_c(const int16_t *input, tran_low_t *out, ...@@ -809,4 +809,4 @@ void aom_highbd_fdct32x32_1_c(const int16_t *input, tran_low_t *out,
int stride) { int stride) {
aom_fdct32x32_1_c(input, out, stride); aom_fdct32x32_1_c(input, out, stride);
} }
#endif // CONFIG_VPX_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
...@@ -490,7 +490,7 @@ void aom_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, ...@@ -490,7 +490,7 @@ void aom_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
DST(1, 3) = AVG3(L, K, J); DST(1, 3) = AVG3(L, K, J);
} }
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
static INLINE void highbd_d207_predictor(uint16_t *dst, ptrdiff_t stride, static INLINE void highbd_d207_predictor(uint16_t *dst, ptrdiff_t stride,
int bs, const uint16_t *above, int bs, const uint16_t *above,
const uint16_t *left, int bd) { const uint16_t *left, int bd) {
...@@ -765,7 +765,7 @@ static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride, int bs, ...@@ -765,7 +765,7 @@ static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride, int bs,
dst += stride; dst += stride;
} }
} }
#endif // CONFIG_VPX_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
// This serves as a wrapper function, so that all the prediction functions // This serves as a wrapper function, so that all the prediction functions
// can be unified and accessed as a pointer array. Note that the boundary // can be unified and accessed as a pointer array. Note that the boundary
...@@ -777,7 +777,7 @@ static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride, int bs, ...@@ -777,7 +777,7 @@ static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride, int bs,
type##_predictor(dst, stride, size, above, left); \ type##_predictor(dst, stride, size, above, left); \
} }
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
#define intra_pred_highbd_sized(type, size) \ #define intra_pred_highbd_sized(type, size) \
void aom_highbd_##type##_predictor_##size##x##size##_c( \ void aom_highbd_##type##_predictor_##size##x##size##_c( \
uint16_t *dst, ptrdiff_t stride, const uint16_t *above, \ uint16_t *dst, ptrdiff_t stride, const uint16_t *above, \
...@@ -806,7 +806,7 @@ static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride, int bs, ...@@ -806,7 +806,7 @@ static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride, int bs,
#define intra_pred_no_4x4(type) \ #define intra_pred_no_4x4(type) \
intra_pred_sized(type, 8) intra_pred_sized(type, 16) \ intra_pred_sized(type, 8) intra_pred_sized(type, 16) \
intra_pred_sized(type, 32) intra_pred_sized(type, 32)
#endif // CONFIG_VPX_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
/* clang-format off */ /* clang-format off */
intra_pred_no_4x4(d207) intra_pred_no_4x4(d207)
......
...@@ -1251,7 +1251,7 @@ void aom_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride) { ...@@ -1251,7 +1251,7 @@ void aom_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride) {
} }
} }
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
void aom_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest8, void aom_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest8,
int stride, int bd) { int stride, int bd) {
/* 4-point reversible, orthonormal inverse Walsh-Hadamard in 3.5 adds, /* 4-point reversible, orthonormal inverse Walsh-Hadamard in 3.5 adds,
...@@ -2487,4 +2487,4 @@ void aom_highbd_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest8, ...@@ -2487,4 +2487,4 @@ void aom_highbd_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest8,
dest += stride; dest += stride;
} }
} }
#endif // CONFIG_VPX_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
...@@ -41,7 +41,7 @@ static INLINE tran_low_t dct_const_round_shift(tran_high_t input) { ...@@ -41,7 +41,7 @@ static INLINE tran_low_t dct_const_round_shift(tran_high_t input) {
return check_range(rv); return check_range(rv);
} }
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
static INLINE tran_low_t highbd_check_range(tran_high_t input, int bd) { static INLINE tran_low_t highbd_check_range(tran_high_t input, int bd) {
#if CONFIG_COEFFICIENT_RANGE_CHECKING #if CONFIG_COEFFICIENT_RANGE_CHECKING
// For valid highbitdepth streams, intermediate stage coefficients will // For valid highbitdepth streams, intermediate stage coefficients will
...@@ -64,7 +64,7 @@ static INLINE tran_low_t highbd_dct_const_round_shift(tran_high_t input, ...@@ -64,7 +64,7 @@ static INLINE tran_low_t highbd_dct_const_round_shift(tran_high_t input,
tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS); tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS);
return highbd_check_range(rv, bd); return highbd_check_range(rv, bd);
} }
#endif // CONFIG_VPX_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
#if CONFIG_EMULATE_HARDWARE #if CONFIG_EMULATE_HARDWARE
// When CONFIG_EMULATE_HARDWARE is 1 the transform performs a // When CONFIG_EMULATE_HARDWARE is 1 the transform performs a
...@@ -96,7 +96,7 @@ void iadst4_c(const tran_low_t *input, tran_low_t *output); ...@@ -96,7 +96,7 @@ void iadst4_c(const tran_low_t *input, tran_low_t *output);
void iadst8_c(const tran_low_t *input, tran_low_t *output); void iadst8_c(const tran_low_t *input, tran_low_t *output);
void iadst16_c(const tran_low_t *input, tran_low_t *output); void iadst16_c(const tran_low_t *input, tran_low_t *output);
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
void aom_highbd_idct4_c(const tran_low_t *input, tran_low_t *output, int bd); void aom_highbd_idct4_c(const tran_low_t *input, tran_low_t *output, int bd);
void aom_highbd_idct8_c(const tran_low_t *input, tran_low_t *output, int bd); void aom_highbd_idct8_c(const tran_low_t *input, tran_low_t *output, int bd);
void aom_highbd_idct16_c(const tran_low_t *input, tran_low_t *output, int bd); void aom_highbd_idct16_c(const tran_low_t *input, tran_low_t *output, int bd);
......
...@@ -19,7 +19,7 @@ static INLINE int8_t signed_char_clamp(int t) { ...@@ -19,7 +19,7 @@ static INLINE int8_t signed_char_clamp(int t) {
return (int8_t)clamp(t, -128, 127); return (int8_t)clamp(t, -128, 127);
} }
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
static INLINE int16_t signed_char_clamp_high(int t, int bd) { static INLINE int16_t signed_char_clamp_high(int t, int bd) {
switch (bd) { switch (bd) {
case 10: return (int16_t)clamp(t, -128 * 4, 128 * 4 - 1); case 10: return (int16_t)clamp(t, -128 * 4, 128 * 4 - 1);
...@@ -342,7 +342,7 @@ void aom_lpf_vertical_16_dual_c(uint8_t *s, int p, const uint8_t *blimit, ...@@ -342,7 +342,7 @@ void aom_lpf_vertical_16_dual_c(uint8_t *s, int p, const uint8_t *blimit,
mb_lpf_vertical_edge_w(s, p, blimit, limit, thresh, 16); mb_lpf_vertical_edge_w(s, p, blimit, limit, thresh, 16);
} }
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
// Should we apply any filter at all: 11111111 yes, 00000000 no ? // Should we apply any filter at all: 11111111 yes, 00000000 no ?
static INLINE int8_t highbd_filter_mask(uint8_t limit, uint8_t blimit, static INLINE int8_t highbd_filter_mask(uint8_t limit, uint8_t blimit,
uint16_t p3, uint16_t p2, uint16_t p1, uint16_t p3, uint16_t p2, uint16_t p1,
...@@ -706,4 +706,4 @@ void aom_highbd_lpf_vertical_16_dual_c(uint16_t *s, int p, ...@@ -706,4 +706,4 @@ void aom_highbd_lpf_vertical_16_dual_c(uint16_t *s, int p,
const uint8_t *thresh, int bd) { const uint8_t *thresh, int bd) {
highbd_mb_lpf_vertical_edge_w(s, p, blimit, limit, thresh, 16, bd); highbd_mb_lpf_vertical_edge_w(s, p, blimit, limit, thresh, 16, bd);
} }
#endif // CONFIG_VPX_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
...@@ -40,7 +40,7 @@ void aom_quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs, int skip_block, ...@@ -40,7 +40,7 @@ void aom_quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs, int skip_block,
*eob_ptr = eob + 1; *eob_ptr = eob + 1;
} }
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
void aom_highbd_quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs, void aom_highbd_quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs,
int skip_block, const int16_t *round_ptr, int skip_block, const int16_t *round_ptr,
const int16_t quant, tran_low_t *qcoeff_ptr, const int16_t quant, tran_low_t *qcoeff_ptr,
...@@ -99,7 +99,7 @@ void aom_quantize_dc_32x32(const tran_low_t *coeff_ptr, int skip_block, ...@@ -99,7 +99,7 @@ void aom_quantize_dc_32x32(const tran_low_t *coeff_ptr, int skip_block,
*eob_ptr = eob + 1; *eob_ptr = eob + 1;
} }
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
void aom_highbd_quantize_dc_32x32(const tran_low_t *coeff_ptr, int skip_block, void aom_highbd_quantize_dc_32x32(const tran_low_t *coeff_ptr, int skip_block,
const int16_t *round_ptr, const int16_t quant, const int16_t *round_ptr, const int16_t quant,
tran_low_t *qcoeff_ptr, tran_low_t *qcoeff_ptr,
...@@ -192,7 +192,7 @@ void aom_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, ...@@ -192,7 +192,7 @@ void aom_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs,
*eob_ptr = eob + 1; *eob_ptr = eob + 1;
} }
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
void aom_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, void aom_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs,
int skip_block, const int16_t *zbin_ptr, int skip_block, const int16_t *zbin_ptr,
const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *round_ptr, const int16_t *quant_ptr,
...@@ -316,7 +316,7 @@ void aom_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, ...@@ -316,7 +316,7 @@ void aom_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs,
*eob_ptr = eob + 1; *eob_ptr = eob + 1;
} }
#if CONFIG_VPX_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
void aom_highbd_quantize_b_32x32_c( void aom_highbd_quantize_b_32x32_c(
const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, 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, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr,
...@@ -400,7 +400,7 @@ void aom_quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs, int skip_block, ...@@ -400,7 +400,7 @@ void aom_quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs, int skip_block,
*eob_ptr = eob + 1; *eob_ptr = eob + 1;