diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-04-21 20:42:45 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-04-21 20:42:45 +0000 |
commit | 6c1c0df7564174cdb0f89a8cb9e0ccaec9b542be (patch) | |
tree | b428fcd3614cc8c868155283ca5ef65770cbd09b | |
parent | a74fe481aa06854d1e3083e57a8b7427791fe79f (diff) | |
parent | c2f8373c491757d079177326e8cfbaa2e55a11c3 (diff) | |
download | libvpx-6c1c0df7564174cdb0f89a8cb9e0ccaec9b542be.tar.gz |
Merge cherrypicks of [2007123, 2089669, 2072002, 2094113, 1989895, 2094094, 2017568, 2054111, 2054025, 2074928, 2066476, 2092431, 2053944, 2095243, 2092549, 2065088, 2007730, 2008313, 2053983, 2025333, 2094716, 2026590, 2059276, 2089422, 2080090] into nyc-mr2-pixel-monthly-releaseandroid-7.1.2_r33android-7.1.2_r32android-7.1.2_r29android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2-pixel-release
Change-Id: I8ba4df21a8441edc1ae69c5abd8f3441c4cd8c37
-rw-r--r-- | config/arm-neon/vpx_config.asm | 2 | ||||
-rw-r--r-- | config/arm-neon/vpx_config.c | 2 | ||||
-rw-r--r-- | config/arm-neon/vpx_config.h | 4 | ||||
-rw-r--r-- | config/arm/vpx_config.asm | 2 | ||||
-rw-r--r-- | config/arm/vpx_config.c | 2 | ||||
-rw-r--r-- | config/arm/vpx_config.h | 4 | ||||
-rw-r--r-- | config/arm64/vpx_config.asm | 2 | ||||
-rw-r--r-- | config/arm64/vpx_config.c | 2 | ||||
-rw-r--r-- | config/arm64/vpx_config.h | 4 | ||||
-rw-r--r-- | config/generic/vpx_config.asm | 2 | ||||
-rw-r--r-- | config/generic/vpx_config.c | 2 | ||||
-rw-r--r-- | config/generic/vpx_config.h | 4 | ||||
-rw-r--r-- | config/mips32-dspr2/vpx_config.c | 2 | ||||
-rw-r--r-- | config/mips32-dspr2/vpx_config.h | 4 | ||||
-rw-r--r-- | config/mips32/vpx_config.c | 2 | ||||
-rw-r--r-- | config/mips32/vpx_config.h | 4 | ||||
-rw-r--r-- | config/mips64/vpx_config.c | 2 | ||||
-rw-r--r-- | config/mips64/vpx_config.h | 4 | ||||
-rw-r--r-- | config/x86/vpx_config.asm | 2 | ||||
-rw-r--r-- | config/x86/vpx_config.c | 2 | ||||
-rw-r--r-- | config/x86/vpx_config.h | 4 | ||||
-rw-r--r-- | config/x86_64/vpx_config.asm | 2 | ||||
-rw-r--r-- | config/x86_64/vpx_config.c | 2 | ||||
-rw-r--r-- | config/x86_64/vpx_config.h | 4 | ||||
-rwxr-xr-x | generate_config.sh | 2 |
25 files changed, 43 insertions, 25 deletions
diff --git a/config/arm-neon/vpx_config.asm b/config/arm-neon/vpx_config.asm index 5b623b8cb..0004a04f9 100644 --- a/config/arm-neon/vpx_config.asm +++ b/config/arm-neon/vpx_config.asm @@ -82,7 +82,7 @@ .equ CONFIG_COEFFICIENT_RANGE_CHECKING , 0 .equ CONFIG_VP9_HIGHBITDEPTH , 0 .equ CONFIG_EXPERIMENTAL , 0 -.equ CONFIG_SIZE_LIMIT , 0 +.equ CONFIG_SIZE_LIMIT , 1 .equ CONFIG_SPATIAL_SVC , 0 .equ CONFIG_FP_MB_STATS , 0 .equ CONFIG_EMULATE_HARDWARE , 0 diff --git a/config/arm-neon/vpx_config.c b/config/arm-neon/vpx_config.c index 48dd6068c..0eb0a305c 100644 --- a/config/arm-neon/vpx_config.c +++ b/config/arm-neon/vpx_config.c @@ -6,5 +6,5 @@ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ #include "vpx/vpx_codec.h" -static const char* const cfg = "--target=armv7-linux-gcc --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect"; +static const char* const cfg = "--target=armv7-linux-gcc --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect --disable-install-docs --size-limit=4096x3072"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/config/arm-neon/vpx_config.h b/config/arm-neon/vpx_config.h index d9d5f1ca3..113591195 100644 --- a/config/arm-neon/vpx_config.h +++ b/config/arm-neon/vpx_config.h @@ -91,9 +91,11 @@ #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_VP9_HIGHBITDEPTH 0 #define CONFIG_EXPERIMENTAL 0 -#define CONFIG_SIZE_LIMIT 0 +#define CONFIG_SIZE_LIMIT 1 #define CONFIG_SPATIAL_SVC 0 #define CONFIG_FP_MB_STATS 0 #define CONFIG_EMULATE_HARDWARE 0 #define CONFIG_MISC_FIXES 0 +#define DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ diff --git a/config/arm/vpx_config.asm b/config/arm/vpx_config.asm index 992fdee9c..3d570b8d5 100644 --- a/config/arm/vpx_config.asm +++ b/config/arm/vpx_config.asm @@ -82,7 +82,7 @@ .equ CONFIG_COEFFICIENT_RANGE_CHECKING , 0 .equ CONFIG_VP9_HIGHBITDEPTH , 0 .equ CONFIG_EXPERIMENTAL , 0 -.equ CONFIG_SIZE_LIMIT , 0 +.equ CONFIG_SIZE_LIMIT , 1 .equ CONFIG_SPATIAL_SVC , 0 .equ CONFIG_FP_MB_STATS , 0 .equ CONFIG_EMULATE_HARDWARE , 0 diff --git a/config/arm/vpx_config.c b/config/arm/vpx_config.c index a45c0d2fa..415043c76 100644 --- a/config/arm/vpx_config.c +++ b/config/arm/vpx_config.c @@ -6,5 +6,5 @@ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ #include "vpx/vpx_codec.h" -static const char* const cfg = "--target=armv6-linux-gcc --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect"; +static const char* const cfg = "--target=armv6-linux-gcc --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect --disable-install-docs --size-limit=4096x3072"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/config/arm/vpx_config.h b/config/arm/vpx_config.h index d6d280949..df975a7b9 100644 --- a/config/arm/vpx_config.h +++ b/config/arm/vpx_config.h @@ -91,9 +91,11 @@ #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_VP9_HIGHBITDEPTH 0 #define CONFIG_EXPERIMENTAL 0 -#define CONFIG_SIZE_LIMIT 0 +#define CONFIG_SIZE_LIMIT 1 #define CONFIG_SPATIAL_SVC 0 #define CONFIG_FP_MB_STATS 0 #define CONFIG_EMULATE_HARDWARE 0 #define CONFIG_MISC_FIXES 0 +#define DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ diff --git a/config/arm64/vpx_config.asm b/config/arm64/vpx_config.asm index d7d6652e9..9ebee2a43 100644 --- a/config/arm64/vpx_config.asm +++ b/config/arm64/vpx_config.asm @@ -82,7 +82,7 @@ .equ CONFIG_COEFFICIENT_RANGE_CHECKING , 0 .equ CONFIG_VP9_HIGHBITDEPTH , 0 .equ CONFIG_EXPERIMENTAL , 0 -.equ CONFIG_SIZE_LIMIT , 0 +.equ CONFIG_SIZE_LIMIT , 1 .equ CONFIG_SPATIAL_SVC , 0 .equ CONFIG_FP_MB_STATS , 0 .equ CONFIG_EMULATE_HARDWARE , 0 diff --git a/config/arm64/vpx_config.c b/config/arm64/vpx_config.c index 50e1a4ba1..ff9121723 100644 --- a/config/arm64/vpx_config.c +++ b/config/arm64/vpx_config.c @@ -6,5 +6,5 @@ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ #include "vpx/vpx_codec.h" -static const char* const cfg = "--force-target=armv8-linux-gcc --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect"; +static const char* const cfg = "--force-target=armv8-linux-gcc --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect --disable-install-docs --size-limit=4096x3072"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/config/arm64/vpx_config.h b/config/arm64/vpx_config.h index 981aa3e91..dd19905d0 100644 --- a/config/arm64/vpx_config.h +++ b/config/arm64/vpx_config.h @@ -91,9 +91,11 @@ #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_VP9_HIGHBITDEPTH 0 #define CONFIG_EXPERIMENTAL 0 -#define CONFIG_SIZE_LIMIT 0 +#define CONFIG_SIZE_LIMIT 1 #define CONFIG_SPATIAL_SVC 0 #define CONFIG_FP_MB_STATS 0 #define CONFIG_EMULATE_HARDWARE 0 #define CONFIG_MISC_FIXES 0 +#define DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ diff --git a/config/generic/vpx_config.asm b/config/generic/vpx_config.asm index c3530a2b0..6db17d565 100644 --- a/config/generic/vpx_config.asm +++ b/config/generic/vpx_config.asm @@ -82,7 +82,7 @@ .equ CONFIG_COEFFICIENT_RANGE_CHECKING , 0 .equ CONFIG_VP9_HIGHBITDEPTH , 0 .equ CONFIG_EXPERIMENTAL , 0 -.equ CONFIG_SIZE_LIMIT , 0 +.equ CONFIG_SIZE_LIMIT , 1 .equ CONFIG_SPATIAL_SVC , 0 .equ CONFIG_FP_MB_STATS , 0 .equ CONFIG_EMULATE_HARDWARE , 0 diff --git a/config/generic/vpx_config.c b/config/generic/vpx_config.c index 269eb8237..c6d3e14c5 100644 --- a/config/generic/vpx_config.c +++ b/config/generic/vpx_config.c @@ -6,5 +6,5 @@ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ #include "vpx/vpx_codec.h" -static const char* const cfg = "--target=generic-gnu --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect"; +static const char* const cfg = "--target=generic-gnu --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect --disable-install-docs --size-limit=4096x3072"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/config/generic/vpx_config.h b/config/generic/vpx_config.h index 50da70424..7daa81ca2 100644 --- a/config/generic/vpx_config.h +++ b/config/generic/vpx_config.h @@ -91,9 +91,11 @@ #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_VP9_HIGHBITDEPTH 0 #define CONFIG_EXPERIMENTAL 0 -#define CONFIG_SIZE_LIMIT 0 +#define CONFIG_SIZE_LIMIT 1 #define CONFIG_SPATIAL_SVC 0 #define CONFIG_FP_MB_STATS 0 #define CONFIG_EMULATE_HARDWARE 0 #define CONFIG_MISC_FIXES 0 +#define DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ diff --git a/config/mips32-dspr2/vpx_config.c b/config/mips32-dspr2/vpx_config.c index b2f14a386..1aa002457 100644 --- a/config/mips32-dspr2/vpx_config.c +++ b/config/mips32-dspr2/vpx_config.c @@ -6,5 +6,5 @@ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ #include "vpx/vpx_codec.h" -static const char* const cfg = "--target=mips32-linux-gcc --enable-dspr2 --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect"; +static const char* const cfg = "--target=mips32-linux-gcc --enable-dspr2 --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect --disable-install-docs --size-limit=4096x3072"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/config/mips32-dspr2/vpx_config.h b/config/mips32-dspr2/vpx_config.h index 4e8961cfb..2d009c778 100644 --- a/config/mips32-dspr2/vpx_config.h +++ b/config/mips32-dspr2/vpx_config.h @@ -91,9 +91,11 @@ #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_VP9_HIGHBITDEPTH 0 #define CONFIG_EXPERIMENTAL 0 -#define CONFIG_SIZE_LIMIT 0 +#define CONFIG_SIZE_LIMIT 1 #define CONFIG_SPATIAL_SVC 0 #define CONFIG_FP_MB_STATS 0 #define CONFIG_EMULATE_HARDWARE 0 #define CONFIG_MISC_FIXES 0 +#define DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ diff --git a/config/mips32/vpx_config.c b/config/mips32/vpx_config.c index 81edcc9f5..d3b127f03 100644 --- a/config/mips32/vpx_config.c +++ b/config/mips32/vpx_config.c @@ -6,5 +6,5 @@ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ #include "vpx/vpx_codec.h" -static const char* const cfg = "--target=mips32-linux-gcc --disable-dspr2 --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect"; +static const char* const cfg = "--target=mips32-linux-gcc --disable-dspr2 --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect --disable-install-docs --size-limit=4096x3072"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/config/mips32/vpx_config.h b/config/mips32/vpx_config.h index 82c9cf52f..b276df164 100644 --- a/config/mips32/vpx_config.h +++ b/config/mips32/vpx_config.h @@ -91,9 +91,11 @@ #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_VP9_HIGHBITDEPTH 0 #define CONFIG_EXPERIMENTAL 0 -#define CONFIG_SIZE_LIMIT 0 +#define CONFIG_SIZE_LIMIT 1 #define CONFIG_SPATIAL_SVC 0 #define CONFIG_FP_MB_STATS 0 #define CONFIG_EMULATE_HARDWARE 0 #define CONFIG_MISC_FIXES 0 +#define DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ diff --git a/config/mips64/vpx_config.c b/config/mips64/vpx_config.c index 3b3bb4915..95b2a2afa 100644 --- a/config/mips64/vpx_config.c +++ b/config/mips64/vpx_config.c @@ -6,5 +6,5 @@ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ #include "vpx/vpx_codec.h" -static const char* const cfg = "--target=mips64-linux-gcc --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect"; +static const char* const cfg = "--target=mips64-linux-gcc --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect --disable-install-docs --size-limit=4096x3072"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/config/mips64/vpx_config.h b/config/mips64/vpx_config.h index b6cc04bcc..910e7acd2 100644 --- a/config/mips64/vpx_config.h +++ b/config/mips64/vpx_config.h @@ -91,9 +91,11 @@ #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_VP9_HIGHBITDEPTH 0 #define CONFIG_EXPERIMENTAL 0 -#define CONFIG_SIZE_LIMIT 0 +#define CONFIG_SIZE_LIMIT 1 #define CONFIG_SPATIAL_SVC 0 #define CONFIG_FP_MB_STATS 0 #define CONFIG_EMULATE_HARDWARE 0 #define CONFIG_MISC_FIXES 0 +#define DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ diff --git a/config/x86/vpx_config.asm b/config/x86/vpx_config.asm index b6557bb89..576889d16 100644 --- a/config/x86/vpx_config.asm +++ b/config/x86/vpx_config.asm @@ -79,7 +79,7 @@ %define CONFIG_COEFFICIENT_RANGE_CHECKING 0 %define CONFIG_VP9_HIGHBITDEPTH 0 %define CONFIG_EXPERIMENTAL 0 -%define CONFIG_SIZE_LIMIT 0 +%define CONFIG_SIZE_LIMIT 1 %define CONFIG_SPATIAL_SVC 0 %define CONFIG_FP_MB_STATS 0 %define CONFIG_EMULATE_HARDWARE 0 diff --git a/config/x86/vpx_config.c b/config/x86/vpx_config.c index 4b7c558e4..77a386493 100644 --- a/config/x86/vpx_config.c +++ b/config/x86/vpx_config.c @@ -6,5 +6,5 @@ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ #include "vpx/vpx_codec.h" -static const char* const cfg = "--target=x86-linux-gcc --disable-sse4_1 --disable-avx --disable-avx2 --as=yasm --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect"; +static const char* const cfg = "--target=x86-linux-gcc --disable-sse4_1 --disable-avx --disable-avx2 --as=yasm --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect --disable-install-docs --size-limit=4096x3072"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/config/x86/vpx_config.h b/config/x86/vpx_config.h index a51685796..8de167306 100644 --- a/config/x86/vpx_config.h +++ b/config/x86/vpx_config.h @@ -91,9 +91,11 @@ #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_VP9_HIGHBITDEPTH 0 #define CONFIG_EXPERIMENTAL 0 -#define CONFIG_SIZE_LIMIT 0 +#define CONFIG_SIZE_LIMIT 1 #define CONFIG_SPATIAL_SVC 0 #define CONFIG_FP_MB_STATS 0 #define CONFIG_EMULATE_HARDWARE 0 #define CONFIG_MISC_FIXES 0 +#define DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ diff --git a/config/x86_64/vpx_config.asm b/config/x86_64/vpx_config.asm index 774d73fb7..7558badae 100644 --- a/config/x86_64/vpx_config.asm +++ b/config/x86_64/vpx_config.asm @@ -79,7 +79,7 @@ %define CONFIG_COEFFICIENT_RANGE_CHECKING 0 %define CONFIG_VP9_HIGHBITDEPTH 0 %define CONFIG_EXPERIMENTAL 0 -%define CONFIG_SIZE_LIMIT 0 +%define CONFIG_SIZE_LIMIT 1 %define CONFIG_SPATIAL_SVC 0 %define CONFIG_FP_MB_STATS 0 %define CONFIG_EMULATE_HARDWARE 0 diff --git a/config/x86_64/vpx_config.c b/config/x86_64/vpx_config.c index 2561717a3..9aa0640aa 100644 --- a/config/x86_64/vpx_config.c +++ b/config/x86_64/vpx_config.c @@ -6,5 +6,5 @@ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ #include "vpx/vpx_codec.h" -static const char* const cfg = "--target=x86_64-linux-gcc --disable-sse4_1 --disable-avx --disable-avx2 --as=yasm --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect"; +static const char* const cfg = "--target=x86_64-linux-gcc --disable-sse4_1 --disable-avx --disable-avx2 --as=yasm --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect --disable-install-docs --size-limit=4096x3072"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/config/x86_64/vpx_config.h b/config/x86_64/vpx_config.h index 9278f1e8b..fc64f53fe 100644 --- a/config/x86_64/vpx_config.h +++ b/config/x86_64/vpx_config.h @@ -91,9 +91,11 @@ #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_VP9_HIGHBITDEPTH 0 #define CONFIG_EXPERIMENTAL 0 -#define CONFIG_SIZE_LIMIT 0 +#define CONFIG_SIZE_LIMIT 1 #define CONFIG_SPATIAL_SVC 0 #define CONFIG_FP_MB_STATS 0 #define CONFIG_EMULATE_HARDWARE 0 #define CONFIG_MISC_FIXES 0 +#define DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ diff --git a/generate_config.sh b/generate_config.sh index 6c6adae47..56c7994e8 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -147,7 +147,7 @@ cp -R $LIBVPX_SRC_DIR $TEMP_DIR cd $TEMP_DIR echo "Generate config files." -all_platforms="--enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect" +all_platforms="--enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect --disable-install-docs --size-limit=4096x3072" intel="--disable-sse4_1 --disable-avx --disable-avx2 --as=yasm" gen_config_files x86 "--target=x86-linux-gcc ${intel} ${all_platforms}" gen_config_files x86_64 "--target=x86_64-linux-gcc ${intel} ${all_platforms}" |