Change "vp10" to "av1" in source code Change-Id: Ifd0d08b97538dcc04227eceb6fb087224c760c59
diff --git a/aom_dsp/aom_convolve.c b/aom_dsp/aom_convolve.c index 233e850..d74957b 100644 --- a/aom_dsp/aom_convolve.c +++ b/aom_dsp/aom_convolve.c
@@ -329,7 +329,7 @@ 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, uint8_t *dst8, ptrdiff_t dst_stride, const InterpKernel *x_filters, int x0_q4,
diff --git a/aom_dsp/aom_convolve.h b/aom_dsp/aom_convolve.h index 1fc4af4..6f17c4a 100644 --- a/aom_dsp/aom_convolve.h +++ b/aom_dsp/aom_convolve.h
@@ -24,7 +24,7 @@ const int16_t *filter_y, int y_step_q4, int w, int h); -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH typedef void (*highbd_convolve_fn_t)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4,
diff --git a/aom_dsp/aom_dsp.mk b/aom_dsp/aom_dsp.mk index fcc04c2..2aea32c 100644 --- a/aom_dsp/aom_dsp.mk +++ b/aom_dsp/aom_dsp.mk
@@ -45,12 +45,12 @@ DSP_SRCS-$(HAVE_SSSE3) += x86/aom_subpixel_8t_ssse3.asm endif # CONFIG_USE_X86INC -ifeq ($(CONFIG_VPX_HIGHBITDEPTH),yes) +ifeq ($(CONFIG_AOM_HIGHBITDEPTH),yes) ifeq ($(CONFIG_USE_X86INC),yes) DSP_SRCS-$(HAVE_SSE) += x86/highbd_intrapred_sse2.asm DSP_SRCS-$(HAVE_SSE2) += x86/highbd_intrapred_sse2.asm 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) += arm/intrapred_neon.c @@ -75,7 +75,7 @@ DSP_SRCS-$(HAVE_SSSE3) += x86/aom_subpixel_bilinear_ssse3.asm DSP_SRCS-$(HAVE_AVX2) += x86/aom_subpixel_8t_intrin_avx2.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_bilinear_sse2.asm endif @@ -156,15 +156,15 @@ DSP_SRCS-$(HAVE_DSPR2) += mips/loopfilter_mb_horiz_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 -endif # CONFIG_VPX_HIGHBITDEPTH +endif # CONFIG_AOM_HIGHBITDEPTH DSP_SRCS-yes += txfm_common.h DSP_SRCS-$(HAVE_SSE2) += x86/txfm_common_sse2.h DSP_SRCS-$(HAVE_MSA) += mips/txfm_macros_msa.h # 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.h DSP_SRCS-$(HAVE_SSE2) += x86/fwd_txfm_sse2.h @@ -182,10 +182,10 @@ DSP_SRCS-$(HAVE_MSA) += mips/fwd_txfm_msa.h DSP_SRCS-$(HAVE_MSA) += mips/fwd_txfm_msa.c DSP_SRCS-$(HAVE_MSA) += mips/fwd_dct32x32_msa.c -endif # CONFIG_VP10_ENCODER +endif # CONFIG_AV1_ENCODER # inverse transform -ifneq ($(filter yes,$(CONFIG_VP10)),) +ifneq ($(filter yes,$(CONFIG_AV1)),) DSP_SRCS-yes += inv_txfm.h DSP_SRCS-yes += inv_txfm.c DSP_SRCS-$(HAVE_SSE2) += x86/inv_txfm_sse2.h @@ -227,23 +227,23 @@ DSP_SRCS-$(HAVE_MSA) += mips/idct16x16_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/itrans4_dspr2.c DSP_SRCS-$(HAVE_DSPR2) += mips/itrans8_dspr2.c DSP_SRCS-$(HAVE_DSPR2) += mips/itrans16_dspr2.c DSP_SRCS-$(HAVE_DSPR2) += mips/itrans32_dspr2.c DSP_SRCS-$(HAVE_DSPR2) += mips/itrans32_cols_dspr2.c -endif # CONFIG_VPX_HIGHBITDEPTH -endif # CONFIG_VP10 +endif # CONFIG_AOM_HIGHBITDEPTH +endif # CONFIG_AV1 # quantization -ifneq ($(filter yes, $(CONFIG_VP10_ENCODER)),) +ifneq ($(filter yes, $(CONFIG_AV1_ENCODER)),) DSP_SRCS-yes += quantize.c DSP_SRCS-yes += quantize.h 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 endif ifeq ($(ARCH_X86_64),yes) @@ -264,7 +264,7 @@ endif endif -endif # CONFIG_VP10_ENCODER +endif # CONFIG_AV1_ENCODER ifeq ($(CONFIG_ENCODERS),yes) DSP_SRCS-yes += sad.c @@ -292,10 +292,10 @@ DSP_SRCS-$(HAVE_SSE2) += x86/sad_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_sad_sse2.asm -endif # CONFIG_VPX_HIGHBITDEPTH +endif # CONFIG_AOM_HIGHBITDEPTH endif # CONFIG_USE_X86INC endif # CONFIG_ENCODERS @@ -334,13 +334,13 @@ DSP_SRCS-$(HAVE_SSE2) += x86/subpel_variance_sse2.asm # Contains SSE2 and SSSE3 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_impl_sse2.asm ifeq ($(CONFIG_USE_X86INC),yes) DSP_SRCS-$(HAVE_SSE2) += x86/highbd_subpel_variance_impl_sse2.asm endif # CONFIG_USE_X86INC -endif # CONFIG_VPX_HIGHBITDEPTH +endif # CONFIG_AOM_HIGHBITDEPTH endif # CONFIG_ENCODERS DSP_SRCS-no += $(DSP_SRCS_REMOVE-yes)
diff --git a/aom_dsp/aom_dsp_common.h b/aom_dsp/aom_dsp_common.h index 54a3c32..2372049 100644 --- a/aom_dsp/aom_dsp_common.h +++ b/aom_dsp/aom_dsp_common.h
@@ -29,7 +29,7 @@ #define AOM_QM_BITS 6 #endif -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH // Note: // tran_low_t is the datatype used for final transform coefficients. // tran_high_t is the datatype used for intermediate transform stages. @@ -41,7 +41,7 @@ // tran_high_t is the datatype used for intermediate transform stages. typedef int32_t tran_high_t; typedef int16_t tran_low_t; -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH static INLINE uint8_t clip_pixel(int val) { return (val > 255) ? 255 : (val < 0) ? 0 : val; @@ -55,7 +55,7 @@ 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) { switch (bd) { case 8: @@ -64,7 +64,7 @@ case 12: return (uint16_t)clamp(val, 0, 4095); } } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH #ifdef __cplusplus } // extern "C"
diff --git a/aom_dsp/aom_dsp_rtcd_defs.pl b/aom_dsp/aom_dsp_rtcd_defs.pl index 2c504a9..a01cd96 100644 --- a/aom_dsp/aom_dsp_rtcd_defs.pl +++ b/aom_dsp/aom_dsp_rtcd_defs.pl
@@ -256,7 +256,7 @@ specialize qw/aom_dc_128_predictor_32x32 msa neon/, "$sse2_x86inc"; # High bitdepth functions -if (aom_config("CONFIG_VPX_HIGHBITDEPTH") eq "yes") { +if (aom_config("CONFIG_AOM_HIGHBITDEPTH") eq "yes") { add_proto qw/void aom_highbd_d207_predictor_4x4/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd"; specialize qw/aom_highbd_d207_predictor_4x4/; @@ -448,7 +448,7 @@ add_proto qw/void aom_highbd_dc_128_predictor_32x32/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd"; specialize qw/aom_highbd_dc_128_predictor_32x32/; -} # CONFIG_VPX_HIGHBITDEPTH +} # CONFIG_AOM_HIGHBITDEPTH # # Sub Pixel Filters @@ -495,7 +495,7 @@ add_proto qw/void aom_scaled_avg_vert/, "const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h"; specialize qw/aom_scaled_avg_vert/; -if (aom_config("CONFIG_VPX_HIGHBITDEPTH") eq "yes") { +if (aom_config("CONFIG_AOM_HIGHBITDEPTH") eq "yes") { # # Sub Pixel Filters # @@ -522,7 +522,7 @@ add_proto qw/void aom_highbd_convolve8_avg_vert/, "const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps"; specialize qw/aom_highbd_convolve8_avg_vert/, "$sse2_x86_64"; -} # CONFIG_VPX_HIGHBITDEPTH +} # CONFIG_AOM_HIGHBITDEPTH # # Loopfilter @@ -565,7 +565,7 @@ add_proto qw/void aom_lpf_horizontal_4_dual/, "uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1"; specialize qw/aom_lpf_horizontal_4_dual sse2 neon dspr2 msa/; -if (aom_config("CONFIG_VPX_HIGHBITDEPTH") eq "yes") { +if (aom_config("CONFIG_AOM_HIGHBITDEPTH") eq "yes") { add_proto qw/void aom_highbd_lpf_vertical_16/, "uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd"; specialize qw/aom_highbd_lpf_vertical_16 sse2/; @@ -598,7 +598,7 @@ add_proto qw/void aom_highbd_lpf_horizontal_4_dual/, "uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd"; specialize qw/aom_highbd_lpf_horizontal_4_dual sse2/; -} # CONFIG_VPX_HIGHBITDEPTH +} # CONFIG_AOM_HIGHBITDEPTH # # Encoder functions. @@ -607,8 +607,8 @@ # # Forward transform # -if (aom_config("CONFIG_VP10_ENCODER") eq "yes") { -if (aom_config("CONFIG_VPX_HIGHBITDEPTH") eq "yes") { +if (aom_config("CONFIG_AV1_ENCODER") eq "yes") { +if (aom_config("CONFIG_AOM_HIGHBITDEPTH") eq "yes") { add_proto qw/void aom_fdct4x4/, "const int16_t *input, tran_low_t *output, int stride"; specialize qw/aom_fdct4x4 sse2/; @@ -686,13 +686,13 @@ add_proto qw/void aom_fdct32x32_1/, "const int16_t *input, tran_low_t *output, int stride"; specialize qw/aom_fdct32x32_1 sse2 msa/; -} # CONFIG_VPX_HIGHBITDEPTH -} # CONFIG_VP10_ENCODER +} # CONFIG_AOM_HIGHBITDEPTH +} # CONFIG_AV1_ENCODER # # Inverse transform -if (aom_config("CONFIG_VP10") eq "yes") { -if (aom_config("CONFIG_VPX_HIGHBITDEPTH") eq "yes") { +if (aom_config("CONFIG_AV1") eq "yes") { +if (aom_config("CONFIG_AOM_HIGHBITDEPTH") eq "yes") { # Note as optimized versions of these functions are added we need to add a check to ensure # that when CONFIG_EMULATE_HARDWARE is on, it defaults to the C versions only. add_proto qw/void aom_iwht4x4_1_add/, "const tran_low_t *input, uint8_t *dest, int dest_stride"; @@ -925,40 +925,40 @@ add_proto qw/void aom_iwht4x4_16_add/, "const tran_low_t *input, uint8_t *dest, int dest_stride"; specialize qw/aom_iwht4x4_16_add msa/, "$sse2_x86inc"; } # CONFIG_EMULATE_HARDWARE -} # CONFIG_VPX_HIGHBITDEPTH -} # CONFIG_VP10 +} # CONFIG_AOM_HIGHBITDEPTH +} # CONFIG_AV1 # # Quantization # if (aom_config("CONFIG_AOM_QM") eq "yes") { - if (aom_config("CONFIG_VP10_ENCODER") eq "yes") { + if (aom_config("CONFIG_AV1_ENCODER") eq "yes") { add_proto qw/void aom_quantize_b/, "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 *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, const qm_val_t * qm_ptr, const qm_val_t * iqm_ptr"; add_proto qw/void aom_quantize_b_32x32/, "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 *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, const qm_val_t * qm_ptr, const qm_val_t * iqm_ptr"; - if (aom_config("CONFIG_VPX_HIGHBITDEPTH") eq "yes") { + if (aom_config("CONFIG_AOM_HIGHBITDEPTH") eq "yes") { add_proto qw/void aom_highbd_quantize_b/, "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 *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, const qm_val_t * qm_ptr, const qm_val_t * iqm_ptr"; add_proto qw/void aom_highbd_quantize_b_32x32/, "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 *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, const qm_val_t * qm_ptr, const qm_val_t * iqm_ptr"; - } # CONFIG_VPX_HIGHBITDEPTH - } # CONFIG_VP10_ENCODER + } # CONFIG_AOM_HIGHBITDEPTH + } # CONFIG_AV1_ENCODER } else { - if (aom_config("CONFIG_VP10_ENCODER") eq "yes") { + if (aom_config("CONFIG_AV1_ENCODER") eq "yes") { add_proto qw/void aom_quantize_b/, "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 *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan"; specialize qw/aom_quantize_b sse2/, "$ssse3_x86_64_x86inc", "$avx_x86_64_x86inc"; add_proto qw/void aom_quantize_b_32x32/, "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 *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan"; specialize qw/aom_quantize_b_32x32/, "$ssse3_x86_64_x86inc", "$avx_x86_64_x86inc"; - if (aom_config("CONFIG_VPX_HIGHBITDEPTH") eq "yes") { + if (aom_config("CONFIG_AOM_HIGHBITDEPTH") eq "yes") { add_proto qw/void aom_highbd_quantize_b/, "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 *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan"; specialize qw/aom_highbd_quantize_b sse2/; add_proto qw/void aom_highbd_quantize_b_32x32/, "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 *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan"; specialize qw/aom_highbd_quantize_b_32x32 sse2/; - } # CONFIG_VPX_HIGHBITDEPTH - } # CONFIG_VP10_ENCODER + } # CONFIG_AOM_HIGHBITDEPTH + } # CONFIG_AV1_ENCODER } # CONFIG_AOM_QM if (aom_config("CONFIG_ENCODERS") eq "yes") { @@ -1013,7 +1013,7 @@ # # Avg # -if (aom_config("CONFIG_VP10_ENCODER") eq "yes") { +if (aom_config("CONFIG_AV1_ENCODER") eq "yes") { add_proto qw/unsigned int aom_avg_8x8/, "const uint8_t *, int p"; specialize qw/aom_avg_8x8 sse2 neon msa/; @@ -1040,7 +1040,7 @@ add_proto qw/int aom_vector_var/, "int16_t const *ref, int16_t const *src, const int bwl"; specialize qw/aom_vector_var neon sse2/; -} # CONFIG_VP10_ENCODER +} # CONFIG_AV1_ENCODER add_proto qw/unsigned int aom_sad64x64_avg/, "const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred"; specialize qw/aom_sad64x64_avg avx2 msa/, "$sse2_x86inc"; @@ -1187,7 +1187,7 @@ specialize qw/aom_ssim_parms_16x16/, "$sse2_x86_64"; } -if (aom_config("CONFIG_VPX_HIGHBITDEPTH") eq "yes") { +if (aom_config("CONFIG_AOM_HIGHBITDEPTH") eq "yes") { # # Block subtraction # @@ -1387,7 +1387,7 @@ add_proto qw/void aom_highbd_ssim_parms_8x8/, "const uint16_t *s, int sp, const uint16_t *r, int rp, uint32_t *sum_s, uint32_t *sum_r, uint32_t *sum_sq_s, uint32_t *sum_sq_r, uint32_t *sum_sxr"; specialize qw/aom_highbd_ssim_parms_8x8/; } -} # CONFIG_VPX_HIGHBITDEPTH +} # CONFIG_AOM_HIGHBITDEPTH } # CONFIG_ENCODERS if (aom_config("CONFIG_ENCODERS") eq "yes") { @@ -1556,7 +1556,7 @@ add_proto qw/uint32_t aom_variance_halfpixvar16x16_hv/, "const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, uint32_t *sse"; specialize qw/aom_variance_halfpixvar16x16_hv mmx sse2 media/; -if (aom_config("CONFIG_VPX_HIGHBITDEPTH") eq "yes") { +if (aom_config("CONFIG_AOM_HIGHBITDEPTH") eq "yes") { add_proto qw/unsigned int aom_highbd_12_variance64x64/, "const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse"; specialize qw/aom_highbd_12_variance64x64 sse2/; @@ -1913,7 +1913,7 @@ add_proto qw/uint32_t aom_highbd_8_sub_pixel_avg_variance4x8/, "const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred"; add_proto qw/uint32_t aom_highbd_8_sub_pixel_avg_variance4x4/, "const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred"; -} # CONFIG_VPX_HIGHBITDEPTH +} # CONFIG_AOM_HIGHBITDEPTH } # CONFIG_ENCODERS 1;
diff --git a/aom_dsp/avg.c b/aom_dsp/avg.c index bbdb090..18b5474 100644 --- a/aom_dsp/avg.c +++ b/aom_dsp/avg.c
@@ -189,7 +189,7 @@ } } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH unsigned int aom_highbd_avg_8x8_c(const uint8_t *s8, int p) { int i, j; int sum = 0; @@ -227,4 +227,4 @@ } } } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH
diff --git a/aom_dsp/fwd_txfm.c b/aom_dsp/fwd_txfm.c index 68409f9..4aa448a 100644 --- a/aom_dsp/fwd_txfm.c +++ b/aom_dsp/fwd_txfm.c
@@ -770,7 +770,7 @@ output[1] = 0; } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH void aom_highbd_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride) { aom_fdct4x4_c(input, output, stride); @@ -809,4 +809,4 @@ int stride) { aom_fdct32x32_1_c(input, out, stride); } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH
diff --git a/aom_dsp/intrapred.c b/aom_dsp/intrapred.c index e75faa6..83d1039 100644 --- a/aom_dsp/intrapred.c +++ b/aom_dsp/intrapred.c
@@ -490,7 +490,7 @@ 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, int bs, const uint16_t *above, const uint16_t *left, int bd) { @@ -765,7 +765,7 @@ dst += stride; } } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH // 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 @@ -777,7 +777,7 @@ type##_predictor(dst, stride, size, above, left); \ } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH #define intra_pred_highbd_sized(type, size) \ void aom_highbd_##type##_predictor_##size##x##size##_c( \ uint16_t *dst, ptrdiff_t stride, const uint16_t *above, \ @@ -806,7 +806,7 @@ #define intra_pred_no_4x4(type) \ intra_pred_sized(type, 8) intra_pred_sized(type, 16) \ intra_pred_sized(type, 32) -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH /* clang-format off */ intra_pred_no_4x4(d207)
diff --git a/aom_dsp/inv_txfm.c b/aom_dsp/inv_txfm.c index 0e40949..110ba26 100644 --- a/aom_dsp/inv_txfm.c +++ b/aom_dsp/inv_txfm.c
@@ -1251,7 +1251,7 @@ } } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH void aom_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest8, int stride, int bd) { /* 4-point reversible, orthonormal inverse Walsh-Hadamard in 3.5 adds, @@ -2487,4 +2487,4 @@ dest += stride; } } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH
diff --git a/aom_dsp/inv_txfm.h b/aom_dsp/inv_txfm.h index c071670..e36b35f 100644 --- a/aom_dsp/inv_txfm.h +++ b/aom_dsp/inv_txfm.h
@@ -41,7 +41,7 @@ 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) { #if CONFIG_COEFFICIENT_RANGE_CHECKING // For valid highbitdepth streams, intermediate stage coefficients will @@ -64,7 +64,7 @@ tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS); return highbd_check_range(rv, bd); } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH #if CONFIG_EMULATE_HARDWARE // When CONFIG_EMULATE_HARDWARE is 1 the transform performs a @@ -96,7 +96,7 @@ void iadst8_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_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);
diff --git a/aom_dsp/loopfilter.c b/aom_dsp/loopfilter.c index da9ea91..e43ebe8 100644 --- a/aom_dsp/loopfilter.c +++ b/aom_dsp/loopfilter.c
@@ -19,7 +19,7 @@ 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) { switch (bd) { case 10: return (int16_t)clamp(t, -128 * 4, 128 * 4 - 1); @@ -342,7 +342,7 @@ 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 ? static INLINE int8_t highbd_filter_mask(uint8_t limit, uint8_t blimit, uint16_t p3, uint16_t p2, uint16_t p1, @@ -706,4 +706,4 @@ const uint8_t *thresh, int bd) { highbd_mb_lpf_vertical_edge_w(s, p, blimit, limit, thresh, 16, bd); } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH
diff --git a/aom_dsp/quantize.c b/aom_dsp/quantize.c index 2a194c6..1b9bbdc 100644 --- a/aom_dsp/quantize.c +++ b/aom_dsp/quantize.c
@@ -40,7 +40,7 @@ *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, 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_AOM_HIGHBITDEPTH void aom_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_AOM_HIGHBITDEPTH void aom_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_AOM_HIGHBITDEPTH void aom_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, @@ -400,7 +400,7 @@ *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, int skip_block, const int16_t *round_ptr, const int16_t quant, tran_low_t *qcoeff_ptr, @@ -450,7 +450,7 @@ *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, const int16_t *round_ptr, const int16_t quant, tran_low_t *qcoeff_ptr, @@ -527,7 +527,7 @@ *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, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, @@ -632,7 +632,7 @@ *eob_ptr = eob + 1; } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH void aom_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,
diff --git a/aom_dsp/quantize.h b/aom_dsp/quantize.h index cb941b5..ffb158d 100644 --- a/aom_dsp/quantize.h +++ b/aom_dsp/quantize.h
@@ -38,7 +38,7 @@ uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, const qm_val_t *qm_ptr, const qm_val_t *iqm_ptr); -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH void aom_highbd_quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs, int skip_block, const int16_t *round_ptr, const int16_t quant_ptr, tran_low_t *qcoeff_ptr, @@ -75,7 +75,7 @@ tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH void aom_highbd_quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs, int skip_block, const int16_t *round_ptr, const int16_t quant_ptr, tran_low_t *qcoeff_ptr,
diff --git a/aom_dsp/sad.c b/aom_dsp/sad.c index a94876a..2945a4a 100644 --- a/aom_dsp/sad.c +++ b/aom_dsp/sad.c
@@ -54,7 +54,7 @@ } } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH static INLINE void highbd_avg_pred(uint16_t *comp_pred, const uint8_t *pred8, int width, int height, const uint8_t *ref8, int ref_stride) { @@ -71,7 +71,7 @@ ref += ref_stride; } } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH #define sadMxN(m, n) \ unsigned int aom_sad##m##x##n##_c(const uint8_t *src, int src_stride, \ @@ -179,7 +179,7 @@ sadMxNx4D(4, 4) /* clang-format on */ -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH static INLINE unsigned int highbd_sad(const uint8_t *a8, int a_stride, const uint8_t *b8, int b_stride, int width, int height) { @@ -317,4 +317,4 @@ highbd_sadMxNx4D(4, 4) /* clang-format on */ -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH
diff --git a/aom_dsp/ssim.c b/aom_dsp/ssim.c index c208070..52e263e 100644 --- a/aom_dsp/ssim.c +++ b/aom_dsp/ssim.c
@@ -45,7 +45,7 @@ } } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH void aom_highbd_ssim_parms_8x8_c(const uint16_t *s, int sp, const uint16_t *r, int rp, uint32_t *sum_s, uint32_t *sum_r, uint32_t *sum_sq_s, uint32_t *sum_sq_r, @@ -61,7 +61,7 @@ } } } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH static const int64_t cc1 = 26634; // (64^2*(.01*255)^2 static const int64_t cc2 = 239708; // (64^2*(.03*255)^2 @@ -92,7 +92,7 @@ return similarity(sum_s, sum_r, sum_sq_s, sum_sq_r, sum_sxr, 64); } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH static double highbd_ssim_8x8(const uint16_t *s, int sp, const uint16_t *r, int rp, unsigned int bd) { uint32_t sum_s = 0, sum_r = 0, sum_sq_s = 0, sum_sq_r = 0, sum_sxr = 0; @@ -102,7 +102,7 @@ return similarity(sum_s >> oshift, sum_r >> oshift, sum_sq_s >> (2 * oshift), sum_sq_r >> (2 * oshift), sum_sxr >> (2 * oshift), 64); } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH // We are using a 8x8 moving window with starting location of each 8x8 window // on the 4x4 pixel grid. Such arrangement allows the windows to overlap @@ -127,7 +127,7 @@ return ssim_total; } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH static double aom_highbd_ssim2(const uint8_t *img1, const uint8_t *img2, int stride_img1, int stride_img2, int width, int height, unsigned int bd) { @@ -149,7 +149,7 @@ ssim_total /= samples; return ssim_total; } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH double aom_calc_ssim(const YV12_BUFFER_CONFIG *source, const YV12_BUFFER_CONFIG *dest, double *weight) { @@ -436,7 +436,7 @@ return inconsistency_total; } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH double aom_highbd_calc_ssim(const YV12_BUFFER_CONFIG *source, const YV12_BUFFER_CONFIG *dest, double *weight, unsigned int bd) { @@ -486,4 +486,4 @@ return ssim_all; } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH
diff --git a/aom_dsp/ssim.h b/aom_dsp/ssim.h index afe9d9a..0b4d8f4 100644 --- a/aom_dsp/ssim.h +++ b/aom_dsp/ssim.h
@@ -80,7 +80,7 @@ const YV12_BUFFER_CONFIG *dest, double *ssim_y, double *ssim_u, double *ssim_v); -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH double aom_highbd_calc_ssim(const YV12_BUFFER_CONFIG *source, const YV12_BUFFER_CONFIG *dest, double *weight, unsigned int bd); @@ -88,7 +88,7 @@ double aom_highbd_calc_ssimg(const YV12_BUFFER_CONFIG *source, const YV12_BUFFER_CONFIG *dest, double *ssim_y, double *ssim_u, double *ssim_v, unsigned int bd); -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH #ifdef __cplusplus } // extern "C"
diff --git a/aom_dsp/subtract.c b/aom_dsp/subtract.c index 3890d46..da526c4 100644 --- a/aom_dsp/subtract.c +++ b/aom_dsp/subtract.c
@@ -32,7 +32,7 @@ } } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH void aom_highbd_subtract_block_c(int rows, int cols, int16_t *diff, ptrdiff_t diff_stride, const uint8_t *src8, ptrdiff_t src_stride, const uint8_t *pred8, @@ -52,4 +52,4 @@ src += src_stride; } } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH
diff --git a/aom_dsp/variance.c b/aom_dsp/variance.c index 3367538..bf97a6b 100644 --- a/aom_dsp/variance.c +++ b/aom_dsp/variance.c
@@ -257,7 +257,7 @@ } } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH static void highbd_variance64(const uint8_t *a8, int a_stride, const uint8_t *b8, int b_stride, int w, int h, uint64_t *sse, uint64_t *sum) { @@ -573,4 +573,4 @@ ref += ref_stride; } } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH
diff --git a/aom_dsp/variance.h b/aom_dsp/variance.h index 81966fc..8bd10dd 100644 --- a/aom_dsp/variance.h +++ b/aom_dsp/variance.h
@@ -54,7 +54,7 @@ const uint8_t *a_ptr, int a_stride, int xoffset, int yoffset, const uint8_t *b_ptr, int b_stride, unsigned int *sse, const uint8_t *second_pred); -#if CONFIG_VP10 +#if CONFIG_AV1 typedef struct aom_variance_vtable { aom_sad_fn_t sdf; aom_sad_avg_fn_t sdaf; @@ -65,7 +65,7 @@ aom_sad_multi_fn_t sdx8f; aom_sad_multi_d_fn_t sdx4df; } aom_variance_fn_ptr_t; -#endif // CONFIG_VP10 +#endif // CONFIG_AV1 #ifdef __cplusplus } // extern "C"
diff --git a/aom_dsp/x86/aom_asm_stubs.c b/aom_dsp/x86/aom_asm_stubs.c index be8cba5..1b71a9f 100644 --- a/aom_dsp/x86/aom_asm_stubs.c +++ b/aom_dsp/x86/aom_asm_stubs.c
@@ -78,7 +78,7 @@ FUN_CONV_2D(, sse2); FUN_CONV_2D(avg_, sse2); -#if CONFIG_VPX_HIGHBITDEPTH && ARCH_X86_64 +#if CONFIG_AOM_HIGHBITDEPTH && ARCH_X86_64 highbd_filter8_1dfunction aom_highbd_filter_block1d16_v8_sse2; highbd_filter8_1dfunction aom_highbd_filter_block1d16_h8_sse2; highbd_filter8_1dfunction aom_highbd_filter_block1d8_v8_sse2; @@ -159,5 +159,5 @@ // int w, int h, int bd); HIGH_FUN_CONV_2D(, sse2); HIGH_FUN_CONV_2D(avg_, sse2); -#endif // CONFIG_VPX_HIGHBITDEPTH && ARCH_X86_64 +#endif // CONFIG_AOM_HIGHBITDEPTH && ARCH_X86_64 #endif // HAVE_SSE2
diff --git a/aom_dsp/x86/aom_convolve_copy_sse2.asm b/aom_dsp/x86/aom_convolve_copy_sse2.asm index eb66e84..4182c19 100644 --- a/aom_dsp/x86/aom_convolve_copy_sse2.asm +++ b/aom_dsp/x86/aom_convolve_copy_sse2.asm
@@ -222,7 +222,7 @@ INIT_XMM sse2 convolve_fn copy convolve_fn avg -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH convolve_fn copy, highbd convolve_fn avg, highbd %endif
diff --git a/aom_dsp/x86/convolve.h b/aom_dsp/x86/convolve.h index cf43654..dd453b0 100644 --- a/aom_dsp/x86/convolve.h +++ b/aom_dsp/x86/convolve.h
@@ -104,7 +104,7 @@ } \ } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH typedef void highbd_filter8_1dfunction(const uint16_t *src_ptr, const ptrdiff_t src_pitch, @@ -206,6 +206,6 @@ w, h, bd); \ } \ } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH #endif // VPX_DSP_X86_CONVOLVE_H_
diff --git a/aom_dsp/x86/fwd_txfm_sse2.c b/aom_dsp/x86/fwd_txfm_sse2.c index 2afb212..4dcc67c 100644 --- a/aom_dsp/x86/fwd_txfm_sse2.c +++ b/aom_dsp/x86/fwd_txfm_sse2.c
@@ -247,7 +247,7 @@ #undef FDCT32x32_HIGH_PRECISION #undef DCT_HIGH_BIT_DEPTH -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH #define DCT_HIGH_BIT_DEPTH 1 #define FDCT4x4_2D aom_highbd_fdct4x4_sse2 #define FDCT8x8_2D aom_highbd_fdct8x8_sse2 @@ -269,4 +269,4 @@ #undef FDCT32x32_2D #undef FDCT32x32_HIGH_PRECISION #undef DCT_HIGH_BIT_DEPTH -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH
diff --git a/aom_dsp/x86/fwd_txfm_sse2.h b/aom_dsp/x86/fwd_txfm_sse2.h index 6149938..8e1a007 100644 --- a/aom_dsp/x86/fwd_txfm_sse2.h +++ b/aom_dsp/x86/fwd_txfm_sse2.h
@@ -245,7 +245,7 @@ } static INLINE void store_output(const __m128i *poutput, tran_low_t *dst_ptr) { -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH const __m128i zero = _mm_setzero_si128(); const __m128i sign_bits = _mm_cmplt_epi16(*poutput, zero); __m128i out0 = _mm_unpacklo_epi16(*poutput, sign_bits); @@ -254,11 +254,11 @@ _mm_store_si128((__m128i *)(dst_ptr + 4), out1); #else _mm_store_si128((__m128i *)(dst_ptr), *poutput); -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH } static INLINE void storeu_output(const __m128i *poutput, tran_low_t *dst_ptr) { -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH const __m128i zero = _mm_setzero_si128(); const __m128i sign_bits = _mm_cmplt_epi16(*poutput, zero); __m128i out0 = _mm_unpacklo_epi16(*poutput, sign_bits); @@ -267,7 +267,7 @@ _mm_storeu_si128((__m128i *)(dst_ptr + 4), out1); #else _mm_storeu_si128((__m128i *)(dst_ptr), *poutput); -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH } static INLINE __m128i mult_round_shift(const __m128i *pin0, const __m128i *pin1,
diff --git a/aom_dsp/x86/highbd_quantize_intrin_sse2.c b/aom_dsp/x86/highbd_quantize_intrin_sse2.c index 975dde7..598f3d2 100644 --- a/aom_dsp/x86/highbd_quantize_intrin_sse2.c +++ b/aom_dsp/x86/highbd_quantize_intrin_sse2.c
@@ -15,7 +15,7 @@ #include "aom_mem/aom_mem.h" #include "aom_ports/mem.h" -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH void aom_highbd_quantize_b_sse2(const tran_low_t *coeff_ptr, intptr_t count, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr,
diff --git a/aom_dsp/x86/inv_txfm_sse2.c b/aom_dsp/x86/inv_txfm_sse2.c index 1a8359f..548929d 100644 --- a/aom_dsp/x86/inv_txfm_sse2.c +++ b/aom_dsp/x86/inv_txfm_sse2.c
@@ -3473,7 +3473,7 @@ } } -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH static INLINE __m128i clamp_high_sse2(__m128i value, int bd) { __m128i ubounded, retval; const __m128i zero = _mm_set1_epi16(0); @@ -4035,4 +4035,4 @@ } } } -#endif // CONFIG_VPX_HIGHBITDEPTH +#endif // CONFIG_AOM_HIGHBITDEPTH
diff --git a/aom_dsp/x86/inv_txfm_sse2.h b/aom_dsp/x86/inv_txfm_sse2.h index ddb680f..dbe233d 100644 --- a/aom_dsp/x86/inv_txfm_sse2.h +++ b/aom_dsp/x86/inv_txfm_sse2.h
@@ -94,7 +94,7 @@ // Function to allow 8 bit optimisations to be used when profile 0 is used with // highbitdepth enabled static INLINE __m128i load_input_data(const tran_low_t *data) { -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH return octa_set_epi16(data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]); #else
diff --git a/aom_dsp/x86/inv_txfm_ssse3_x86_64.asm b/aom_dsp/x86/inv_txfm_ssse3_x86_64.asm index a835161..3890926 100644 --- a/aom_dsp/x86/inv_txfm_ssse3_x86_64.asm +++ b/aom_dsp/x86/inv_txfm_ssse3_x86_64.asm
@@ -220,7 +220,7 @@ mova m12, [pw_11585x2] lea r3, [2 * strideq] -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH mova m0, [inputq + 0] packssdw m0, [inputq + 16] mova m1, [inputq + 32] @@ -271,7 +271,7 @@ lea r3, [2 * strideq] -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH mova m0, [inputq + 0] packssdw m0, [inputq + 16] mova m1, [inputq + 32] @@ -793,7 +793,7 @@ lea r4, [rsp + transposed_in] idct32x32_34_transpose: -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH mova m0, [r3 + 0] packssdw m0, [r3 + 16] mova m1, [r3 + 32 * 4] @@ -1223,7 +1223,7 @@ mov r7, 2 idct32x32_135_transpose: -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH mova m0, [r3 + 0] packssdw m0, [r3 + 16] mova m1, [r3 + 32 * 4] @@ -1261,7 +1261,7 @@ mova [r4 + 16 * 6], m6 mova [r4 + 16 * 7], m7 -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH add r3, 32 %else add r3, 16 @@ -1272,7 +1272,7 @@ IDCT32X32_135 16*0, 16*32, 16*64, 16*96 lea stp, [stp + 16 * 8] -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH lea inputq, [inputq + 32 * 32] %else lea inputq, [inputq + 16 * 32] @@ -1687,7 +1687,7 @@ mov r7, 4 idct32x32_1024_transpose: -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH mova m0, [r3 + 0] packssdw m0, [r3 + 16] mova m1, [r3 + 32 * 4] @@ -1725,7 +1725,7 @@ mova [r4 + 16 * 5], m5 mova [r4 + 16 * 6], m6 mova [r4 + 16 * 7], m7 -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH add r3, 32 %else add r3, 16 @@ -1737,7 +1737,7 @@ IDCT32X32_1024 16*0, 16*32, 16*64, 16*96 lea stp, [stp + 16 * 8] -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH lea inputq, [inputq + 32 * 32] %else lea inputq, [inputq + 16 * 32]
diff --git a/aom_dsp/x86/inv_wht_sse2.asm b/aom_dsp/x86/inv_wht_sse2.asm index eec5047..ee80563 100644 --- a/aom_dsp/x86/inv_wht_sse2.asm +++ b/aom_dsp/x86/inv_wht_sse2.asm
@@ -82,7 +82,7 @@ INIT_XMM sse2 cglobal iwht4x4_16_add, 3, 3, 7, input, output, stride -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH mova m0, [inputq + 0] packssdw m0, [inputq + 16] mova m1, [inputq + 32]
diff --git a/aom_dsp/x86/quantize_avx_x86_64.asm b/aom_dsp/x86/quantize_avx_x86_64.asm index b3d78c4..b74d6ea 100644 --- a/aom_dsp/x86/quantize_avx_x86_64.asm +++ b/aom_dsp/x86/quantize_avx_x86_64.asm
@@ -41,7 +41,7 @@ mova m0, [zbinq] ; m0 = zbin ; Get DC and first 15 AC coeffs - in this special case, that is all. -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; coeff stored as 32bit numbers but we process them as 16 bit numbers mova m9, [coeffq] packssdw m9, [coeffq+16] ; m9 = c[i] @@ -73,7 +73,7 @@ ptest m14, m14 jnz .single_nonzero -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH mova [r1 ], ymm5 mova [r1+32], ymm5 mova [r2 ], ymm5 @@ -121,7 +121,7 @@ pand m8, m7 pand m13, m12 -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; Store 16bit numbers as 32bit numbers in array pointed to by qcoeff pcmpgtw m6, m5, m8 punpckhwd m6, m8, m6 @@ -142,7 +142,7 @@ punpckhqdq m3, m3 pmullw m13, m3 ; dqc[i] = qc[i] * q -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; Store 16bit numbers as 32bit numbers in array pointed to by qcoeff pcmpgtw m6, m5, m8 punpckhwd m6, m8, m6 @@ -226,7 +226,7 @@ DEFINE_ARGS coeff, ncoeff, d1, qcoeff, dqcoeff, iscan, d2, d3, d4, d5, eob -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH lea coeffq, [ coeffq+ncoeffq*4] lea qcoeffq, [ qcoeffq+ncoeffq*4] lea dqcoeffq, [dqcoeffq+ncoeffq*4] @@ -239,7 +239,7 @@ neg ncoeffq ; get DC and first 15 AC coeffs -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; coeff stored as 32bit numbers & require 16bit numbers mova m9, [coeffq+ncoeffq*4+ 0] packssdw m9, [coeffq+ncoeffq*4+16] @@ -261,7 +261,7 @@ ptest m14, m14 jnz .first_nonzero -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH mova [qcoeffq+ncoeffq*4 ], ymm5 mova [qcoeffq+ncoeffq*4+32], ymm5 mova [dqcoeffq+ncoeffq*4 ], ymm5 @@ -299,7 +299,7 @@ pand m8, m7 pand m13, m12 -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; store 16bit numbers as 32bit numbers in array pointed to by qcoeff pcmpgtw m6, m5, m8 punpckhwd m6, m8, m6 @@ -330,7 +330,7 @@ psignw m13, m10 %endif -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; store 16bit numbers as 32bit numbers in array pointed to by qcoeff pcmpgtw m6, m5, m8 punpckhwd m6, m8, m6 @@ -360,7 +360,7 @@ .ac_only_loop: -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; pack coeff from 32bit to 16bit array mova m9, [coeffq+ncoeffq*4+ 0] packssdw m9, [coeffq+ncoeffq*4+16] @@ -382,7 +382,7 @@ ptest m14, m14 jnz .rest_nonzero -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH mova [qcoeffq+ncoeffq*4+ 0], ymm5 mova [qcoeffq+ncoeffq*4+32], ymm5 mova [dqcoeffq+ncoeffq*4+ 0], ymm5 @@ -421,7 +421,7 @@ pand m14, m7 pand m13, m12 -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; store 16bit numbers as 32bit numbers in array pointed to by qcoeff pcmpgtw m6, m5, m14 punpckhwd m6, m14, m6 @@ -451,7 +451,7 @@ psignw m13, m10 %endif -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; store 16bit numbers as 32bit numbers in array pointed to by qcoeff pcmpgtw m6, m5, m14 punpckhwd m6, m14, m6 @@ -507,7 +507,7 @@ DEFINE_ARGS dqcoeff, ncoeff, qcoeff, eob -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH lea dqcoeffq, [dqcoeffq+ncoeffq*4] lea qcoeffq, [ qcoeffq+ncoeffq*4] %else @@ -519,7 +519,7 @@ pxor m7, m7 .blank_loop: -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH mova [dqcoeffq+ncoeffq*4+ 0], ymm7 mova [dqcoeffq+ncoeffq*4+32], ymm7 mova [qcoeffq+ncoeffq*4+ 0], ymm7
diff --git a/aom_dsp/x86/quantize_sse2.c b/aom_dsp/x86/quantize_sse2.c index 3a2655f..39ce529 100644 --- a/aom_dsp/x86/quantize_sse2.c +++ b/aom_dsp/x86/quantize_sse2.c
@@ -16,7 +16,7 @@ #include "aom/aom_integer.h" static INLINE __m128i load_coefficients(const tran_low_t* coeff_ptr) { -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH return _mm_setr_epi16((int16_t)coeff_ptr[0], (int16_t)coeff_ptr[1], (int16_t)coeff_ptr[2], (int16_t)coeff_ptr[3], (int16_t)coeff_ptr[4], (int16_t)coeff_ptr[5], @@ -28,7 +28,7 @@ static INLINE void store_coefficients(__m128i coeff_vals, tran_low_t* coeff_ptr) { -#if CONFIG_VPX_HIGHBITDEPTH +#if CONFIG_AOM_HIGHBITDEPTH __m128i one = _mm_set1_epi16(1); __m128i coeff_vals_hi = _mm_mulhi_epi16(coeff_vals, one); __m128i coeff_vals_lo = _mm_mullo_epi16(coeff_vals, one);
diff --git a/aom_dsp/x86/quantize_ssse3_x86_64.asm b/aom_dsp/x86/quantize_ssse3_x86_64.asm index f97ee57..4503370 100644 --- a/aom_dsp/x86/quantize_ssse3_x86_64.asm +++ b/aom_dsp/x86/quantize_ssse3_x86_64.asm
@@ -53,7 +53,7 @@ %endif pxor m5, m5 ; m5 = dedicated zero DEFINE_ARGS coeff, ncoeff, d1, qcoeff, dqcoeff, iscan, d2, d3, d4, d5, eob -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH lea coeffq, [ coeffq+ncoeffq*4] lea qcoeffq, [ qcoeffq+ncoeffq*4] lea dqcoeffq, [dqcoeffq+ncoeffq*4] @@ -66,7 +66,7 @@ neg ncoeffq ; get DC and first 15 AC coeffs -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; coeff stored as 32bit numbers & require 16bit numbers mova m9, [ coeffq+ncoeffq*4+ 0] packssdw m9, [ coeffq+ncoeffq*4+16] @@ -96,7 +96,7 @@ psignw m13, m10 ; m13 = reinsert sign pand m8, m7 pand m13, m12 -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; store 16bit numbers as 32bit numbers in array pointed to by qcoeff mova m11, m8 mova m6, m8 @@ -131,7 +131,7 @@ psignw m8, m9 psignw m13, m10 %endif -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; store 16bit numbers as 32bit numbers in array pointed to by qcoeff mova m11, m8 mova m6, m8 @@ -166,7 +166,7 @@ jz .accumulate_eob .ac_only_loop: -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; pack coeff from 32bit to 16bit array mova m9, [ coeffq+ncoeffq*4+ 0] packssdw m9, [ coeffq+ncoeffq*4+16] @@ -198,7 +198,7 @@ psignw m13, m10 ; m13 = reinsert sign pand m14, m7 pand m13, m12 -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; store 16bit numbers as 32bit numbers in array pointed to by qcoeff pxor m11, m11 mova m11, m14 @@ -233,7 +233,7 @@ psignw m14, m9 psignw m13, m10 %endif -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH ; store 16bit numbers as 32bit numbers in array pointed to by qcoeff mova m11, m14 mova m6, m14 @@ -271,7 +271,7 @@ %ifidn %1, b_32x32 jmp .accumulate_eob .skip_iter: -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH mova [qcoeffq+ncoeffq*4+ 0], m5 mova [qcoeffq+ncoeffq*4+16], m5 mova [qcoeffq+ncoeffq*4+32], m5 @@ -310,7 +310,7 @@ mov r2, qcoeffmp mov r3, eobmp DEFINE_ARGS dqcoeff, ncoeff, qcoeff, eob -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH lea dqcoeffq, [dqcoeffq+ncoeffq*4] lea qcoeffq, [ qcoeffq+ncoeffq*4] %else @@ -320,7 +320,7 @@ neg ncoeffq pxor m7, m7 .blank_loop: -%if CONFIG_VPX_HIGHBITDEPTH +%if CONFIG_AOM_HIGHBITDEPTH mova [dqcoeffq+ncoeffq*4+ 0], m7 mova [dqcoeffq+ncoeffq*4+16], m7 mova [dqcoeffq+ncoeffq*4+32], m7