diff options
| author | Alex Converse <aconverse@google.com> | 2014-02-21 10:31:36 -0800 |
|---|---|---|
| committer | Alex Converse <aconverse@google.com> | 2014-02-21 12:05:29 -0800 |
| commit | 6e3cf6ec1d0bad58071d774ef2c4191560293cbc (patch) | |
| tree | 47339947bbc0c9effe711e6c8a4f78494ac9d334 /test | |
| parent | d66bd225263c7f644ff886bb7b1a4743a633385f (diff) | |
| download | libvpx-6e3cf6ec1d0bad58071d774ef2c4191560293cbc.tar libvpx-6e3cf6ec1d0bad58071d774ef2c4191560293cbc.tar.gz libvpx-6e3cf6ec1d0bad58071d774ef2c4191560293cbc.tar.bz2 libvpx-6e3cf6ec1d0bad58071d774ef2c4191560293cbc.zip | |
Stop gating non420 features with a configure flag.
Change-Id: I8cc38fdef6a2a0968af8dfe15e7c2b3c46c531ea
Diffstat (limited to 'test')
| -rw-r--r-- | test/datarate_test.cc | 2 | ||||
| -rw-r--r-- | test/test_vectors.cc | 2 | ||||
| -rw-r--r-- | test/test_vectors.h | 4 | ||||
| -rw-r--r-- | test/vp9_lossless_test.cc | 2 |
4 files changed, 0 insertions, 10 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/test_vectors.cc b/test/test_vectors.cc index 934281387..aba8a3c17 100644 --- a/test/test_vectors.cc +++ b/test/test_vectors.cc @@ -161,9 +161,7 @@ const char *kVP9TestVectors[kNumVp9TestVectors] = { "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", -#if CONFIG_NON420 "vp91-2-04-yv444.webm" -#endif }; #endif // CONFIG_VP9_DECODER diff --git a/test/test_vectors.h b/test/test_vectors.h index 307f7327b..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 = 223; -#else -const int kNumVp9TestVectors = 222; -#endif extern const char *kVP9TestVectors[kNumVp9TestVectors]; #endif // CONFIG_VP9_DECODER 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 |