mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-04 11:26:09 +00:00
b2994c8b50
The latest version (v1.12.0-rc1) of the libvpx [1] adds some optimizations with LSX instructions for loongson architecture [2], which has same name files *quantize_lsx.c* in both vp8/encoder/loongarch and vpx_dsp/loongarch directories, and so the `find_duplicates` check fails in *generate_sources_mozbuild.sh* To avoid the above failure, *quantize_lsx.c* under *loongarch* is renamed to *quantize_intrin_lsx.c*. [1] https://chromium.googlesource.com/webm/libvpx/ [2] https://bugs.chromium.org/p/webm/issues/detail?id=1755 Differential Revision: https://phabricator.services.mozilla.com/D150207
23 lines
874 B
Diff
23 lines
874 B
Diff
diff --git a/vpx_dsp/vpx_dsp.mk b/vpx_dsp/vpx_dsp.mk
|
|
index 13999af04..6519d828c 100644
|
|
--- a/vpx_dsp/vpx_dsp.mk
|
|
+++ b/vpx_dsp/vpx_dsp.mk
|
|
@@ -177,7 +177,7 @@ DSP_SRCS-$(HAVE_LSX) += loongarch/vpx_convolve_lsx.h
|
|
# loop filters
|
|
DSP_SRCS-yes += loopfilter.c
|
|
|
|
-DSP_SRCS-$(HAVE_SSE2) += x86/loopfilter_sse2.c
|
|
+DSP_SRCS-$(HAVE_SSE2) += x86/loopfilter_intrin_sse2.c
|
|
DSP_SRCS-$(HAVE_AVX2) += x86/loopfilter_avx2.c
|
|
|
|
ifeq ($(HAVE_NEON_ASM),yes)
|
|
@@ -328,7 +328,7 @@ DSP_SRCS-$(HAVE_SSSE3) += x86/quantize_ssse3.h
|
|
DSP_SRCS-$(HAVE_AVX) += x86/quantize_avx.c
|
|
DSP_SRCS-$(HAVE_NEON) += arm/quantize_neon.c
|
|
DSP_SRCS-$(HAVE_VSX) += ppc/quantize_vsx.c
|
|
-DSP_SRCS-$(HAVE_LSX) += loongarch/quantize_lsx.c
|
|
+DSP_SRCS-$(HAVE_LSX) += loongarch/quantize_intrin_lsx.c
|
|
ifeq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
|
|
DSP_SRCS-$(HAVE_SSE2) += x86/highbd_quantize_intrin_sse2.c
|
|
endif
|