generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop the very slow BEST encoding from the lossless test.

Browse Source 
BEST is used in very few tests.

Change-Id: I71880534fe5a44721e7bac8be49b5f71766c1e5f
This commit is contained in:
Alex Converse 2014-10-01 11:57:47 -07:00
parent 20a37391d9
commit feee7d97b7
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/vp9_lossless_test.cc
View File

@ -19,17 +19,17 @@ namespace {
const int kMaxPsnr = 100; const int kMaxPsnr = 100;
class LosslessTestLarge : public ::libvpx_test::EncoderTest, class LosslessTest : public ::libvpx_test::EncoderTest,
public ::libvpx_test::CodecTestWithParam<libvpx_test::TestMode> { public ::libvpx_test::CodecTestWithParam<libvpx_test::TestMode> {
protected: protected:
LosslessTestLarge() LosslessTest()
: EncoderTest(GET_PARAM(0)), : EncoderTest(GET_PARAM(0)),
psnr_(kMaxPsnr), psnr_(kMaxPsnr),
nframes_(0), nframes_(0),
encoding_mode_(GET_PARAM(1)) { encoding_mode_(GET_PARAM(1)) {
} }
virtual ~LosslessTestLarge() {} virtual ~LosslessTest() {}
virtual void SetUp() { virtual void SetUp() {
InitializeConfig(); InitializeConfig();
@ -67,7 +67,7 @@ class LosslessTestLarge : public ::libvpx_test::EncoderTest,
libvpx_test::TestMode encoding_mode_; libvpx_test::TestMode encoding_mode_;
}; };
TEST_P(LosslessTestLarge, TestLossLessEncoding) { TEST_P(LosslessTest, TestLossLessEncoding) {
const vpx_rational timebase = { 33333333, 1000000000 }; const vpx_rational timebase = { 33333333, 1000000000 };
cfg_.g_timebase = timebase; cfg_.g_timebase = timebase;
cfg_.rc_target_bitrate = 2000; cfg_.rc_target_bitrate = 2000;
@ -85,7 +85,7 @@ TEST_P(LosslessTestLarge, TestLossLessEncoding) {
EXPECT_GE(psnr_lossless, kMaxPsnr); EXPECT_GE(psnr_lossless, kMaxPsnr);
} }
TEST_P(LosslessTestLarge, TestLossLessEncoding444) { TEST_P(LosslessTest, TestLossLessEncoding444) {
libvpx_test::Y4mVideoSource video("rush_hour_444.y4m", 0, 10); libvpx_test::Y4mVideoSource video("rush_hour_444.y4m", 0, 10);
cfg_.g_profile = 1; cfg_.g_profile = 1;
@ -102,7 +102,7 @@ TEST_P(LosslessTestLarge, TestLossLessEncoding444) {
EXPECT_GE(psnr_lossless, kMaxPsnr); EXPECT_GE(psnr_lossless, kMaxPsnr);
} }
TEST_P(LosslessTestLarge, TestLossLessEncodingCtrl) { TEST_P(LosslessTest, TestLossLessEncodingCtrl) {
const vpx_rational timebase = { 33333333, 1000000000 }; const vpx_rational timebase = { 33333333, 1000000000 };
cfg_.g_timebase = timebase; cfg_.g_timebase = timebase;
cfg_.rc_target_bitrate = 2000; cfg_.rc_target_bitrate = 2000;
@ -121,5 +121,8 @@ TEST_P(LosslessTestLarge, TestLossLessEncodingCtrl) {
EXPECT_GE(psnr_lossless, kMaxPsnr); EXPECT_GE(psnr_lossless, kMaxPsnr);
} }
VP9_INSTANTIATE_TEST_CASE(LosslessTestLarge, ALL_TEST_MODES); VP9_INSTANTIATE_TEST_CASE(LosslessTest,
::testing::Values(::libvpx_test::kRealTime,
::libvpx_test::kOnePassGood,
::libvpx_test::kTwoPassGood));
} // namespace } // namespace