Update ARM specific libvpx config files.

BUG=
TEST=
TBR=niklas.enbom@webrtc.org,leozwang@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/534002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2138 4adac7df-926f-26a2-2b94-8c16560cd09d

11 files changed, 88 insertions, 85 deletions

diff --git a/third_party/libvpx/source/config/linux/arm-neon/asm_com_offsets.asm b/third_party/libvpx/source/config/linux/arm-neon/asm_com_offsets.asm
index 4a292faf02..a2fb794aa5 100644
--- a/third_party/libvpx/source/config/linux/arm-neon/asm_com_offsets.asm
+++ b/third_party/libvpx/source/config/linux/arm-neon/asm_com_offsets.asm
@@ -12,4 +12,5 @@
 .equ yv12_buffer_config_v_buffer ,  32
 .equ yv12_buffer_config_border ,  40
 .equ VP8BORDERINPIXELS_VAL ,  32
+.equ MFQE_PRECISION_VAL ,  4
 	.section	.note.GNU-stack,"",%progbits
diff --git 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
index c153051619..bf190f94f6 100644
--- 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
@@ -20,12 +20,11 @@
 .equ vp8_blockd_predictor ,  8
 .equ vp8_writer_lowvalue ,  0
 .equ vp8_writer_range ,  4
-.equ vp8_writer_value ,  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 vp8_writer_count ,  8
+.equ vp8_writer_pos ,  12
+.equ vp8_writer_buffer ,  16
+.equ vp8_writer_buffer_end ,  20
+.equ vp8_writer_error ,  24
 .equ tokenextra_token ,  6
 .equ tokenextra_extra ,  4
 .equ tokenextra_context_tree ,  0
@@ -38,10 +37,10 @@
 .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 ,  163984
+.equ vp8_comp_tplist ,  167104
 .equ vp8_comp_common ,  103296
-.equ vp8_comp_bc ,  109504
-.equ vp8_writer_sz ,  40
+.equ vp8_comp_bc ,  112656
+.equ vp8_writer_sz ,  36
 .equ tokenlist_start ,  0
 .equ tokenlist_stop ,  4
 .equ TOKENLIST_SZ ,  8
diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm
index 5c724d8af9..ea83b9b4be 100644
--- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm
+++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm
@@ -46,7 +46,7 @@
 .equ CONFIG_MD5 ,  1
 .equ CONFIG_DEQUANT_TOKENS ,  0
 .equ CONFIG_DC_RECON ,  0
-.equ CONFIG_RUNTIME_CPU_DETECT ,  0
+.equ CONFIG_RUNTIME_CPU_DETECT ,  1
 .equ CONFIG_POSTPROC ,  1
 .equ CONFIG_MULTITHREAD ,  1
 .equ CONFIG_INTERNAL_STATS ,  0
diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c
index 08c2b740ce..7e7cdd9735 100644
--- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c
+++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c
@@ -5,5 +5,5 @@
 /* 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 --enable-postproc";
+static const char* const cfg = "--sdk-path=android-ndk-r7c --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 --enable-postproc";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h
index ebf7531470..127029d68e 100644
--- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h
+++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h
@@ -54,7 +54,7 @@
 #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
diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_rtcd.h b/third_party/libvpx/source/config/linux/arm-neon/vpx_rtcd.h
index 2b2303702b..b83613483b 100644
--- a/third_party/libvpx/source/config/linux/arm-neon/vpx_rtcd.h
+++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_rtcd.h
@@ -111,17 +111,10 @@ void vp8_copy_mem8x4_v6(unsigned char *src, int src_pitch, unsigned char *dst, i
 void vp8_copy_mem8x4_neon(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 
-void vp8_build_intra_predictors_mby_c(struct macroblockd *x);
-void vp8_build_intra_predictors_mby_neon(struct macroblockd *x);
-RTCD_EXTERN void (*vp8_build_intra_predictors_mby)(struct macroblockd *x);
-
-void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr);
+void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
 #define vp8_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_c
 
-void vp8_build_intra_predictors_mbuv_c(struct macroblockd *x);
-#define vp8_build_intra_predictors_mbuv vp8_build_intra_predictors_mbuv_c
-
-void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr);
+void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
 #define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_c
 
 void vp8_intra4x4_predict_c(unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride);
@@ -149,6 +142,15 @@ void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v,
 void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
 #define vp8_blend_b vp8_blend_b_c
 
+void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+#define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_c
+
+void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+#define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_c
+
+void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c
+
 void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 void vp8_sixtap_predict16x16_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 void vp8_sixtap_predict16x16_neon(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
@@ -244,21 +246,6 @@ unsigned int vp8_variance_halfpixvar16x16_hv_armv6(const unsigned char *src_ptr,
 unsigned int vp8_variance_halfpixvar16x16_hv_neon(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
 RTCD_EXTERN unsigned int (*vp8_variance_halfpixvar16x16_hv)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
 
-unsigned int vp8_get_mb_ss_c(const short *);
-#define vp8_get_mb_ss vp8_get_mb_ss_c
-
-unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_c
-
-unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_mse16x16_armv6(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_mse16x16_neon(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_mse16x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-
-unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
-unsigned int vp8_get4x4sse_cs_neon(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
-RTCD_EXTERN unsigned int (*vp8_get4x4sse_cs)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
-
 unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad);
 unsigned int vp8_sad4x4_neon(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad);
 RTCD_EXTERN unsigned int (*vp8_sad4x4)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad);
@@ -325,6 +312,21 @@ void vp8_sad16x8x4d_c(const unsigned char *src_ptr, int source_stride, unsigned
 void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int  ref_stride, unsigned int *sad_array);
 #define vp8_sad16x16x4d vp8_sad16x16x4d_c
 
+unsigned int vp8_get_mb_ss_c(const short *);
+#define vp8_get_mb_ss vp8_get_mb_ss_c
+
+unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_c
+
+unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_mse16x16_armv6(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_mse16x16_neon(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_mse16x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+
+unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
+unsigned int vp8_get4x4sse_cs_neon(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
+RTCD_EXTERN unsigned int (*vp8_get4x4sse_cs)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
+
 void vp8_short_fdct4x4_c(short *input, short *output, int pitch);
 void vp8_short_fdct4x4_armv6(short *input, short *output, int pitch);
 void vp8_short_fdct4x4_neon(short *input, short *output, int pitch);
@@ -488,10 +490,6 @@ void vpx_rtcd(void)
     if (flags & HAS_MEDIA) vp8_copy_mem8x4 = vp8_copy_mem8x4_v6;
     if (flags & HAS_NEON) vp8_copy_mem8x4 = vp8_copy_mem8x4_neon;
 
-    vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_c;
-    if (flags & HAS_NEON) vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_neon;
-
-
 
 
     vp8_intra4x4_predict = vp8_intra4x4_predict_c;
@@ -504,6 +502,9 @@ void vpx_rtcd(void)
 
 
 
+
+
+
     vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_c;
     if (flags & HAS_MEDIA) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_armv6;
     if (flags & HAS_NEON) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_neon;
@@ -574,15 +575,6 @@ void vpx_rtcd(void)
     if (flags & HAS_MEDIA) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_armv6;
     if (flags & HAS_NEON) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_neon;
 
-
-
-    vp8_mse16x16 = vp8_mse16x16_c;
-    if (flags & HAS_MEDIA) vp8_mse16x16 = vp8_mse16x16_armv6;
-    if (flags & HAS_NEON) vp8_mse16x16 = vp8_mse16x16_neon;
-
-    vp8_get4x4sse_cs = vp8_get4x4sse_cs_c;
-    if (flags & HAS_NEON) vp8_get4x4sse_cs = vp8_get4x4sse_cs_neon;
-
     vp8_sad4x4 = vp8_sad4x4_c;
     if (flags & HAS_NEON) vp8_sad4x4 = vp8_sad4x4_neon;
 
@@ -614,6 +606,15 @@ void vpx_rtcd(void)
 
 
 
+
+
+    vp8_mse16x16 = vp8_mse16x16_c;
+    if (flags & HAS_MEDIA) vp8_mse16x16 = vp8_mse16x16_armv6;
+    if (flags & HAS_NEON) vp8_mse16x16 = vp8_mse16x16_neon;
+
+    vp8_get4x4sse_cs = vp8_get4x4sse_cs_c;
+    if (flags & HAS_NEON) vp8_get4x4sse_cs = vp8_get4x4sse_cs_neon;
+
     vp8_short_fdct4x4 = vp8_short_fdct4x4_c;
     if (flags & HAS_MEDIA) vp8_short_fdct4x4 = vp8_short_fdct4x4_armv6;
     if (flags & HAS_NEON) vp8_short_fdct4x4 = vp8_short_fdct4x4_neon;
diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_version.h b/third_party/libvpx/source/config/linux/arm-neon/vpx_version.h
index 5e8336e3e1..b9c3447d02 100644
--- 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  1
 #define VERSION_MINOR  0
 #define VERSION_PATCH  0
-#define VERSION_EXTRA  "108-g6b66c01"
+#define VERSION_EXTRA  "169-gdba0538"
 #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v1.0.0-108-g6b66c01"
-#define VERSION_STRING      " v1.0.0-108-g6b66c01"
+#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538"
+#define VERSION_STRING      " v1.0.0-169-gdba0538"
diff --git a/third_party/libvpx/source/config/linux/arm/asm_enc_offsets.asm b/third_party/libvpx/source/config/linux/arm/asm_enc_offsets.asm
index c153051619..bf190f94f6 100644
--- a/third_party/libvpx/source/config/linux/arm/asm_enc_offsets.asm
+++ b/third_party/libvpx/source/config/linux/arm/asm_enc_offsets.asm
@@ -20,12 +20,11 @@
 .equ vp8_blockd_predictor ,  8
 .equ vp8_writer_lowvalue ,  0
 .equ vp8_writer_range ,  4
-.equ vp8_writer_value ,  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 vp8_writer_count ,  8
+.equ vp8_writer_pos ,  12
+.equ vp8_writer_buffer ,  16
+.equ vp8_writer_buffer_end ,  20
+.equ vp8_writer_error ,  24
 .equ tokenextra_token ,  6
 .equ tokenextra_extra ,  4
 .equ tokenextra_context_tree ,  0
@@ -38,10 +37,10 @@
 .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 ,  163984
+.equ vp8_comp_tplist ,  167104
 .equ vp8_comp_common ,  103296
-.equ vp8_comp_bc ,  109504
-.equ vp8_writer_sz ,  40
+.equ vp8_comp_bc ,  112656
+.equ vp8_writer_sz ,  36
 .equ tokenlist_start ,  0
 .equ tokenlist_stop ,  4
 .equ TOKENLIST_SZ ,  8
diff --git a/third_party/libvpx/source/config/linux/arm/vpx_config.c b/third_party/libvpx/source/config/linux/arm/vpx_config.c
index b9ed1c8a5a..f92d620a8d 100644
--- a/third_party/libvpx/source/config/linux/arm/vpx_config.c
+++ b/third_party/libvpx/source/config/linux/arm/vpx_config.c
@@ -5,5 +5,5 @@
 /* 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 --enable-postproc";
+static const char* const cfg = "--sdk-path=android-ndk-r7c --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 --enable-postproc";
 const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/third_party/libvpx/source/config/linux/arm/vpx_rtcd.h b/third_party/libvpx/source/config/linux/arm/vpx_rtcd.h
index 2446e14925..201494d59b 100644
--- a/third_party/libvpx/source/config/linux/arm/vpx_rtcd.h
+++ b/third_party/libvpx/source/config/linux/arm/vpx_rtcd.h
@@ -75,16 +75,10 @@ void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, in
 void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 #define vp8_copy_mem8x4 vp8_copy_mem8x4_c
 
-void vp8_build_intra_predictors_mby_c(struct macroblockd *x);
-#define vp8_build_intra_predictors_mby vp8_build_intra_predictors_mby_c
-
-void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr);
+void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
 #define vp8_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_c
 
-void vp8_build_intra_predictors_mbuv_c(struct macroblockd *x);
-#define vp8_build_intra_predictors_mbuv vp8_build_intra_predictors_mbuv_c
-
-void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr);
+void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
 #define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_c
 
 void vp8_intra4x4_predict_c(unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride);
@@ -111,6 +105,15 @@ void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v,
 void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
 #define vp8_blend_b vp8_blend_b_c
 
+void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+#define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_c
+
+void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+#define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_c
+
+void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c
+
 void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 #define vp8_sixtap_predict16x16 vp8_sixtap_predict16x16_c
 
@@ -174,18 +177,6 @@ unsigned int vp8_variance_halfpixvar16x16_v_c(const unsigned char *src_ptr, int
 unsigned int vp8_variance_halfpixvar16x16_hv_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
 #define vp8_variance_halfpixvar16x16_hv vp8_variance_halfpixvar16x16_hv_c
 
-unsigned int vp8_get_mb_ss_c(const short *);
-#define vp8_get_mb_ss vp8_get_mb_ss_c
-
-unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_c
-
-unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-#define vp8_mse16x16 vp8_mse16x16_c
-
-unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
-#define vp8_get4x4sse_cs vp8_get4x4sse_cs_c
-
 unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad);
 #define vp8_sad4x4 vp8_sad4x4_c
 
@@ -246,6 +237,18 @@ void vp8_sad16x8x4d_c(const unsigned char *src_ptr, int source_stride, unsigned
 void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int  ref_stride, unsigned int *sad_array);
 #define vp8_sad16x16x4d vp8_sad16x16x4d_c
 
+unsigned int vp8_get_mb_ss_c(const short *);
+#define vp8_get_mb_ss vp8_get_mb_ss_c
+
+unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_c
+
+unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+#define vp8_mse16x16 vp8_mse16x16_c
+
+unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
+#define vp8_get4x4sse_cs vp8_get4x4sse_cs_c
+
 void vp8_short_fdct4x4_c(short *input, short *output, int pitch);
 #define vp8_short_fdct4x4 vp8_short_fdct4x4_c
 
diff --git a/third_party/libvpx/source/config/linux/arm/vpx_version.h b/third_party/libvpx/source/config/linux/arm/vpx_version.h
index 5e8336e3e1..b9c3447d02 100644
--- 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  1
 #define VERSION_MINOR  0
 #define VERSION_PATCH  0
-#define VERSION_EXTRA  "108-g6b66c01"
+#define VERSION_EXTRA  "169-gdba0538"
 #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v1.0.0-108-g6b66c01"
-#define VERSION_STRING      " v1.0.0-108-g6b66c01"
+#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538"
+#define VERSION_STRING      " v1.0.0-169-gdba0538"