diff options
author | hkuang <hkuang@google.com> | 2014-04-10 17:21:41 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-10 17:21:41 +0000 |
commit | 704338728f68ac5ff7f36186bc4cdff890994959 (patch) | |
tree | d4655502ab2768db0858ae72ba2de7b530fa3afd /armv7a | |
parent | 7616a7e29066d65ecd1d6f54485360d3964c67bb (diff) | |
parent | 4fb68e5dd4e93c7599dc905d861de11ac39c5585 (diff) | |
download | android_external_libvpx-704338728f68ac5ff7f36186bc4cdff890994959.tar.gz android_external_libvpx-704338728f68ac5ff7f36186bc4cdff890994959.tar.bz2 android_external_libvpx-704338728f68ac5ff7f36186bc4cdff890994959.zip |
am 4fb68e5d: Roll latest libvpx to fix hang when doing adaptive playback.
* commit '4fb68e5dd4e93c7599dc905d861de11ac39c5585':
Roll latest libvpx to fix hang when doing adaptive playback.
Diffstat (limited to 'armv7a')
-rw-r--r-- | armv7a/libvpx_srcs.txt | 13 | ||||
-rw-r--r-- | armv7a/vp9_rtcd.h | 3 | ||||
-rw-r--r-- | armv7a/vpx_config.c | 2 | ||||
-rw-r--r-- | armv7a/vpx_version.h | 6 |
4 files changed, 16 insertions, 8 deletions
diff --git a/armv7a/libvpx_srcs.txt b/armv7a/libvpx_srcs.txt index d847386..0cb7701 100644 --- a/armv7a/libvpx_srcs.txt +++ b/armv7a/libvpx_srcs.txt @@ -235,13 +235,17 @@ vp9/decoder/vp9_reader.c vp9/decoder/vp9_reader.h vp9/decoder/vp9_thread.c vp9/decoder/vp9_thread.h +vp9/encoder/vp9_aq_complexity.c +vp9/encoder/vp9_aq_complexity.h +vp9/encoder/vp9_aq_cyclicrefresh.c +vp9/encoder/vp9_aq_cyclicrefresh.h +vp9/encoder/vp9_aq_variance.c +vp9/encoder/vp9_aq_variance.h vp9/encoder/vp9_bitstream.c vp9/encoder/vp9_bitstream.h vp9/encoder/vp9_block.h vp9/encoder/vp9_cost.c vp9/encoder/vp9_cost.h -vp9/encoder/vp9_craq.c -vp9/encoder/vp9_craq.h vp9/encoder/vp9_dct.c vp9/encoder/vp9_encodeframe.c vp9/encoder/vp9_encodeframe.h @@ -276,6 +280,8 @@ vp9/encoder/vp9_resize.h vp9/encoder/vp9_sad.c vp9/encoder/vp9_segmentation.c vp9/encoder/vp9_segmentation.h +vp9/encoder/vp9_speed_features.c +vp9/encoder/vp9_speed_features.h vp9/encoder/vp9_subexp.c vp9/encoder/vp9_subexp.h vp9/encoder/vp9_svc_layercontext.c @@ -286,10 +292,9 @@ vp9/encoder/vp9_tokenize.c vp9/encoder/vp9_tokenize.h vp9/encoder/vp9_treewriter.c vp9/encoder/vp9_treewriter.h -vp9/encoder/vp9_vaq.c -vp9/encoder/vp9_vaq.h vp9/encoder/vp9_variance.c vp9/encoder/vp9_variance.h +vp9/encoder/vp9_write_bit_buffer.c vp9/encoder/vp9_write_bit_buffer.h vp9/encoder/vp9_writer.c vp9/encoder/vp9_writer.h diff --git a/armv7a/vp9_rtcd.h b/armv7a/vp9_rtcd.h index 64c69d5..4d3884c 100644 --- a/armv7a/vp9_rtcd.h +++ b/armv7a/vp9_rtcd.h @@ -224,6 +224,9 @@ void vp9_fwht4x4_c(const int16_t *input, int16_t *output, int stride); unsigned int vp9_get_mb_ss_c(const int16_t *); #define vp9_get_mb_ss vp9_get_mb_ss_c +void vp9_get_sse_sum_16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum); +#define vp9_get_sse_sum_16x16 vp9_get_sse_sum_16x16_c + void vp9_get_sse_sum_8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum); #define vp9_get_sse_sum_8x8 vp9_get_sse_sum_8x8_c diff --git a/armv7a/vpx_config.c b/armv7a/vpx_config.c index d83de75..78d755d 100644 --- a/armv7a/vpx_config.c +++ b/armv7a/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 = "--target=armv7-android-gcc --disable-runtime-cpu-detect --sdk-path=/usr/local/google/home/vigneshv/Downloads/android-ndk-r9d --disable-neon --disable-examples --disable-docs --enable-realtime-only"; +static const char* const cfg = "--target=armv7-android-gcc --disable-runtime-cpu-detect --sdk-path=/usr/local/google/home/hkuang/Downloads/android-ndk-r9d --disable-neon --disable-examples --disable-docs --enable-realtime-only"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/armv7a/vpx_version.h b/armv7a/vpx_version.h index 0330656..8bbaf6b 100644 --- a/armv7a/vpx_version.h +++ b/armv7a/vpx_version.h @@ -1,7 +1,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_PATCH 0 -#define VERSION_EXTRA "1928-g8e9c9f1" +#define VERSION_EXTRA "2239-g4fffefe" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.3.0-1928-g8e9c9f1" -#define VERSION_STRING " v1.3.0-1928-g8e9c9f1" +#define VERSION_STRING_NOSP "v1.3.0-2239-g4fffefe" +#define VERSION_STRING " v1.3.0-2239-g4fffefe" |