From 06a7ff715ef9a2d6e11b88f8b0cb05e5a927b108 Mon Sep 17 00:00:00 2001 From: Jan Gerber Date: Sat, 8 Aug 2015 09:34:39 +0200 Subject: [PATCH] Bug 1192226 - Apply libvpx size limit. r=rillian --- media/libvpx/vpx_config_armv7-android-gcc.asm | 4 +++- media/libvpx/vpx_config_armv7-android-gcc.h | 4 +++- media/libvpx/vpx_config_generic-gnu.asm | 4 +++- media/libvpx/vpx_config_generic-gnu.h | 4 +++- media/libvpx/vpx_config_x86-darwin9-gcc.asm | 4 +++- media/libvpx/vpx_config_x86-darwin9-gcc.h | 4 +++- media/libvpx/vpx_config_x86-linux-gcc.asm | 4 +++- media/libvpx/vpx_config_x86-linux-gcc.h | 4 +++- media/libvpx/vpx_config_x86-win32-gcc.asm | 4 +++- media/libvpx/vpx_config_x86-win32-gcc.h | 4 +++- media/libvpx/vpx_config_x86-win32-vs12.asm | 4 +++- media/libvpx/vpx_config_x86-win32-vs12.h | 4 +++- media/libvpx/vpx_config_x86_64-darwin9-gcc.asm | 4 +++- media/libvpx/vpx_config_x86_64-darwin9-gcc.h | 4 +++- media/libvpx/vpx_config_x86_64-linux-gcc.asm | 4 +++- media/libvpx/vpx_config_x86_64-linux-gcc.h | 4 +++- media/libvpx/vpx_config_x86_64-win64-gcc.asm | 4 +++- media/libvpx/vpx_config_x86_64-win64-gcc.h | 4 +++- media/libvpx/vpx_config_x86_64-win64-vs12.asm | 4 +++- media/libvpx/vpx_config_x86_64-win64-vs12.h | 4 +++- 20 files changed, 60 insertions(+), 20 deletions(-) diff --git a/media/libvpx/vpx_config_armv7-android-gcc.asm b/media/libvpx/vpx_config_armv7-android-gcc.asm index 6a21c78ecdd6..23e1ded4f0d1 100644 --- a/media/libvpx/vpx_config_armv7-android-gcc.asm +++ b/media/libvpx/vpx_config_armv7-android-gcc.asm @@ -79,10 +79,12 @@ .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 +.equ DECODE_WIDTH_LIMIT , 4000 +.equ DECODE_HEIGHT_LIMIT , 3000 .section .note.GNU-stack,"",%progbits @ This file was created from a .asm file @ using the ads2gas.pl script. diff --git a/media/libvpx/vpx_config_armv7-android-gcc.h b/media/libvpx/vpx_config_armv7-android-gcc.h index 468099c3a90f..ff7e42f715c2 100644 --- a/media/libvpx/vpx_config_armv7-android-gcc.h +++ b/media/libvpx/vpx_config_armv7-android-gcc.h @@ -88,8 +88,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 4000 +#define DECODE_HEIGHT_LIMIT 3000 #endif /* VPX_CONFIG_H */ diff --git a/media/libvpx/vpx_config_generic-gnu.asm b/media/libvpx/vpx_config_generic-gnu.asm index ac108f9eb0f3..21a7312caad0 100644 --- a/media/libvpx/vpx_config_generic-gnu.asm +++ b/media/libvpx/vpx_config_generic-gnu.asm @@ -79,10 +79,12 @@ .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 +.equ DECODE_WIDTH_LIMIT , 4000 +.equ DECODE_HEIGHT_LIMIT , 3000 .section .note.GNU-stack,"",%progbits @ This file was created from a .asm file @ using the ads2gas.pl script. diff --git a/media/libvpx/vpx_config_generic-gnu.h b/media/libvpx/vpx_config_generic-gnu.h index db883cf060f1..724edd6ede8f 100644 --- a/media/libvpx/vpx_config_generic-gnu.h +++ b/media/libvpx/vpx_config_generic-gnu.h @@ -88,8 +88,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 4000 +#define DECODE_HEIGHT_LIMIT 3000 #endif /* VPX_CONFIG_H */ diff --git a/media/libvpx/vpx_config_x86-darwin9-gcc.asm b/media/libvpx/vpx_config_x86-darwin9-gcc.asm index 9b6b8509b0f0..a525a410d487 100644 --- a/media/libvpx/vpx_config_x86-darwin9-gcc.asm +++ b/media/libvpx/vpx_config_x86-darwin9-gcc.asm @@ -76,7 +76,9 @@ CONFIG_VP9_TEMPORAL_DENOISING equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_VP9_HIGHBITDEPTH equ 0 CONFIG_EXPERIMENTAL equ 0 -CONFIG_SIZE_LIMIT equ 0 +CONFIG_SIZE_LIMIT equ 1 CONFIG_SPATIAL_SVC equ 0 CONFIG_FP_MB_STATS equ 0 CONFIG_EMULATE_HARDWARE equ 0 +DECODE_WIDTH_LIMIT , 4000 +DECODE_HEIGHT_LIMIT , 3000 diff --git a/media/libvpx/vpx_config_x86-darwin9-gcc.h b/media/libvpx/vpx_config_x86-darwin9-gcc.h index 40502b410daa..7cca4b699d2a 100644 --- a/media/libvpx/vpx_config_x86-darwin9-gcc.h +++ b/media/libvpx/vpx_config_x86-darwin9-gcc.h @@ -88,8 +88,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 4000 +#define DECODE_HEIGHT_LIMIT 3000 #endif /* VPX_CONFIG_H */ diff --git a/media/libvpx/vpx_config_x86-linux-gcc.asm b/media/libvpx/vpx_config_x86-linux-gcc.asm index 5400f57d5a5f..23cdb4b71532 100644 --- a/media/libvpx/vpx_config_x86-linux-gcc.asm +++ b/media/libvpx/vpx_config_x86-linux-gcc.asm @@ -76,7 +76,9 @@ CONFIG_VP9_TEMPORAL_DENOISING equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_VP9_HIGHBITDEPTH equ 0 CONFIG_EXPERIMENTAL equ 0 -CONFIG_SIZE_LIMIT equ 0 +CONFIG_SIZE_LIMIT equ 1 CONFIG_SPATIAL_SVC equ 0 CONFIG_FP_MB_STATS equ 0 CONFIG_EMULATE_HARDWARE equ 0 +DECODE_WIDTH_LIMIT , 4000 +DECODE_HEIGHT_LIMIT , 3000 diff --git a/media/libvpx/vpx_config_x86-linux-gcc.h b/media/libvpx/vpx_config_x86-linux-gcc.h index e7b472e84fea..edcf0ee9fc69 100644 --- a/media/libvpx/vpx_config_x86-linux-gcc.h +++ b/media/libvpx/vpx_config_x86-linux-gcc.h @@ -88,8 +88,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 4000 +#define DECODE_HEIGHT_LIMIT 3000 #endif /* VPX_CONFIG_H */ diff --git a/media/libvpx/vpx_config_x86-win32-gcc.asm b/media/libvpx/vpx_config_x86-win32-gcc.asm index 29c89a5186b1..9b5252e1a401 100644 --- a/media/libvpx/vpx_config_x86-win32-gcc.asm +++ b/media/libvpx/vpx_config_x86-win32-gcc.asm @@ -76,7 +76,9 @@ CONFIG_VP9_TEMPORAL_DENOISING equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_VP9_HIGHBITDEPTH equ 0 CONFIG_EXPERIMENTAL equ 0 -CONFIG_SIZE_LIMIT equ 0 +CONFIG_SIZE_LIMIT equ 1 CONFIG_SPATIAL_SVC equ 0 CONFIG_FP_MB_STATS equ 0 CONFIG_EMULATE_HARDWARE equ 0 +DECODE_WIDTH_LIMIT , 4000 +DECODE_HEIGHT_LIMIT , 3000 diff --git a/media/libvpx/vpx_config_x86-win32-gcc.h b/media/libvpx/vpx_config_x86-win32-gcc.h index e60f84d8c171..abc34be9d6dd 100644 --- a/media/libvpx/vpx_config_x86-win32-gcc.h +++ b/media/libvpx/vpx_config_x86-win32-gcc.h @@ -89,8 +89,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 4000 +#define DECODE_HEIGHT_LIMIT 3000 #endif /* VPX_CONFIG_H */ diff --git a/media/libvpx/vpx_config_x86-win32-vs12.asm b/media/libvpx/vpx_config_x86-win32-vs12.asm index da0e226da7de..0acee0e2a6e5 100644 --- a/media/libvpx/vpx_config_x86-win32-vs12.asm +++ b/media/libvpx/vpx_config_x86-win32-vs12.asm @@ -76,7 +76,9 @@ CONFIG_VP9_TEMPORAL_DENOISING equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_VP9_HIGHBITDEPTH equ 0 CONFIG_EXPERIMENTAL equ 0 -CONFIG_SIZE_LIMIT equ 0 +CONFIG_SIZE_LIMIT equ 1 CONFIG_SPATIAL_SVC equ 0 CONFIG_FP_MB_STATS equ 0 CONFIG_EMULATE_HARDWARE equ 0 +DECODE_WIDTH_LIMIT , 4000 +DECODE_HEIGHT_LIMIT , 3000 diff --git a/media/libvpx/vpx_config_x86-win32-vs12.h b/media/libvpx/vpx_config_x86-win32-vs12.h index a91bb8396eac..9c1d36df8405 100644 --- a/media/libvpx/vpx_config_x86-win32-vs12.h +++ b/media/libvpx/vpx_config_x86-win32-vs12.h @@ -88,8 +88,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 4000 +#define DECODE_HEIGHT_LIMIT 3000 #endif /* VPX_CONFIG_H */ diff --git a/media/libvpx/vpx_config_x86_64-darwin9-gcc.asm b/media/libvpx/vpx_config_x86_64-darwin9-gcc.asm index 3dbb38fc2e61..842607a66728 100644 --- a/media/libvpx/vpx_config_x86_64-darwin9-gcc.asm +++ b/media/libvpx/vpx_config_x86_64-darwin9-gcc.asm @@ -76,7 +76,9 @@ CONFIG_VP9_TEMPORAL_DENOISING equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_VP9_HIGHBITDEPTH equ 0 CONFIG_EXPERIMENTAL equ 0 -CONFIG_SIZE_LIMIT equ 0 +CONFIG_SIZE_LIMIT equ 1 CONFIG_SPATIAL_SVC equ 0 CONFIG_FP_MB_STATS equ 0 CONFIG_EMULATE_HARDWARE equ 0 +DECODE_WIDTH_LIMIT , 4000 +DECODE_HEIGHT_LIMIT , 3000 diff --git a/media/libvpx/vpx_config_x86_64-darwin9-gcc.h b/media/libvpx/vpx_config_x86_64-darwin9-gcc.h index 0d0477ceeca1..d04556d4585f 100644 --- a/media/libvpx/vpx_config_x86_64-darwin9-gcc.h +++ b/media/libvpx/vpx_config_x86_64-darwin9-gcc.h @@ -88,8 +88,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 4000 +#define DECODE_HEIGHT_LIMIT 3000 #endif /* VPX_CONFIG_H */ diff --git a/media/libvpx/vpx_config_x86_64-linux-gcc.asm b/media/libvpx/vpx_config_x86_64-linux-gcc.asm index 6da93489bfb4..a5b8cb4bf351 100644 --- a/media/libvpx/vpx_config_x86_64-linux-gcc.asm +++ b/media/libvpx/vpx_config_x86_64-linux-gcc.asm @@ -76,7 +76,9 @@ CONFIG_VP9_TEMPORAL_DENOISING equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_VP9_HIGHBITDEPTH equ 0 CONFIG_EXPERIMENTAL equ 0 -CONFIG_SIZE_LIMIT equ 0 +CONFIG_SIZE_LIMIT equ 1 CONFIG_SPATIAL_SVC equ 0 CONFIG_FP_MB_STATS equ 0 CONFIG_EMULATE_HARDWARE equ 0 +DECODE_WIDTH_LIMIT , 4000 +DECODE_HEIGHT_LIMIT , 3000 diff --git a/media/libvpx/vpx_config_x86_64-linux-gcc.h b/media/libvpx/vpx_config_x86_64-linux-gcc.h index 21228cd1dd09..dcd1ad82a9f5 100644 --- a/media/libvpx/vpx_config_x86_64-linux-gcc.h +++ b/media/libvpx/vpx_config_x86_64-linux-gcc.h @@ -88,8 +88,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 4000 +#define DECODE_HEIGHT_LIMIT 3000 #endif /* VPX_CONFIG_H */ diff --git a/media/libvpx/vpx_config_x86_64-win64-gcc.asm b/media/libvpx/vpx_config_x86_64-win64-gcc.asm index 20ba15baee06..ffebcf1d5171 100644 --- a/media/libvpx/vpx_config_x86_64-win64-gcc.asm +++ b/media/libvpx/vpx_config_x86_64-win64-gcc.asm @@ -76,7 +76,9 @@ CONFIG_VP9_TEMPORAL_DENOISING equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_VP9_HIGHBITDEPTH equ 0 CONFIG_EXPERIMENTAL equ 0 -CONFIG_SIZE_LIMIT equ 0 +CONFIG_SIZE_LIMIT equ 1 CONFIG_SPATIAL_SVC equ 0 CONFIG_FP_MB_STATS equ 0 CONFIG_EMULATE_HARDWARE equ 0 +DECODE_WIDTH_LIMIT , 4000 +DECODE_HEIGHT_LIMIT , 3000 diff --git a/media/libvpx/vpx_config_x86_64-win64-gcc.h b/media/libvpx/vpx_config_x86_64-win64-gcc.h index b056a0ea3850..cf8a66268eb1 100644 --- a/media/libvpx/vpx_config_x86_64-win64-gcc.h +++ b/media/libvpx/vpx_config_x86_64-win64-gcc.h @@ -89,8 +89,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 4000 +#define DECODE_HEIGHT_LIMIT 3000 #endif /* VPX_CONFIG_H */ diff --git a/media/libvpx/vpx_config_x86_64-win64-vs12.asm b/media/libvpx/vpx_config_x86_64-win64-vs12.asm index 39c17a07c3ee..40d594793734 100644 --- a/media/libvpx/vpx_config_x86_64-win64-vs12.asm +++ b/media/libvpx/vpx_config_x86_64-win64-vs12.asm @@ -76,7 +76,9 @@ CONFIG_VP9_TEMPORAL_DENOISING equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_VP9_HIGHBITDEPTH equ 0 CONFIG_EXPERIMENTAL equ 0 -CONFIG_SIZE_LIMIT equ 0 +CONFIG_SIZE_LIMIT equ 1 CONFIG_SPATIAL_SVC equ 0 CONFIG_FP_MB_STATS equ 0 CONFIG_EMULATE_HARDWARE equ 0 +DECODE_WIDTH_LIMIT , 4000 +DECODE_HEIGHT_LIMIT , 3000 diff --git a/media/libvpx/vpx_config_x86_64-win64-vs12.h b/media/libvpx/vpx_config_x86_64-win64-vs12.h index 4ad69bdb8445..17cd9421ed24 100644 --- a/media/libvpx/vpx_config_x86_64-win64-vs12.h +++ b/media/libvpx/vpx_config_x86_64-win64-vs12.h @@ -88,8 +88,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 4000 +#define DECODE_HEIGHT_LIMIT 3000 #endif /* VPX_CONFIG_H */