ref: 6865af63786ab9a41773cb9efc2c763f4fff7329
parent: 9bbcc20b572face3b2cf753d702514d57765015f
parent: 899585ebe9a1e8e3ba408ac0b1652e14d8d6eaaf
author: Jim Bankoski <jimbankoski@google.com>
date: Mon Jul 28 05:47:57 EDT 2014
Merge "Fix reference frame size restrictions."
--- a/test/test-data.sha1
+++ b/test/test-data.sha1
@@ -678,3 +678,5 @@
edd86a1f5e62fd9da9a9d46078247759c2638009 tacomasmallcameramovement_640_480_30.yuv
9a70e8b7d14fba9234d0e51dce876635413ce444 thaloundeskmtg_640_480_30.yuv
e7d315dbf4f3928779e0dc624311196d44491d32 niklas_1280_720_30.yuv
+c77e4a26616add298a05dd5d12397be22c0e40c5 vp90-2-18-resize.ivf
+c77e4a26616add298a05dd5d12397be22c0e40c5 vp90-2-18-resize.ivf
--- a/test/test.mk
+++ b/test/test.mk
@@ -782,6 +782,8 @@
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-16-intra-only.webm.md5
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-17-show-existing-frame.webm
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-17-show-existing-frame.webm.md5
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-18-resize.ivf
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-18-resize.ivf.md5
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp91-2-04-yuv444.webm
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp91-2-04-yuv444.webm.md5
--- a/test/test_vectors.cc
+++ b/test/test_vectors.cc
@@ -181,7 +181,7 @@
"vp90-2-14-resize-fp-tiles-8-2.webm", "vp90-2-14-resize-fp-tiles-8-4.webm",
"vp90-2-15-segkey.webm", "vp90-2-15-segkey_adpq.webm",
"vp90-2-16-intra-only.webm", "vp90-2-17-show-existing-frame.webm",
- "vp91-2-04-yuv444.webm",
+ "vp90-2-18-resize.ivf", "vp91-2-04-yuv444.webm",
};
const int kNumVP9TestVectors = NELEMENTS(kVP9TestVectors);
#endif // CONFIG_VP9_DECODER
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -688,8 +688,8 @@
// has valid dimensions.
for (i = 0; i < REFS_PER_FRAME; ++i) {RefBuffer *const ref_frame = &cm->frame_refs[i];
- has_valid_ref_frame |= valid_ref_frame_size(ref_frame->buf->y_width,
- ref_frame->buf->y_height,
+ has_valid_ref_frame |= valid_ref_frame_size(ref_frame->buf->y_crop_width,
+ ref_frame->buf->y_crop_height,
width, height);
}
if (!has_valid_ref_frame)
--
⑨