shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Exclude VP9 files from vpx_dsp.mk for VP8 build"

--- a/vpx_dsp/vpx_dsp.mk

+++ b/vpx_dsp/vpx_dsp.mk

@@ -83,10 +83,11 @@

 DSP_SRCS-$(HAVE_DSPR2)  += mips/common_dspr2.h

 DSP_SRCS-$(HAVE_DSPR2)  += mips/common_dspr2.c

+DSP_SRCS-yes += vpx_filter.h

+ifeq ($(CONFIG_VP9),yes)

 # interpolation filters

 DSP_SRCS-yes += vpx_convolve.c

 DSP_SRCS-yes += vpx_convolve.h

-DSP_SRCS-yes += vpx_filter.h

 DSP_SRCS-$(ARCH_X86)$(ARCH_X86_64) += x86/convolve.h

@@ -113,10 +114,8 @@

 DSP_SRCS-$(HAVE_SSE2)  += x86/vpx_convolve_copy_sse2.asm

 DSP_SRCS-$(HAVE_NEON)  += arm/vpx_scaled_convolve8_neon.c

-

 ifeq ($(HAVE_NEON_ASM),yes)

 DSP_SRCS-yes += arm/vpx_convolve_copy_neon_asm$(ASM)

-ifeq ($(CONFIG_VP9),yes)

 DSP_SRCS-yes += arm/vpx_convolve8_horiz_filter_type2_neon$(ASM)

 DSP_SRCS-yes += arm/vpx_convolve8_vert_filter_type2_neon$(ASM)

 DSP_SRCS-yes += arm/vpx_convolve8_horiz_filter_type1_neon$(ASM)

@@ -129,7 +128,6 @@

 DSP_SRCS-yes += arm/vpx_convolve8_neon_asm.c

 DSP_SRCS-yes += arm/vpx_convolve8_neon_asm.h

 DSP_SRCS-yes += arm/vpx_convolve_neon.c

-endif # CONFIG_VP9

 else

 ifeq ($(HAVE_NEON),yes)

 DSP_SRCS-yes += arm/vpx_convolve_copy_neon.c

@@ -196,6 +194,7 @@

 DSP_SRCS-$(HAVE_NEON)   += arm/highbd_loopfilter_neon.c

 DSP_SRCS-$(HAVE_SSE2)   += x86/highbd_loopfilter_sse2.c

 endif  # CONFIG_VP9_HIGHBITDEPTH

+endif # CONFIG_VP9

 DSP_SRCS-yes            += txfm_common.h

 DSP_SRCS-$(HAVE_SSE2)   += x86/txfm_common_sse2.h

--- a/vpx_dsp/vpx_dsp_rtcd_defs.pl

+++ b/vpx_dsp/vpx_dsp_rtcd_defs.pl

@@ -356,6 +356,7 @@

   specialize qw/vpx_highbd_dc_128_predictor_32x32 neon sse2/;

 }  # CONFIG_VP9_HIGHBITDEPTH

+if (vpx_config("CONFIG_VP9") eq "yes") {

 #

 # Sub Pixel Filters

 #

@@ -395,6 +396,7 @@

 add_proto qw/void vpx_scaled_avg_horiz/, "const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h";

 add_proto qw/void vpx_scaled_avg_vert/, "const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h";

+} #CONFIG_VP9

 if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") {

   #

@@ -425,6 +427,7 @@

   specialize qw/vpx_highbd_convolve8_avg_vert avx2 neon/, "$sse2_x86_64";

 }  # CONFIG_VP9_HIGHBITDEPTH

+if (vpx_config("CONFIG_VP9") eq "yes") {

 #

 # Loopfilter

 #

@@ -463,6 +466,7 @@

 add_proto qw/void vpx_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/vpx_lpf_horizontal_4_dual sse2 neon dspr2 msa/;

+} #CONFIG_VP9

 if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") {

   add_proto qw/void vpx_highbd_lpf_vertical_16/, "uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd";