diff options
| author | Marco Nelissen <marcone@google.com> | 2017-04-10 20:27:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-10 20:27:29 +0000 |
| commit | e194bd79c02be753e49d39e95e2c560ee984d6b9 (patch) | |
| tree | 16d3a474c3cbae94bda8354e8f0a42af1af4d83d | |
| parent | 2a5398ad19546ab2bc689a5adf4e0e0dc4465299 (diff) | |
| parent | ed921defeab884a93c8c11d1c128c4b52a9825bd (diff) | |
| download | libvpx-e194bd79c02be753e49d39e95e2c560ee984d6b9.tar.gz | |
Limit vpx decoder to 4K frames
am: ed921defea
Change-Id: I20afbf0d2e703a38870edc23a4437d99f1d462f4
| -rw-r--r-- | armv7a-neon/vpx_config.h | 4 | ||||
| -rw-r--r-- | armv7a/vpx_config.h | 4 | ||||
| -rw-r--r-- | generic/vpx_config.h | 4 | ||||
| -rw-r--r-- | mips-dspr2/vpx_config.h | 4 | ||||
| -rw-r--r-- | mips/vpx_config.h | 4 |
5 files changed, 15 insertions, 5 deletions
diff --git a/armv7a-neon/vpx_config.h b/armv7a-neon/vpx_config.h index 046aa42f4..3daea1022 100644 --- a/armv7a-neon/vpx_config.h +++ b/armv7a-neon/vpx_config.h @@ -91,8 +91,10 @@ #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 DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ diff --git a/armv7a/vpx_config.h b/armv7a/vpx_config.h index 1493a4abe..55da628bd 100644 --- a/armv7a/vpx_config.h +++ b/armv7a/vpx_config.h @@ -91,8 +91,10 @@ #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 DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ diff --git a/generic/vpx_config.h b/generic/vpx_config.h index dee08b7f0..657e58d9c 100644 --- a/generic/vpx_config.h +++ b/generic/vpx_config.h @@ -91,8 +91,10 @@ #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 DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ diff --git a/mips-dspr2/vpx_config.h b/mips-dspr2/vpx_config.h index 216b6bda2..b318e3702 100644 --- a/mips-dspr2/vpx_config.h +++ b/mips-dspr2/vpx_config.h @@ -91,8 +91,10 @@ #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 DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ diff --git a/mips/vpx_config.h b/mips/vpx_config.h index 1458bf927..4312a9dad 100644 --- a/mips/vpx_config.h +++ b/mips/vpx_config.h @@ -91,8 +91,10 @@ #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 DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ |