Bug 1192226 - Apply libvpx size limit. r=rillian

2015-08-08 09:34:39 +02:00 · 2015-08-08 09:34:39 +02:00 · 06a7ff715e
--- 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.
--- 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 */
--- 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.
--- 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 */
--- 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
--- 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 */
--- 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
--- 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 */
--- 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
--- 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 */
--- 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
--- 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 */
--- 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
--- 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 */
--- 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
--- 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 */
--- 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
--- 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 */
--- 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
--- 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 */