Add libvpx configuration files for arm

Review URL: https://webrtc-codereview.appspot.com/416003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1801 4adac7df-926f-26a2-2b94-8c16560cd09d
2012-02-29 18:53:10 +00:00 · 2012-02-29 18:53:10 +00:00 · a368f86ff6
commit a368f86ff6
parent eaefea665f
11 changed files with 69 additions and 89 deletions
--- a/third_party/libvpx/source/config/linux/arm-neon/asm_dec_offsets.asm
+++ b/third_party/libvpx/source/config/linux/arm-neon/asm_dec_offsets.asm
@ -1,20 +0,0 @@
-@ This file was created from a .asm file
-@  using the ads2gas.pl script.
-	.equ DO1STROUNDING, 0
-.equ detok_scan ,  0
-.equ detok_ptr_block2leftabove ,  4
-.equ detok_coef_tree_ptr ,  8
-.equ detok_norm_ptr ,  12
-.equ detok_ptr_coef_bands_x ,  16
-.equ detok_A ,  20
-.equ detok_L ,  24
-.equ detok_qcoeff_start_ptr ,  28
-.equ detok_current_bc ,  32
-.equ detok_coef_probs ,  36
-.equ detok_eob ,  52
-.equ bool_decoder_user_buffer_end ,  0
-.equ bool_decoder_user_buffer ,  4
-.equ bool_decoder_value ,  8
-.equ bool_decoder_count ,  12
-.equ bool_decoder_range ,  16
-	.section	.note.GNU-stack,"",%progbits
--- a/third_party/libvpx/source/config/linux/arm-neon/asm_enc_offsets.asm
+++ b/third_party/libvpx/source/config/linux/arm-neon/asm_enc_offsets.asm
@ -10,9 +10,9 @@
 .equ vp8_block_zrun_zbin_boost ,  24
 .equ vp8_block_quant_shift ,  16
 .equ vp8_blockd_qcoeff ,  0
-.equ vp8_blockd_dequant ,  16
+.equ vp8_blockd_dequant ,  12
 .equ vp8_blockd_dqcoeff ,  4
-.equ vp8_blockd_eob ,  44
+.equ vp8_blockd_eob ,  40
 .equ vp8_block_base_src ,  36
 .equ vp8_block_src ,  40
 .equ vp8_block_src_diff ,  0
@ -24,6 +24,8 @@
 .equ vp8_writer_count ,  12
 .equ vp8_writer_pos ,  16
 .equ vp8_writer_buffer ,  20
+.equ vp8_writer_buffer_end ,  24
+.equ vp8_writer_error ,  28
 .equ tokenextra_token ,  6
 .equ tokenextra_extra ,  4
 .equ tokenextra_context_tree ,  0
@ -36,11 +38,12 @@
 .equ vp8_extra_bit_struct_prob ,  4
 .equ vp8_extra_bit_struct_len ,  8
 .equ vp8_extra_bit_struct_base_val ,  12
-.equ vp8_comp_tplist ,  174400
-.equ vp8_comp_common ,  104640
-.equ vp8_comp_bc2 ,  121568
+.equ vp8_comp_tplist ,  163392
+.equ vp8_comp_common ,  103760
+.equ vp8_comp_bc ,  109968
+.equ vp8_writer_sz ,  40
 .equ tokenlist_start ,  0
 .equ tokenlist_stop ,  4
 .equ TOKENLIST_SZ ,  8
-.equ vp8_common_mb_rows ,  13080
+.equ vp8_common_mb_rows ,  2392
 	.section	.note.GNU-stack,"",%progbits
--- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm
+++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm
@ -10,8 +10,6 @@
 .equ HAVE_ARMV5TE ,  1
 .equ HAVE_ARMV6 ,  1
 .equ HAVE_ARMV7 ,  1
-.equ HAVE_IWMMXT ,  0
-.equ HAVE_IWMMXT2 ,  0
 .equ HAVE_MIPS32 ,  0
 .equ HAVE_MMX ,  0
 .equ HAVE_SSE ,  0
@ -25,7 +23,7 @@
 .equ HAVE_ALT_TREE_LAYOUT ,  0
 .equ HAVE_PTHREAD_H ,  1
 .equ HAVE_SYS_MMAN_H ,  1
-.equ HAVE_UNISTD_H ,  0
+.equ HAVE_UNISTD_H ,  1
 .equ CONFIG_EXTERNAL_BUILD ,  0
 .equ CONFIG_INSTALL_DOCS ,  0
 .equ CONFIG_INSTALL_BINS ,  0
@ -37,7 +35,7 @@
 .equ CONFIG_RVCT ,  0
 .equ CONFIG_GCC ,  1
 .equ CONFIG_MSVS ,  0
