diff --git a/build.gradle b/build.gradle index eb79101d54..a10d46319f 100644 --- a/build.gradle +++ b/build.gradle @@ -248,7 +248,7 @@ subprojects { "v${LIBWEBP_VERSION}.tar.gz", // The downloaded file 'libwebp', // The folder where the file is downloaded "libwebp-${LIBWEBP_VERSION}", // The first dir where we have put our customisation - ['src/**/*.c', 'src/**/*.h', '*.mk'], // Files to compile + ['**/*.c', '**/*.h', '*.mk'], // Files to compile "libwebp-${LIBWEBP_VERSION}" // Final destination dir ) } diff --git a/gradle.properties b/gradle.properties index 0ecf2ac62f..4ac432be87 100644 --- a/gradle.properties +++ b/gradle.properties @@ -42,7 +42,7 @@ LIBJPEG_TURBO_VERSION=1.5.3 LIBPNG_VERSION=1.6.37 GIFLIB_VERSION=5.2.1 # When updating this also change the version in static-webp/src/main/jni/static-webp/Android.mk -LIBWEBP_VERSION=1.0.0 +LIBWEBP_VERSION=1.3.2 SONATYPE_HOST=DEFAULT RELEASE_SIGNING_ENABLED=true diff --git a/static-webp/src/main/jni/static-webp/Android.mk b/static-webp/src/main/jni/static-webp/Android.mk index 7b109b1af6..2fadc317d1 100644 --- a/static-webp/src/main/jni/static-webp/Android.mk +++ b/static-webp/src/main/jni/static-webp/Android.mk @@ -36,6 +36,8 @@ LOCAL_LDLIBS := -latomic -llog -ljnigraphics LOCAL_LDFLAGS += $(FRESCO_CPP_LDFLAGS) LOCAL_SHARED_LIBRARIES += webp +LOCAL_SHARED_LIBRARIES += webpdemux +LOCAL_SHARED_LIBRARIES += webpmux LOCAL_STATIC_LIBRARIES += fb_jpegturbo LOCAL_LDFLAGS += -Wl,--exclude-libs,libfb_jpegturbo.a @@ -47,5 +49,5 @@ LOCAL_LDFLAGS += -Wl,--exclude-libs,libfb_png.a include $(BUILD_SHARED_LIBRARY) $(call import-module,libpng-1.6.37) -$(call import-module,libwebp-1.0.0) +$(call import-module,libwebp-1.3.2) $(call import-module,libjpeg-turbo-1.5.3) diff --git a/static-webp/src/main/jni/third-party/libwebp-1.0.0/Android.mk b/static-webp/src/main/jni/third-party/libwebp-1.3.2/Android.mk similarity index 56% rename from static-webp/src/main/jni/third-party/libwebp-1.0.0/Android.mk rename to static-webp/src/main/jni/third-party/libwebp-1.3.2/Android.mk index 8ccc189a86..dc97d44044 100644 --- a/static-webp/src/main/jni/third-party/libwebp-1.0.0/Android.mk +++ b/static-webp/src/main/jni/third-party/libwebp-1.3.2/Android.mk @@ -1,6 +1,7 @@ LOCAL_PATH := $(call my-dir) -WEBP_CFLAGS := -Wall -DANDROID -DHAVE_MALLOC_H -DHAVE_PTHREAD -DWEBP_USE_THREAD -DWEBP_FORCE_ALIGNED +WEBP_CFLAGS := -Wall -DANDROID -DHAVE_MALLOC_H -DHAVE_PTHREAD -DWEBP_USE_THREAD +WEBP_CFLAGS += -fvisibility=hidden ifeq ($(APP_OPTIM),release) WEBP_CFLAGS += -finline-functions -ffast-math \ @@ -10,18 +11,38 @@ ifeq ($(APP_OPTIM),release) endif endif -include $(CLEAR_VARS) +# mips32 fails to build with clang from r14b +# https://bugs.chromium.org/p/webp/issues/detail?id=343 +ifeq ($(findstring clang,$(NDK_TOOLCHAIN_VERSION)),clang) + ifeq ($(TARGET_ARCH),mips) + clang_version := $(shell $(TARGET_CC) --version) + ifneq ($(findstring clang version 3,$(clang_version)),) + WEBP_CFLAGS += -no-integrated-as + endif + endif +endif ifneq ($(findstring armeabi-v7a, $(TARGET_ARCH_ABI)),) # Setting LOCAL_ARM_NEON will enable -mfpu=neon which may cause illegal # instructions to be generated for armv7a code. Instead target the neon code # specifically. NEON := c.neon + USE_CPUFEATURES := yes + WEBP_CFLAGS += -DHAVE_CPU_FEATURES_H else NEON := c endif -LOCAL_SRC_FILES := \ +sharpyuv_srcs := \ + sharpyuv/sharpyuv.c \ + sharpyuv/sharpyuv_cpu.c \ + sharpyuv/sharpyuv_csp.c \ + sharpyuv/sharpyuv_dsp.c \ + sharpyuv/sharpyuv_gamma.c \ + sharpyuv/sharpyuv_neon.$(NEON) \ + sharpyuv/sharpyuv_sse2.c \ + +dec_srcs := \ src/dec/alpha_dec.c \ src/dec/buffer_dec.c \ src/dec/frame_dec.c \ @@ -32,74 +53,69 @@ LOCAL_SRC_FILES := \ src/dec/vp8_dec.c \ src/dec/vp8l_dec.c \ src/dec/webp_dec.c \ + +demux_srcs := \ src/demux/anim_decode.c \ src/demux/demux.c \ + +dsp_dec_srcs := \ src/dsp/alpha_processing.c \ + src/dsp/alpha_processing_mips_dsp_r2.c \ src/dsp/alpha_processing_neon.$(NEON) \ src/dsp/alpha_processing_sse2.c \ src/dsp/alpha_processing_sse41.c \ src/dsp/cpu.c \ src/dsp/dec.c \ src/dsp/dec_clip_tables.c \ + src/dsp/dec_mips32.c \ + src/dsp/dec_mips_dsp_r2.c \ + src/dsp/dec_msa.c \ src/dsp/dec_neon.$(NEON) \ src/dsp/dec_sse2.c \ src/dsp/dec_sse41.c \ src/dsp/filters.c \ + src/dsp/filters_mips_dsp_r2.c \ + src/dsp/filters_msa.c \ src/dsp/filters_neon.$(NEON) \ src/dsp/filters_sse2.c \ src/dsp/lossless.c \ + src/dsp/lossless_mips_dsp_r2.c \ + src/dsp/lossless_msa.c \ src/dsp/lossless_neon.$(NEON) \ src/dsp/lossless_sse2.c \ + src/dsp/lossless_sse41.c \ src/dsp/rescaler.c \ + src/dsp/rescaler_mips32.c \ + src/dsp/rescaler_mips_dsp_r2.c \ + src/dsp/rescaler_msa.c \ src/dsp/rescaler_neon.$(NEON) \ src/dsp/rescaler_sse2.c \ src/dsp/upsampling.c \ + src/dsp/upsampling_mips_dsp_r2.c \ + src/dsp/upsampling_msa.c \ src/dsp/upsampling_neon.$(NEON) \ src/dsp/upsampling_sse2.c \ src/dsp/upsampling_sse41.c \ src/dsp/yuv.c \ + src/dsp/yuv_mips32.c \ + src/dsp/yuv_mips_dsp_r2.c \ src/dsp/yuv_neon.$(NEON) \ src/dsp/yuv_sse2.c \ src/dsp/yuv_sse41.c \ - src/utils/bit_reader_utils.c \ - src/utils/color_cache_utils.c \ - src/utils/filters_utils.c \ - src/utils/huffman_utils.c \ - src/utils/quant_levels_dec_utils.c \ - src/utils/random_utils.c \ - src/utils/rescaler_utils.c \ - src/utils/thread_utils.c \ - src/utils/utils.c \ - src/mux/muxedit.c \ - src/mux/muxinternal.c \ - src/mux/muxread.c \ -UNUSED_SRCS := \ - src/dsp/alpha_processing_mips_dsp_r2.c \ - src/dsp/argb_mips_dsp_r2.c \ - src/dsp/filters_mips_dsp_r2.c \ - src/dsp/lossless_mips_dsp_r2.c \ - src/dsp/rescaler_mips32.c \ - src/dsp/rescaler_mips_dsp_r2.c \ - src/dsp/upsampling_mips_dsp_r2.c \ - src/dsp/yuv_mips32.c \ - src/dsp/yuv_mips_dsp_r2.c \ - src/dsp/dec_mips32.c \ - src/dsp/dec_mips_dsp_r2.c \ +dsp_enc_srcs := \ src/dsp/cost.c \ src/dsp/cost_mips32.c \ src/dsp/cost_mips_dsp_r2.c \ + src/dsp/cost_neon.$(NEON) \ src/dsp/cost_sse2.c \ - src/dsp/dec_msa.c \ src/dsp/enc.c \ - src/dsp/enc_avx2.c \ src/dsp/enc_mips32.c \ src/dsp/enc_mips_dsp_r2.c \ src/dsp/enc_msa.c \ src/dsp/enc_neon.$(NEON) \ src/dsp/enc_sse2.c \ src/dsp/enc_sse41.c \ - src/dsp/filters_msa.c \ src/dsp/lossless_enc.c \ src/dsp/lossless_enc_mips32.c \ src/dsp/lossless_enc_mips_dsp_r2.c \ @@ -107,15 +123,16 @@ UNUSED_SRCS := \ src/dsp/lossless_enc_neon.$(NEON) \ src/dsp/lossless_enc_sse2.c \ src/dsp/lossless_enc_sse41.c \ - src/dsp/lossless_msa.c \ - src/dsp/rescaler_msa.c \ - src/dsp/upsampling_msa.c \ + src/dsp/ssim.c \ + src/dsp/ssim_sse2.c \ + +enc_srcs := \ src/enc/alpha_enc.c \ src/enc/analysis_enc.c \ + src/enc/backward_references_cost_enc.c \ src/enc/backward_references_enc.c \ src/enc/config_enc.c \ src/enc/cost_enc.c \ - src/enc/delta_palettization_enc.c \ src/enc/filter_enc.c \ src/enc/frame_enc.c \ src/enc/histogram_enc.c \ @@ -133,23 +150,136 @@ UNUSED_SRCS := \ src/enc/tree_enc.c \ src/enc/vp8l_enc.c \ src/enc/webp_enc.c \ + +mux_srcs := \ + src/mux/anim_encode.c \ + src/mux/muxedit.c \ + src/mux/muxinternal.c \ + src/mux/muxread.c \ + +utils_dec_srcs := \ + src/utils/bit_reader_utils.c \ + src/utils/color_cache_utils.c \ + src/utils/filters_utils.c \ + src/utils/huffman_utils.c \ + src/utils/quant_levels_dec_utils.c \ + src/utils/random_utils.c \ + src/utils/rescaler_utils.c \ + src/utils/thread_utils.c \ + src/utils/utils.c \ + +utils_enc_srcs := \ src/utils/bit_writer_utils.c \ src/utils/huffman_encode_utils.c \ src/utils/quant_levels_utils.c \ - src/mux/anim_encode.c \ +################################################################################ +# libwebpdecoder + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(dec_srcs) \ + $(dsp_dec_srcs) \ + $(utils_dec_srcs) \ LOCAL_CFLAGS := $(WEBP_CFLAGS) -LOCAL_C_INCLUDES += $(LOCAL_PATH)/src +LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/src # prefer arm over thumb mode for performance gains LOCAL_ARM_MODE := arm -LOCAL_STATIC_LIBRARIES := cpufeatures +ifeq ($(USE_CPUFEATURES),yes) + LOCAL_STATIC_LIBRARIES := cpufeatures +endif -LOCAL_MODULE := webp -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/src +LOCAL_MODULE := webpdecoder_static include $(BUILD_STATIC_LIBRARY) -$(call import-module,android/cpufeatures) +ifeq ($(ENABLE_SHARED),1) +include $(CLEAR_VARS) + +LOCAL_WHOLE_STATIC_LIBRARIES := webpdecoder_static + +LOCAL_MODULE := webpdecoder + +include $(BUILD_SHARED_LIBRARY) +endif # ENABLE_SHARED=1 + +################################################################################ +# libwebp + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(sharpyuv_srcs) \ + $(dsp_enc_srcs) \ + $(enc_srcs) \ + $(utils_enc_srcs) \ + +LOCAL_CFLAGS := $(WEBP_CFLAGS) +LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/src $(LOCAL_PATH) + +# prefer arm over thumb mode for performance gains +LOCAL_ARM_MODE := arm + +LOCAL_WHOLE_STATIC_LIBRARIES := webpdecoder_static + +LOCAL_MODULE := webp + +ifeq ($(ENABLE_SHARED),1) + include $(BUILD_SHARED_LIBRARY) +else + include $(BUILD_STATIC_LIBRARY) +endif + +################################################################################ +# libwebpdemux + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(demux_srcs) + +LOCAL_CFLAGS := $(WEBP_CFLAGS) +LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/src + +# prefer arm over thumb mode for performance gains +LOCAL_ARM_MODE := arm + +LOCAL_MODULE := webpdemux + +ifeq ($(ENABLE_SHARED),1) + LOCAL_SHARED_LIBRARIES := webp + include $(BUILD_SHARED_LIBRARY) +else + LOCAL_STATIC_LIBRARIES := webp + include $(BUILD_STATIC_LIBRARY) +endif + +################################################################################ +# libwebpmux + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(mux_srcs) + +LOCAL_CFLAGS := $(WEBP_CFLAGS) +LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/src + +# prefer arm over thumb mode for performance gains +LOCAL_ARM_MODE := arm + +LOCAL_MODULE := webpmux + +ifeq ($(ENABLE_SHARED),1) + LOCAL_SHARED_LIBRARIES := webp + include $(BUILD_SHARED_LIBRARY) +else + LOCAL_STATIC_LIBRARIES := webp + include $(BUILD_STATIC_LIBRARY) +endif + +ifeq ($(USE_CPUFEATURES),yes) + $(call import-module,android/cpufeatures) +endif