diff options
| -rw-r--r-- | test/test-data.sha1 | 2 | ||||
| -rw-r--r-- | test/test.mk | 2 | ||||
| -rw-r--r-- | test/test_vectors.cc | 1 | ||||
| -rw-r--r-- | test/test_vectors.h | 4 | ||||
| -rw-r--r-- | vp9/decoder/vp9_onyxd_if.c | 3 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 3 |
6 files changed, 11 insertions, 4 deletions
diff --git a/test/test-data.sha1 b/test/test-data.sha1 index 6daf69e63..a28773133 100644 --- a/test/test-data.sha1 +++ b/test/test-data.sha1 @@ -574,3 +574,5 @@ d48c5db1b0f8e60521a7c749696b8067886033a3 vp90-2-09-aq2.webm 84c1599298aac78f2fc05ae2274575d10569dfa0 vp90-2-09-aq2.webm.md5 55fc55ed73d578ed60fad05692579873f8bad758 vp90-2-09-lf_deltas.webm 54638c38009198c38c8f3b25c182b709b6c1fd2e vp90-2-09-lf_deltas.webm.md5 +510d95f3beb3b51c572611fdaeeece12277dac30 vp90-2-10-show-existing-frame.webm +14d631096f4bfa2d71f7f739aec1448fb3c33bad vp90-2-10-show-existing-frame.webm.md5 diff --git a/test/test.mk b/test/test.mk index cb6261568..a65decf73 100644 --- a/test/test.mk +++ b/test/test.mk @@ -676,6 +676,8 @@ LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-09-lf_deltas.webm LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-09-lf_deltas.webm.md5 LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp91-2-04-yv444.webm LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp91-2-04-yv444.webm.md5 +LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-10-show-existing-frame.webm +LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-10-show-existing-frame.webm.md5 ifeq ($(CONFIG_DECODE_PERF_TESTS),yes) # BBB VP9 streams diff --git a/test/test_vectors.cc b/test/test_vectors.cc index 16298d0ff..3227f5253 100644 --- a/test/test_vectors.cc +++ b/test/test_vectors.cc @@ -160,6 +160,7 @@ const char *kVP9TestVectors[kNumVp9TestVectors] = { "vp90-2-02-size-lf-1920x1080.webm", "vp90-2-09-aq2.webm", "vp90-2-09-lf_deltas.webm", + "vp90-2-10-show-existing-frame.webm", #if CONFIG_NON420 "vp91-2-04-yv444.webm" #endif diff --git a/test/test_vectors.h b/test/test_vectors.h index 5f62e9919..eb592de64 100644 --- a/test/test_vectors.h +++ b/test/test_vectors.h @@ -22,9 +22,9 @@ extern const char *kVP8TestVectors[kNumVp8TestVectors]; #if CONFIG_VP9_DECODER #if CONFIG_NON420 -const int kNumVp9TestVectors = 216; +const int kNumVp9TestVectors = 217; #else -const int kNumVp9TestVectors = 215; +const int kNumVp9TestVectors = 216; #endif extern const char *kVP9TestVectors[kNumVp9TestVectors]; diff --git a/vp9/decoder/vp9_onyxd_if.c b/vp9/decoder/vp9_onyxd_if.c index 75d52c25a..c6e9205bb 100644 --- a/vp9/decoder/vp9_onyxd_if.c +++ b/vp9/decoder/vp9_onyxd_if.c @@ -390,7 +390,8 @@ int vp9_receive_compressed_data(VP9D_PTR ptr, vp9_clear_system_state(); - cm->last_show_frame = cm->show_frame; + if (!cm->show_existing_frame) + cm->last_show_frame = cm->show_frame; if (cm->show_frame) { if (!cm->show_existing_frame) { // current mip will be the prev_mip for the next frame diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index b3f8c7ef7..2d20f7ed3 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -3250,7 +3250,8 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, cm->last_height = cm->height; // reset to normal state now that we are done. - cm->last_show_frame = cm->show_frame; + if (!cm->show_existing_frame) + cm->last_show_frame = cm->show_frame; if (cm->show_frame) { // current mip will be the prev_mip for the next frame MODE_INFO *temp = cm->prev_mip; |