summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/datarate_test.cc2
-rw-r--r--test/ivf_video_source.h6
-rw-r--r--test/test-data.sha112
-rw-r--r--test/test.mk26
-rw-r--r--test/test_vectors.cc24
-rw-r--r--test/test_vectors.h6
-rw-r--r--test/video_source.h4
-rw-r--r--test/vp9_lossless_test.cc2
-rw-r--r--test/webm_video_source.h8
9 files changed, 52 insertions, 38 deletions
diff --git a/test/datarate_test.cc b/test/datarate_test.cc
index 5ae76d761..39c9a5a67 100644
--- a/test/datarate_test.cc
+++ b/test/datarate_test.cc
@@ -381,7 +381,6 @@ TEST_P(DatarateTestVP9, BasicRateTargeting) {
}
}
-#if CONFIG_NON420
// Check basic rate targeting,
TEST_P(DatarateTestVP9, BasicRateTargeting444) {
::libvpx_test::Y4mVideoSource video("rush_hour_444.y4m", 0, 140);
@@ -410,7 +409,6 @@ TEST_P(DatarateTestVP9, BasicRateTargeting444) {
<< cfg_.rc_target_bitrate << " "<< effective_datarate_;
}
}
-#endif
// Check that (1) the first dropped frame gets earlier and earlier
// as the drop frame threshold is increased, and (2) that the total number of
diff --git a/test/ivf_video_source.h b/test/ivf_video_source.h
index 3fbafbd70..824a39d7e 100644
--- a/test/ivf_video_source.h
+++ b/test/ivf_video_source.h
@@ -94,14 +94,14 @@ class IVFVideoSource : public CompressedVideoSource {
virtual const uint8_t *cxdata() const {
return end_of_file_ ? NULL : compressed_frame_buf_;
}
- virtual const unsigned int frame_size() const { return frame_sz_; }
- virtual const unsigned int frame_number() const { return frame_; }
+ virtual size_t frame_size() const { return frame_sz_; }
+ virtual unsigned int frame_number() const { return frame_; }
protected:
std::string file_name_;
FILE *input_file_;
uint8_t *compressed_frame_buf_;
- unsigned int frame_sz_;
+ size_t frame_sz_;
unsigned int frame_;
bool end_of_file_;
};
diff --git a/test/test-data.sha1 b/test/test-data.sha1
index a28773133..6f718ef6c 100644
--- a/test/test-data.sha1
+++ b/test/test-data.sha1
@@ -576,3 +576,15 @@ d48c5db1b0f8e60521a7c749696b8067886033a3 vp90-2-09-aq2.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
+b4318e75f73a6a08992c7326de2fb589c2a794c7 vp90-2-11-size-351x287.webm
+b3c48382cf7d0454e83a02497c229d27720f9e20 vp90-2-11-size-351x287.webm.md5
+8e0096475ea2535bac71d3e2fc09e0c451c444df vp90-2-11-size-351x288.webm
+19e003804ec1dfc5464813b32339a15d5ba7b42f vp90-2-11-size-351x288.webm.md5
+40cd1d6a188d7a88b21ebac1e573d3f270ab261e vp90-2-11-size-352x287.webm
+68f515abe3858fc1eded46c8e6b2f727d43b5331 vp90-2-11-size-352x287.webm.md5
+9a510769ff23db410880ec3029d433e87d17f7fc vp90-2-12-droppable_1.ivf
+952eaac6eefa6f62179ed1db3e922fd42fecc624 vp90-2-12-droppable_1.ivf.md5
+9a510769ff23db410880ec3029d433e87d17f7fc vp90-2-12-droppable_2.ivf
+92a756469fa438220524e7fa6ac1d38c89514d17 vp90-2-12-droppable_2.ivf.md5
+c21e97e4ba486520118d78b01a5cb6e6dc33e190 vp90-2-12-droppable_3.ivf
+601abc9e4176c70f82ac0381365e9b151fdd24cd vp90-2-12-droppable_3.ivf.md5
diff --git a/test/test.mk b/test/test.mk
index b598d6b32..8488008d4 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -18,7 +18,7 @@ LIBVPX_TEST_SRCS-yes += test_vectors.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP8_ENCODER) += altref_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP8_ENCODER) += config_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP8_ENCODER) += cq_test.cc
-LIBVPX_TEST_SRCS-$(CONFIG_VP8_ENCODER) += datarate_test.cc
+LIBVPX_TEST_SRCS-$(CONFIG_ENCODERS) += datarate_test.cc
LIBVPX_TEST_SRCS-yes += encode_test_driver.cc
LIBVPX_TEST_SRCS-yes += encode_test_driver.h
@@ -39,12 +39,12 @@ LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += ivf_video_source.h
LIBVPX_TEST_SRCS-$(CONFIG_VP9_DECODER) += external_frame_buffer_test.cc
## WebM Parsing
-NESTEGG_SRCS += ../nestegg/halloc/halloc.h
-NESTEGG_SRCS += ../nestegg/halloc/src/align.h
-NESTEGG_SRCS += ../nestegg/halloc/src/halloc.c
-NESTEGG_SRCS += ../nestegg/halloc/src/hlist.h
-NESTEGG_SRCS += ../nestegg/include/nestegg/nestegg.h
-NESTEGG_SRCS += ../nestegg/src/nestegg.c
+NESTEGG_SRCS += ../third_party/nestegg/halloc/halloc.h
+NESTEGG_SRCS += ../third_party/nestegg/halloc/src/align.h
+NESTEGG_SRCS += ../third_party/nestegg/halloc/src/halloc.c
+NESTEGG_SRCS += ../third_party/nestegg/halloc/src/hlist.h
+NESTEGG_SRCS += ../third_party/nestegg/include/nestegg/nestegg.h
+NESTEGG_SRCS += ../third_party/nestegg/src/nestegg.c
LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += $(NESTEGG_SRCS)
LIBVPX_TEST_SRCS-$(CONFIG_DECODERS) += webm_video_source.h
@@ -679,6 +679,18 @@ 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
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-11-size-351x287.webm
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-11-size-351x287.webm.md5
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-11-size-351x288.webm
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-11-size-351x288.webm.md5
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-11-size-352x287.webm
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-11-size-352x287.webm.md5
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-12-droppable_1.ivf
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-12-droppable_1.ivf.md5
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-12-droppable_2.ivf
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-12-droppable_2.ivf.md5
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-12-droppable_3.ivf
+LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-12-droppable_3.ivf.md5
ifeq ($(CONFIG_DECODE_PERF_TESTS),yes)
# BBB VP9 streams
diff --git a/test/test_vectors.cc b/test/test_vectors.cc
index 3227f5253..aba8a3c17 100644
--- a/test/test_vectors.cc
+++ b/test/test_vectors.cc
@@ -150,20 +150,18 @@ const char *kVP9TestVectors[kNumVp9TestVectors] = {
"vp90-2-03-size-226x202.webm", "vp90-2-03-size-226x208.webm",
"vp90-2-03-size-226x210.webm", "vp90-2-03-size-226x224.webm",
"vp90-2-03-size-226x226.webm", "vp90-2-03-deltaq.webm",
- "vp90-2-05-resize.ivf", "vp90-2-06-bilinear.webm",
- "vp90-2-07-frame_parallel.webm",
- "vp90-2-08-tile_1x2_frame_parallel.webm", "vp90-2-08-tile_1x2.webm",
- "vp90-2-08-tile_1x4_frame_parallel.webm", "vp90-2-08-tile_1x4.webm",
- "vp90-2-08-tile_1x8_frame_parallel.webm", "vp90-2-08-tile_1x8.webm",
- "vp90-2-08-tile-4x4.webm", "vp90-2-08-tile-4x1.webm",
- "vp90-2-09-subpixel-00.ivf",
- "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
+ "vp90-2-05-resize.ivf", "vp90-2-06-bilinear.webm",
+ "vp90-2-07-frame_parallel.webm", "vp90-2-08-tile_1x2_frame_parallel.webm",
+ "vp90-2-08-tile_1x2.webm", "vp90-2-08-tile_1x4_frame_parallel.webm",
+ "vp90-2-08-tile_1x4.webm", "vp90-2-08-tile_1x8_frame_parallel.webm",
+ "vp90-2-08-tile_1x8.webm", "vp90-2-08-tile-4x4.webm",
+ "vp90-2-08-tile-4x1.webm", "vp90-2-09-subpixel-00.ivf",
+ "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",
+ "vp90-2-11-size-351x287.webm", "vp90-2-11-size-351x288.webm",
+ "vp90-2-11-size-352x287.webm", "vp90-2-12-droppable_1.ivf",
+ "vp90-2-12-droppable_2.ivf", "vp90-2-12-droppable_3.ivf",
"vp91-2-04-yv444.webm"
-#endif
};
#endif // CONFIG_VP9_DECODER
diff --git a/test/test_vectors.h b/test/test_vectors.h
index eb592de64..d5ecc96d6 100644
--- a/test/test_vectors.h
+++ b/test/test_vectors.h
@@ -21,11 +21,7 @@ extern const char *kVP8TestVectors[kNumVp8TestVectors];
#endif
#if CONFIG_VP9_DECODER
-#if CONFIG_NON420
-const int kNumVp9TestVectors = 217;
-#else
-const int kNumVp9TestVectors = 216;
-#endif
+const int kNumVp9TestVectors = 223;
extern const char *kVP9TestVectors[kNumVp9TestVectors];
#endif // CONFIG_VP9_DECODER
diff --git a/test/video_source.h b/test/video_source.h
index 3d01d39b2..6d1855ae3 100644
--- a/test/video_source.h
+++ b/test/video_source.h
@@ -184,9 +184,9 @@ class CompressedVideoSource {
virtual const uint8_t *cxdata() const = 0;
- virtual const unsigned int frame_size() const = 0;
+ virtual size_t frame_size() const = 0;
- virtual const unsigned int frame_number() const = 0;
+ virtual unsigned int frame_number() const = 0;
};
} // namespace libvpx_test
diff --git a/test/vp9_lossless_test.cc b/test/vp9_lossless_test.cc
index 2282687dc..ad7ba44a8 100644
--- a/test/vp9_lossless_test.cc
+++ b/test/vp9_lossless_test.cc
@@ -73,7 +73,6 @@ TEST_P(LossLessTest, TestLossLessEncoding) {
EXPECT_GE(psnr_lossless, kMaxPsnr);
}
-#if CONFIG_NON420
TEST_P(LossLessTest, TestLossLessEncoding444) {
libvpx_test::Y4mVideoSource video("rush_hour_444.y4m", 0, 10);
@@ -90,7 +89,6 @@ TEST_P(LossLessTest, TestLossLessEncoding444) {
const double psnr_lossless = GetMinPsnr();
EXPECT_GE(psnr_lossless, kMaxPsnr);
}
-#endif
VP9_INSTANTIATE_TEST_CASE(LossLessTest, ALL_TEST_MODES);
} // namespace
diff --git a/test/webm_video_source.h b/test/webm_video_source.h
index 53b0ba2b4..9d88ae360 100644
--- a/test/webm_video_source.h
+++ b/test/webm_video_source.h
@@ -14,7 +14,7 @@
#include <cstdlib>
#include <new>
#include <string>
-#include "nestegg/include/nestegg/nestegg.h"
+#include "third_party/nestegg/include/nestegg/nestegg.h"
#include "test/video_source.h"
namespace libvpx_test {
@@ -108,7 +108,7 @@ class WebMVideoSource : public CompressedVideoSource {
nestegg_io io = {nestegg_read_cb, nestegg_seek_cb, nestegg_tell_cb,
input_file_};
- ASSERT_FALSE(nestegg_init(&nestegg_ctx_, io, NULL))
+ ASSERT_FALSE(nestegg_init(&nestegg_ctx_, io, NULL, -1))
<< "nestegg_init failed";
unsigned int n;
@@ -169,8 +169,8 @@ class WebMVideoSource : public CompressedVideoSource {
virtual const uint8_t *cxdata() const {
return end_of_file_ ? NULL : buf_;
}
- virtual const unsigned int frame_size() const { return buf_sz_; }
- virtual const unsigned int frame_number() const { return frame_; }
+ virtual size_t frame_size() const { return buf_sz_; }
+ virtual unsigned int frame_number() const { return frame_; }
protected:
std::string file_name_;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-12 04:33:45 +0000