summaryrefslogtreecommitdiffstats
path: root/mips-dspr2
diff options
context:
space:
mode:
authorhkuang <hkuang@google.com>2014-04-09 14:20:00 -0700
committerLajos Molnar <lajos@google.com>2014-04-10 17:18:16 +0000
commit4fb68e5dd4e93c7599dc905d861de11ac39c5585 (patch)
treea9a16f0806a169ec4291bcd60bbfefccebb338d4 /mips-dspr2
parent2ec72e65689c948e92b826ae1e867bf369e72f13 (diff)
downloadandroid_external_libvpx-4fb68e5dd4e93c7599dc905d861de11ac39c5585.tar.gz
android_external_libvpx-4fb68e5dd4e93c7599dc905d861de11ac39c5585.tar.bz2
android_external_libvpx-4fb68e5dd4e93c7599dc905d861de11ac39c5585.zip
Roll latest libvpx to fix hang when doing adaptive playback.
VP9 decoder will hang when switching from frames with 2 tiles to 4 tiles on a 4 core device. libvpx hash:4fffefe189a9123d4b04482c26a1be5eb632b397 (cherry picked from commit 6ac915abcdb404a00d927fe6308a47fcf09d9519) Bug: 13931133 Change-Id: I24a51fd572ca7e872bc440491e2c645a20e9a736
Diffstat (limited to 'mips-dspr2')
-rw-r--r--mips-dspr2/libvpx_srcs.txt13
-rw-r--r--mips-dspr2/vp9_rtcd.h3
-rw-r--r--mips-dspr2/vpx_config.c2
-rw-r--r--mips-dspr2/vpx_version.h6
4 files changed, 16 insertions, 8 deletions
diff --git a/mips-dspr2/libvpx_srcs.txt b/mips-dspr2/libvpx_srcs.txt
index d86780e..d2b9adc 100644
--- a/mips-dspr2/libvpx_srcs.txt
+++ b/mips-dspr2/libvpx_srcs.txt
@@ -227,13 +227,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
@@ -268,6 +272,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
@@ -278,10 +284,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/mips-dspr2/vp9_rtcd.h b/mips-dspr2/vp9_rtcd.h
index 5cafa79..b226d05 100644
--- a/mips-dspr2/vp9_rtcd.h
+++ b/mips-dspr2/vp9_rtcd.h
@@ -235,6 +235,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/mips-dspr2/vpx_config.c b/mips-dspr2/vpx_config.c
index 7cfa2b7..8e8ac7b 100644
--- a/mips-dspr2/vpx_config.c
+++ b/mips-dspr2/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 = "--force-target=mips32-android-gcc --disable-runtime-cpu-detect --sdk-path=/usr/local/google/home/vigneshv/Downloads/android-ndk-r9d --enable-dspr2 --disable-examples --disable-docs --enable-realtime-only";
+static const char* const cfg = "--force-target=mips32-android-gcc --disable-runtime-cpu-detect --sdk-path=/usr/local/google/home/hkuang/Downloads/android-ndk-r9d --enable-dspr2 --disable-examples --disable-docs --enable-realtime-only";
const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/mips-dspr2/vpx_version.h b/mips-dspr2/vpx_version.h
index 0330656..8bbaf6b 100644
--- a/mips-dspr2/vpx_version.h
+++ b/mips-dspr2/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"