Commit 8e7f37a8 authored by Jim Bankoski's avatar Jim Bankoski Committed by Gerrit Code Review
Browse files

Merge changes Icb5a23d5,I62daa593

* changes:
  vp9_lossless_test tests Renamed with suffix Large
  error_resilience_test renaming -> Suffix Large
parents 1ff4a5b3 be52c9da
......@@ -19,19 +19,20 @@ namespace {
const int kMaxErrorFrames = 12;
const int kMaxDroppableFrames = 12;
class ErrorResilienceTest : public ::libvpx_test::EncoderTest,
class ErrorResilienceTestLarge : public ::libvpx_test::EncoderTest,
public ::libvpx_test::CodecTestWithParam<libvpx_test::TestMode> {
protected:
ErrorResilienceTest() : EncoderTest(GET_PARAM(0)),
psnr_(0.0),
nframes_(0),
mismatch_psnr_(0.0),
mismatch_nframes_(0),
encoding_mode_(GET_PARAM(1)) {
ErrorResilienceTestLarge()
: EncoderTest(GET_PARAM(0)),
psnr_(0.0),
nframes_(0),
mismatch_psnr_(0.0),
mismatch_nframes_(0),
encoding_mode_(GET_PARAM(1)) {
Reset();
}
virtual ~ErrorResilienceTest() {}
virtual ~ErrorResilienceTestLarge() {}
void Reset() {
error_nframes_ = 0;
......@@ -144,7 +145,7 @@ class ErrorResilienceTest : public ::libvpx_test::EncoderTest,
libvpx_test::TestMode encoding_mode_;
};
TEST_P(ErrorResilienceTest, OnVersusOff) {
TEST_P(ErrorResilienceTestLarge, OnVersusOff) {
const vpx_rational timebase = { 33333333, 1000000000 };
cfg_.g_timebase = timebase;
cfg_.rc_target_bitrate = 2000;
......@@ -179,7 +180,7 @@ TEST_P(ErrorResilienceTest, OnVersusOff) {
// if we lose (i.e., drop before decoding) a set of droppable
// frames (i.e., frames that don't update any reference buffers).
// Check both isolated and consecutive loss.
TEST_P(ErrorResilienceTest, DropFramesWithoutRecovery) {
TEST_P(ErrorResilienceTestLarge, DropFramesWithoutRecovery) {
const vpx_rational timebase = { 33333333, 1000000000 };
cfg_.g_timebase = timebase;
cfg_.rc_target_bitrate = 500;
......@@ -235,7 +236,7 @@ TEST_P(ErrorResilienceTest, DropFramesWithoutRecovery) {
#endif
}
VP8_INSTANTIATE_TEST_CASE(ErrorResilienceTest, ONE_PASS_TEST_MODES);
VP9_INSTANTIATE_TEST_CASE(ErrorResilienceTest, ONE_PASS_TEST_MODES);
VP8_INSTANTIATE_TEST_CASE(ErrorResilienceTestLarge, ONE_PASS_TEST_MODES);
VP9_INSTANTIATE_TEST_CASE(ErrorResilienceTestLarge, ONE_PASS_TEST_MODES);
} // namespace
......@@ -19,16 +19,17 @@ namespace {
const int kMaxPsnr = 100;
class LossLessTest : public ::libvpx_test::EncoderTest,
class LosslessTestLarge : public ::libvpx_test::EncoderTest,
public ::libvpx_test::CodecTestWithParam<libvpx_test::TestMode> {
protected:
LossLessTest() : EncoderTest(GET_PARAM(0)),
psnr_(kMaxPsnr),
nframes_(0),
encoding_mode_(GET_PARAM(1)) {
LosslessTestLarge()
: EncoderTest(GET_PARAM(0)),
psnr_(kMaxPsnr),
nframes_(0),
encoding_mode_(GET_PARAM(1)) {
}
virtual ~LossLessTest() {}
virtual ~LosslessTestLarge() {}
virtual void SetUp() {
InitializeConfig();
......@@ -55,7 +56,7 @@ class LossLessTest : public ::libvpx_test::EncoderTest,
libvpx_test::TestMode encoding_mode_;
};
TEST_P(LossLessTest, TestLossLessEncoding) {
TEST_P(LosslessTestLarge, TestLossLessEncoding) {
const vpx_rational timebase = { 33333333, 1000000000 };
cfg_.g_timebase = timebase;
cfg_.rc_target_bitrate = 2000;
......@@ -73,7 +74,7 @@ TEST_P(LossLessTest, TestLossLessEncoding) {
EXPECT_GE(psnr_lossless, kMaxPsnr);
}
TEST_P(LossLessTest, TestLossLessEncoding444) {
TEST_P(LosslessTestLarge, TestLossLessEncoding444) {
libvpx_test::Y4mVideoSource video("rush_hour_444.y4m", 0, 10);
cfg_.g_profile = 1;
......@@ -90,5 +91,5 @@ TEST_P(LossLessTest, TestLossLessEncoding444) {
EXPECT_GE(psnr_lossless, kMaxPsnr);
}
VP9_INSTANTIATE_TEST_CASE(LossLessTest, ALL_TEST_MODES);
VP9_INSTANTIATE_TEST_CASE(LosslessTestLarge, ALL_TEST_MODES);
} // namespace
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment