mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
d4cfe0793f
This updates our in-tree copy of libvpx to match the 1.2.0 git tag. All but one of the patches we were carrying are in this upstream version. Our update.sh script should copy the new files needed but will not remove the old ones for you. Runtime cpu detection was rewritten upstream. We now generate per-platform headers for this and include the correct one from a vpx_rtcd.h wrapper like we were already doing for vpx_config.h This revision includes improved assembly optimizations and should be faster on all platforms. Includes work by Jan Gerber and Ralph Giles. --HG-- rename : media/libvpx/vp8/common/arm/neon/save_neon_reg.asm => media/libvpx/vp8/common/arm/neon/save_reg_neon.asm rename : media/libvpx/vp8/common/arm/armv6/vp8_mse16x16_armv6.asm => media/libvpx/vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm rename : media/libvpx/vp8/common/arm/neon/vp8_mse16x16_neon.asm => media/libvpx/vp8/encoder/arm/neon/vp8_mse16x16_neon.asm rename : media/libvpx/vp8/encoder/x86/x86_csystemdependent.c => media/libvpx/vp8/encoder/x86/vp8_enc_stubs_mmx.c rename : media/libvpx/vpx_config_arm-linux-gcc.c => media/libvpx/vpx_config_armv7-android-gcc.c rename : media/libvpx/vpx_config_arm-linux-gcc.h => media/libvpx/vpx_config_armv7-android-gcc.h
57 lines
1.4 KiB
C
57 lines
1.4 KiB
C
#if defined(VPX_X86_ASM)
|
|
|
|
#if defined(_WIN64)
|
|
/* 64 bit Windows */
|
|
#include "vpx_config_x86_64-win64-vs8.h"
|
|
|
|
#elif defined(_WIN32)
|
|
/* 32 bit Windows, MSVC. */
|
|
#include "vpx_config_x86-win32-vs8.h"
|
|
|
|
#elif defined(__APPLE__) && defined(__x86_64__)
|
|
/* 64 bit MacOS. */
|
|
#include "vpx_config_x86_64-darwin9-gcc.h"
|
|
|
|
#elif defined(__APPLE__) && defined(__i386__)
|
|
/* 32 bit MacOS. */
|
|
#include "vpx_config_x86-darwin9-gcc.h"
|
|
|
|
#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
|
|
/* 32 bit ELF platforms. */
|
|
#include "vpx_config_x86-linux-gcc.h"
|
|
|
|
#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
|
|
/* 64 bit ELF platforms. */
|
|
#include "vpx_config_x86_64-linux-gcc.h"
|
|
|
|
#else
|
|
#error VPX_X86_ASM is defined, but assembly not supported on this platform!
|
|
#endif
|
|
|
|
#elif defined(VPX_ARM_ASM)
|
|
|
|
/* Android */
|
|
#include "vpx_config_armv7-android-gcc.h"
|
|
|
|
#else
|
|
/* Assume generic GNU/GCC configuration. */
|
|
#include "vpx_config_generic-gnu.h"
|
|
#endif
|
|
|
|
/* Control error-concealment support using our own #define rather than
|
|
hard-coding it. */
|
|
#if defined(MOZ_VP8_ERROR_CONCEALMENT)
|
|
#undef CONFIG_ERROR_CONCEALMENT
|
|
#define CONFIG_ERROR_CONCEALMENT 1
|
|
#endif
|
|
|
|
/* Control encoder support using our own #define rather than hard-coding it. */
|
|
#if defined(MOZ_VP8_ENCODER)
|
|
#undef CONFIG_VP8_ENCODER
|
|
#undef CONFIG_ENCODERS
|
|
#undef CONFIG_MULTI_RES_ENCODING
|
|
#define CONFIG_VP8_ENCODER 1
|
|
#define CONFIG_ENCODERS 1
|
|
#define CONFIG_MULTI_RES_ENCODING 1
|
|
#endif
|