Clear out CONFIG_VP8 and CONFIG_VP9
diff --git a/libs.mk b/libs.mk index e6fb068..ee4c750 100644 --- a/libs.mk +++ b/libs.mk
@@ -53,62 +53,6 @@ include $(SRC_PATH_BARE)/vpx_util/vpx_util.mk CODEC_SRCS-yes += $(addprefix vpx_util/,$(call enabled,UTIL_SRCS)) -ifeq ($(CONFIG_VP8),yes) - VP8_PREFIX=vp8/ - include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8_common.mk -endif - -ifeq ($(CONFIG_VP8_ENCODER),yes) - include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx.mk - CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_CX_SRCS)) - CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_CX_EXPORTS)) - INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h - INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/% - CODEC_DOC_SECTIONS += vp8 vp8_encoder -endif - -ifeq ($(CONFIG_VP8_DECODER),yes) - include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8dx.mk - CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_DX_SRCS)) - CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_DX_EXPORTS)) - INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8dx.h - INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/% - CODEC_DOC_SECTIONS += vp8 vp8_decoder -endif - -ifeq ($(CONFIG_VP9),yes) - VP9_PREFIX=vp9/ - include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9_common.mk -endif - -ifeq ($(CONFIG_VP9_ENCODER),yes) - VP9_PREFIX=vp9/ - include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9cx.mk - CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_CX_SRCS)) - CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_CX_EXPORTS)) - CODEC_SRCS-yes += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h - INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h - INSTALL-LIBS-$(CONFIG_SPATIAL_SVC) += include/vpx/svc_context.h - INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/% - CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h - CODEC_DOC_SECTIONS += vp9 vp9_encoder -endif - -ifeq ($(CONFIG_VP9_DECODER),yes) - VP9_PREFIX=vp9/ - include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9dx.mk - CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_DX_SRCS)) - CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_DX_EXPORTS)) - CODEC_SRCS-yes += $(VP9_PREFIX)vp9dx.mk vpx/vp8.h vpx/vp8dx.h - INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8dx.h - INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/% - CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8dx.h - CODEC_DOC_SECTIONS += vp9 vp9_decoder -endif - -VP9_PREFIX=vp9/ -$(BUILD_PFX)$(VP9_PREFIX)%.c.o: CFLAGS += -Wextra - # VP10 make file ifeq ($(CONFIG_VP10),yes) VP10_PREFIX=vp10/
diff --git a/vpx/vpx_codec.mk b/vpx/vpx_codec.mk index ccdef04..9cf4ac4 100644 --- a/vpx/vpx_codec.mk +++ b/vpx/vpx_codec.mk
@@ -11,19 +11,15 @@ API_EXPORTS += exports -API_SRCS-$(CONFIG_VP8_ENCODER) += vp8.h -API_SRCS-$(CONFIG_VP8_ENCODER) += vp8cx.h -API_DOC_SRCS-$(CONFIG_VP8_ENCODER) += vp8.h -API_DOC_SRCS-$(CONFIG_VP8_ENCODER) += vp8cx.h -ifeq ($(CONFIG_VP9_ENCODER),yes) - API_SRCS-$(CONFIG_SPATIAL_SVC) += src/svc_encodeframe.c - API_SRCS-$(CONFIG_SPATIAL_SVC) += svc_context.h -endif +API_SRCS-$(CONFIG_V10_ENCODER) += vp8.h +API_SRCS-$(CONFIG_VP10_ENCODER) += vp8cx.h +API_DOC_SRCS-$(CONFIG_VP10_ENCODER) += vp8.h +API_DOC_SRCS-$(CONFIG_VP10_ENCODER) += vp8cx.h -API_SRCS-$(CONFIG_VP8_DECODER) += vp8.h -API_SRCS-$(CONFIG_VP8_DECODER) += vp8dx.h -API_DOC_SRCS-$(CONFIG_VP8_DECODER) += vp8.h -API_DOC_SRCS-$(CONFIG_VP8_DECODER) += vp8dx.h +API_SRCS-$(CONFIG_VP10_DECODER) += vp8.h +API_SRCS-$(CONFIG_VP10_DECODER) += vp8dx.h +API_DOC_SRCS-$(CONFIG_VP10_DECODER) += vp8.h +API_DOC_SRCS-$(CONFIG_VP10_DECODER) += vp8dx.h API_DOC_SRCS-yes += vpx_codec.h API_DOC_SRCS-yes += vpx_decoder.h
diff --git a/vpx_dsp/vpx_dsp.mk b/vpx_dsp/vpx_dsp.mk index b352710..960f9c5 100644 --- a/vpx_dsp/vpx_dsp.mk +++ b/vpx_dsp/vpx_dsp.mk
@@ -164,7 +164,7 @@ DSP_SRCS-$(HAVE_SSE2) += x86/txfm_common_sse2.h DSP_SRCS-$(HAVE_MSA) += mips/txfm_macros_msa.h # forward transform -ifneq ($(filter yes,$(CONFIG_VP9_ENCODER) $(CONFIG_VP10_ENCODER)),) +ifneq ($(filter yes,$(CONFIG_VP10_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_VP9_ENCODER || CONFIG_VP10_ENCODER +endif # CONFIG_VP10_ENCODER # inverse transform -ifneq ($(filter yes,$(CONFIG_VP9) $(CONFIG_VP10)),) +ifneq ($(filter yes,$(CONFIG_VP10)),) DSP_SRCS-yes += inv_txfm.h DSP_SRCS-yes += inv_txfm.c DSP_SRCS-$(HAVE_SSE2) += x86/inv_txfm_sse2.h @@ -235,10 +235,10 @@ DSP_SRCS-$(HAVE_DSPR2) += mips/itrans32_dspr2.c DSP_SRCS-$(HAVE_DSPR2) += mips/itrans32_cols_dspr2.c endif # CONFIG_VPX_HIGHBITDEPTH -endif # CONFIG_VP9 || CONFIG_VP10 +endif # CONFIG_VP10 # quantization -ifneq ($(filter yes, $(CONFIG_VP9_ENCODER) $(CONFIG_VP10_ENCODER)),) +ifneq ($(filter yes, $(CONFIG_VP10_ENCODER)),) DSP_SRCS-yes += quantize.c DSP_SRCS-yes += quantize.h @@ -264,7 +264,7 @@ endif endif -endif # CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER +endif # CONFIG_VP10_ENCODER ifeq ($(CONFIG_ENCODERS),yes) DSP_SRCS-yes += sad.c
diff --git a/vpx_dsp/vpx_dsp_rtcd_defs.pl b/vpx_dsp/vpx_dsp_rtcd_defs.pl index 47f2734..22d827f 100644 --- a/vpx_dsp/vpx_dsp_rtcd_defs.pl +++ b/vpx_dsp/vpx_dsp_rtcd_defs.pl
@@ -607,7 +607,7 @@ # # Forward transform # -if ((vpx_config("CONFIG_VP9_ENCODER") eq "yes") || (vpx_config("CONFIG_VP10_ENCODER") eq "yes")) { +if (vpx_config("CONFIG_VP10_ENCODER") eq "yes") { if (vpx_config("CONFIG_VPX_HIGHBITDEPTH") eq "yes") { add_proto qw/void vpx_fdct4x4/, "const int16_t *input, tran_low_t *output, int stride"; specialize qw/vpx_fdct4x4 sse2/; @@ -687,11 +687,11 @@ add_proto qw/void vpx_fdct32x32_1/, "const int16_t *input, tran_low_t *output, int stride"; specialize qw/vpx_fdct32x32_1 sse2 msa/; } # CONFIG_VPX_HIGHBITDEPTH -} # CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER +} # CONFIG_VP10_ENCODER # # Inverse transform -if ((vpx_config("CONFIG_VP9") eq "yes") || (vpx_config("CONFIG_VP10") eq "yes")) { +if (vpx_config("CONFIG_VP10") eq "yes") { if (vpx_config("CONFIG_VPX_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. @@ -925,12 +925,12 @@ specialize qw/vpx_iwht4x4_16_add msa/, "$sse2_x86inc"; } # CONFIG_EMULATE_HARDWARE } # CONFIG_VPX_HIGHBITDEPTH -} # CONFIG_VP9 || CONFIG_VP10 +} # CONFIG_VP10 # # Quantization # -if ((vpx_config("CONFIG_VP9_ENCODER") eq "yes") || (vpx_config("CONFIG_VP10_ENCODER") eq "yes")) { +if (vpx_config("CONFIG_VP10_ENCODER") eq "yes") { add_proto qw/void vpx_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/vpx_quantize_b sse2/, "$ssse3_x86_64_x86inc", "$avx_x86_64_x86inc"; @@ -944,7 +944,7 @@ add_proto qw/void vpx_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/vpx_highbd_quantize_b_32x32 sse2/; } # CONFIG_VPX_HIGHBITDEPTH -} # CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER +} # CONFIG_VP10_ENCODER if (vpx_config("CONFIG_ENCODERS") eq "yes") { # @@ -998,7 +998,7 @@ # # Avg # -if ((vpx_config("CONFIG_VP9_ENCODER") eq "yes") || (vpx_config("CONFIG_VP10_ENCODER") eq "yes")) { +if (vpx_config("CONFIG_VP10_ENCODER") eq "yes") { add_proto qw/unsigned int vpx_avg_8x8/, "const uint8_t *, int p"; specialize qw/vpx_avg_8x8 sse2 neon msa/; @@ -1025,7 +1025,7 @@ add_proto qw/int vpx_vector_var/, "int16_t const *ref, int16_t const *src, const int bwl"; specialize qw/vpx_vector_var neon sse2/; -} # CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER +} # CONFIG_VP10_ENCODER add_proto qw/unsigned int vpx_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/vpx_sad64x64_avg avx2 msa/, "$sse2_x86inc";
diff --git a/vpx_scale/vpx_scale_rtcd.pl b/vpx_scale/vpx_scale_rtcd.pl index 310d73b..73f289d 100644 --- a/vpx_scale/vpx_scale_rtcd.pl +++ b/vpx_scale/vpx_scale_rtcd.pl
@@ -22,7 +22,7 @@ add_proto qw/void vpx_yv12_copy_y/, "const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc"; -if ((vpx_config("CONFIG_VP9") eq "yes") || (vpx_config("CONFIG_VP10") eq "yes")) { +if (vpx_config("CONFIG_VP10") eq "yes") { add_proto qw/void vpx_extend_frame_borders/, "struct yv12_buffer_config *ybf"; specialize qw/vpx_extend_frame_borders dspr2/;
diff --git a/vpxdec.c b/vpxdec.c index 9bc553d..d10fce6 100644 --- a/vpxdec.c +++ b/vpxdec.c
@@ -604,7 +604,7 @@ summary = 1; else if (arg_match(&arg, &threadsarg, argi)) cfg.threads = arg_parse_uint(&arg); -#if CONFIG_VP9_DECODER || CONFIG_VP10_DECODER +#if CONFIG_VP10_DECODER else if (arg_match(&arg, &frameparallelarg, argi)) frame_parallel = 1; #endif
diff --git a/vpxenc.c b/vpxenc.c index 7b68297..4cce0f3 100644 --- a/vpxenc.c +++ b/vpxenc.c
@@ -421,32 +421,6 @@ NULL, "tune-content", 1, "Tune content type", tune_content_enum); #endif -#if CONFIG_VP9_ENCODER -static const arg_def_t *vp9_args[] = { - &cpu_used_vp9, &auto_altref, &sharpness, &static_thresh, - &tile_cols, &tile_rows, &arnr_maxframes, &arnr_strength, &arnr_type, - &tune_ssim, &cq_level, &max_intra_rate_pct, &max_inter_rate_pct, - &gf_cbr_boost_pct, &lossless, - &frame_parallel_decoding, &aq_mode, &frame_periodic_boost, - &noise_sens, &tune_content, &input_color_space, - &min_gf_interval, &max_gf_interval, - NULL -}; -static const int vp9_arg_ctrl_map[] = { - VP8E_SET_CPUUSED, VP8E_SET_ENABLEAUTOALTREF, - VP8E_SET_SHARPNESS, VP8E_SET_STATIC_THRESHOLD, - VP9E_SET_TILE_COLUMNS, VP9E_SET_TILE_ROWS, - VP8E_SET_ARNR_MAXFRAMES, VP8E_SET_ARNR_STRENGTH, VP8E_SET_ARNR_TYPE, - VP8E_SET_TUNING, VP8E_SET_CQ_LEVEL, VP8E_SET_MAX_INTRA_BITRATE_PCT, - VP9E_SET_MAX_INTER_BITRATE_PCT, VP9E_SET_GF_CBR_BOOST_PCT, - VP9E_SET_LOSSLESS, VP9E_SET_FRAME_PARALLEL_DECODING, VP9E_SET_AQ_MODE, - VP9E_SET_FRAME_PERIODIC_BOOST, VP9E_SET_NOISE_SENSITIVITY, - VP9E_SET_TUNE_CONTENT, VP9E_SET_COLOR_SPACE, - VP9E_SET_MIN_GF_INTERVAL, VP9E_SET_MAX_GF_INTERVAL, - 0 -}; -#endif - #if CONFIG_VP10_ENCODER static const arg_def_t *vp10_args[] = { &cpu_used_vp9, &auto_altref, &sharpness, &static_thresh, @@ -907,7 +881,7 @@ } /* Validate global config */ if (global->passes == 0) { -#if CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER +#if CONFIG_VP10_ENCODER // Make default VP9 passes = 2 until there is a better quality 1-pass // encoder if (global->codec != NULL && global->codec->name != NULL)