-.equ CONFIG_PIC ,  0
+.equ CONFIG_PIC ,  1
 .equ CONFIG_BIG_ENDIAN ,  0
 .equ CONFIG_CODEC_SRCS ,  0
 .equ CONFIG_DEBUG_LIBS ,  0
@ -48,8 +46,8 @@
 .equ CONFIG_MD5 ,  1
 .equ CONFIG_DEQUANT_TOKENS ,  0
 .equ CONFIG_DC_RECON ,  0
-.equ CONFIG_RUNTIME_CPU_DETECT ,  0
-.equ CONFIG_POSTPROC ,  1
+.equ CONFIG_RUNTIME_CPU_DETECT ,  1
+.equ CONFIG_POSTPROC ,  0
 .equ CONFIG_MULTITHREAD ,  1
 .equ CONFIG_INTERNAL_STATS ,  0
 .equ CONFIG_VP8_ENCODER ,  1
@ -66,6 +64,8 @@
 .equ CONFIG_SMALL ,  0
 .equ CONFIG_POSTPROC_VISUALIZER ,  0
 .equ CONFIG_OS_SUPPORT ,  1
+.equ CONFIG_UNIT_TESTS ,  0
+.equ CONFIG_MULTI_RES_ENCODING ,  0
 	.section	.note.GNU-stack,"",%progbits
@ This file was created from a .asm file
@  using the ads2gas.pl script.
--- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c
+++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c
@ -1,2 +1,9 @@
-static const char* const cfg = "--target=armv7-linux-gcc --enable-pic --enable-error-concealment --disable-postproc --disable-install-docs --disable-install-srcs";
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
+static const char* const cfg = "--sdk-path=/usr/local/google/bin/android-ndk-r7 --target=armv7-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only";
 const char *vpx_codec_build_config(void) {return cfg;}
--- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h
+++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h
@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
@ -11,8 +18,6 @@
 #define HAVE_ARMV5TE 1
 #define HAVE_ARMV6 1
 #define HAVE_ARMV7 1
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
 #define HAVE_MIPS32 0
 #define HAVE_MMX 0
 #define HAVE_SSE 0
@ -26,6 +31,7 @@
 #define HAVE_ALT_TREE_LAYOUT 0
 #define HAVE_PTHREAD_H 1
 #define HAVE_SYS_MMAN_H 1
+#define HAVE_UNISTD_H 1
 #define CONFIG_EXTERNAL_BUILD 0
 #define CONFIG_INSTALL_DOCS 0
 #define CONFIG_INSTALL_BINS 0
@ -48,9 +54,10 @@
 #define CONFIG_MD5 1
 #define CONFIG_DEQUANT_TOKENS 0
 #define CONFIG_DC_RECON 0
-#define CONFIG_RUNTIME_CPU_DETECT 0
+#define CONFIG_RUNTIME_CPU_DETECT 1
 #define CONFIG_POSTPROC 1
 #define CONFIG_MULTITHREAD 1
+#define CONFIG_INTERNAL_STATS 0
 #define CONFIG_VP8_ENCODER 1
 #define CONFIG_VP8_DECODER 1
 #define CONFIG_VP8 1
@ -59,10 +66,12 @@
 #define CONFIG_STATIC_MSVCRT 0
 #define CONFIG_SPATIAL_RESAMPLING 1
 #define CONFIG_REALTIME_ONLY 1
+#define CONFIG_ERROR_CONCEALMENT 1
 #define CONFIG_SHARED 0
+#define CONFIG_STATIC 1
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
-#define CONFIG_INTERNAL_STATS 0
-#define CONFIG_ERROR_CONCEALMENT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
 #endif /* VPX_CONFIG_H */
--- a/third_party/libvpx/source/config/linux/arm-neon/vpx_version.h
+++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_version.h
@ -1,7 +1,7 @@
-#define VERSION_MAJOR  0
-#define VERSION_MINOR  9
-#define VERSION_PATCH  7
+#define VERSION_MAJOR  1
+#define VERSION_MINOR  0
+#define VERSION_PATCH  0
 #define VERSION_EXTRA  ""
 #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v0.9.7"
