diff options
author | hkuang <hkuang@google.com> | 2014-04-09 14:20:00 -0700 |
---|---|---|
committer | Lajos Molnar <lajos@google.com> | 2014-04-10 17:18:16 +0000 |
commit | 4fb68e5dd4e93c7599dc905d861de11ac39c5585 (patch) | |
tree | a9a16f0806a169ec4291bcd60bbfefccebb338d4 /libvpx/test/external_frame_buffer_test.cc | |
parent | 2ec72e65689c948e92b826ae1e867bf369e72f13 (diff) | |
download | android_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 'libvpx/test/external_frame_buffer_test.cc')
-rw-r--r-- | libvpx/test/external_frame_buffer_test.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libvpx/test/external_frame_buffer_test.cc b/libvpx/test/external_frame_buffer_test.cc index 2e7adc1..54c79e9 100644 --- a/libvpx/test/external_frame_buffer_test.cc +++ b/libvpx/test/external_frame_buffer_test.cc @@ -210,7 +210,7 @@ class ExternalFrameBufferMD5Test ASSERT_TRUE(fb_list_.CreateBufferList(num_buffers_)); ASSERT_EQ(VPX_CODEC_OK, decoder->SetFrameBufferFunctions( - GetVp9FrameBuffer, ReleaseVP9FrameBuffer, this)); + GetVP9FrameBuffer, ReleaseVP9FrameBuffer, this)); } } @@ -242,7 +242,7 @@ class ExternalFrameBufferMD5Test // Callback to get a free external frame buffer. Return value < 0 is an // error. - static int GetVp9FrameBuffer(void *user_priv, size_t min_size, + static int GetVP9FrameBuffer(void *user_priv, size_t min_size, vpx_codec_frame_buffer_t *fb) { ExternalFrameBufferMD5Test *const md5Test = reinterpret_cast<ExternalFrameBufferMD5Test*>(user_priv); @@ -462,5 +462,7 @@ TEST_F(ExternalFrameBufferTest, SetAfterDecode) { } VP9_INSTANTIATE_TEST_CASE(ExternalFrameBufferMD5Test, - ::testing::ValuesIn(libvpx_test::kVP9TestVectors)); + ::testing::ValuesIn(libvpx_test::kVP9TestVectors, + libvpx_test::kVP9TestVectors + + libvpx_test::kNumVP9TestVectors)); } // namespace |