-#define VERSION_STRING      " v0.9.7"
+#define VERSION_STRING_NOSP "v1.0.0"
+#define VERSION_STRING      " v1.0.0"
--- a/third_party/libvpx/source/config/linux/arm/asm_com_offsets.asm
+++ b/third_party/libvpx/source/config/linux/arm/asm_com_offsets.asm
@ -1,15 +0,0 @@
-@ This file was created from a .asm file
-@  using the ads2gas.pl script.
-	.equ DO1STROUNDING, 0
-.equ yv12_buffer_config_y_width ,  0
-.equ yv12_buffer_config_y_height ,  4
-.equ yv12_buffer_config_y_stride ,  8
-.equ yv12_buffer_config_uv_width ,  12
-.equ yv12_buffer_config_uv_height ,  16
-.equ yv12_buffer_config_uv_stride ,  20
-.equ yv12_buffer_config_y_buffer ,  24
-.equ yv12_buffer_config_u_buffer ,  28
-.equ yv12_buffer_config_v_buffer ,  32
-.equ yv12_buffer_config_border ,  40
-.equ VP8BORDERINPIXELS_VAL ,  32
-	.section	.note.GNU-stack,"",%progbits
--- a/third_party/libvpx/source/config/linux/arm/asm_dec_offsets.asm
+++ b/third_party/libvpx/source/config/linux/arm/asm_dec_offsets.asm
@ -1,20 +0,0 @@
-@ This file was created from a .asm file
-@  using the ads2gas.pl script.
-	.equ DO1STROUNDING, 0
-.equ detok_scan ,  0
-.equ detok_ptr_block2leftabove ,  4
-.equ detok_coef_tree_ptr ,  8
-.equ detok_norm_ptr ,  12
-.equ detok_ptr_coef_bands_x ,  16
-.equ detok_A ,  20
-.equ detok_L ,  24
-.equ detok_qcoeff_start_ptr ,  28
-.equ detok_current_bc ,  32
-.equ detok_coef_probs ,  36
-.equ detok_eob ,  52
-.equ bool_decoder_user_buffer_end ,  0
-.equ bool_decoder_user_buffer ,  4
-.equ bool_decoder_value ,  8
-.equ bool_decoder_count ,  12
-.equ bool_decoder_range ,  16
-	.section	.note.GNU-stack,"",%progbits
--- a/third_party/libvpx/source/config/linux/arm/vpx_config.c
+++ b/third_party/libvpx/source/config/linux/arm/vpx_config.c
@ -1,2 +1,9 @@
-static const char* const cfg = "--target=armv6-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-bins --disable-install-libs --enable-realtime-only --disable-install-srcs --disable-examples";
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
+static const char* const cfg = "--sdk-path=/usr/local/google/bin/android-ndk-r7 --target=armv5te-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only";
 const char *vpx_codec_build_config(void) {return cfg;}
--- a/third_party/libvpx/source/config/linux/arm/vpx_config.h
+++ b/third_party/libvpx/source/config/linux/arm/vpx_config.h
@ -1,3 +1,10 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
@ -9,10 +16,8 @@
 #define ARCH_PPC32 0
 #define ARCH_PPC64 0
 #define HAVE_ARMV5TE 1
-#define HAVE_ARMV6 1
+#define HAVE_ARMV6 0
 #define HAVE_ARMV7 0
-#define HAVE_IWMMXT 0
-#define HAVE_IWMMXT2 0
 #define HAVE_MIPS32 0
 #define HAVE_MMX 0
 #define HAVE_SSE 0
@ -26,6 +31,7 @@
 #define HAVE_ALT_TREE_LAYOUT 0
 #define HAVE_PTHREAD_H 1
 #define HAVE_SYS_MMAN_H 1
+#define HAVE_UNISTD_H 1
 #define CONFIG_EXTERNAL_BUILD 0
 #define CONFIG_INSTALL_DOCS 0
 #define CONFIG_INSTALL_BINS 0
@ -51,6 +57,7 @@
 #define CONFIG_RUNTIME_CPU_DETECT 0
 #define CONFIG_POSTPROC 1
 #define CONFIG_MULTITHREAD 1
+#define CONFIG_INTERNAL_STATS 0
 #define CONFIG_VP8_ENCODER 1
 #define CONFIG_VP8_DECODER 1
 #define CONFIG_VP8 1
@ -59,10 +66,12 @@
 #define CONFIG_STATIC_MSVCRT 0
 #define CONFIG_SPATIAL_RESAMPLING 1
 #define CONFIG_REALTIME_ONLY 1
+#define CONFIG_ERROR_CONCEALMENT 1
 #define CONFIG_SHARED 0
+#define CONFIG_STATIC 1
 #define CONFIG_SMALL 0
 #define CONFIG_POSTPROC_VISUALIZER 0
 #define CONFIG_OS_SUPPORT 1
-#define CONFIG_INTERNAL_STATS 0
-#define CONFIG_ERROR_CONCEALMENT 1
+#define CONFIG_UNIT_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 0
 #endif /* VPX_CONFIG_H */
--- a/third_party/libvpx/source/config/linux/arm/vpx_version.h
+++ b/third_party/libvpx/source/config/linux/arm/vpx_version.h
@ -1,7 +1,7 @@
-#define VERSION_MAJOR  0
-#define VERSION_MINOR  9
-#define VERSION_PATCH  7
+#define VERSION_MAJOR  1
+#define VERSION_MINOR  0
+#define VERSION_PATCH  0
 #define VERSION_EXTRA  ""
 #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v0.9.7"
-#define VERSION_STRING      " v0.9.7"
+#define VERSION_STRING_NOSP "v1.0.0"
+#define VERSION_STRING      " v1.0.0"