Commit 086c9db8 authored by Alex Converse's avatar Alex Converse

Remove "Large" from most of AV1FrameSizeTests

The only test here that is truly Large is ValidSizes (now
LargeValidSizes)

Change-Id: If0893aad78a666f3db0581a79d6161cc8929a996
parent 56ba91bb
......@@ -15,12 +15,12 @@
namespace {
class AV1FrameSizeTestsLarge : public ::libaom_test::EncoderTest,
public ::testing::Test {
class AV1FrameSizeTests : public ::libaom_test::EncoderTest,
public ::testing::Test {
protected:
AV1FrameSizeTestsLarge()
AV1FrameSizeTests()
: EncoderTest(&::libaom_test::kAV1), expected_res_(AOM_CODEC_OK) {}
virtual ~AV1FrameSizeTestsLarge() {}
virtual ~AV1FrameSizeTests() {}
virtual void SetUp() {
InitializeConfig();
......@@ -46,7 +46,7 @@ class AV1FrameSizeTestsLarge : public ::libaom_test::EncoderTest,
int expected_res_;
};
TEST_F(AV1FrameSizeTestsLarge, TestInvalidSizes) {
TEST_F(AV1FrameSizeTests, TestInvalidSizes) {
::libaom_test::RandomVideoSource video;
#if CONFIG_SIZE_LIMIT
......@@ -57,7 +57,7 @@ TEST_F(AV1FrameSizeTestsLarge, TestInvalidSizes) {
#endif
}
TEST_F(AV1FrameSizeTestsLarge, ValidSizes) {
TEST_F(AV1FrameSizeTests, LargeValidSizes) {
::libaom_test::RandomVideoSource video;
#if CONFIG_SIZE_LIMIT
......@@ -84,7 +84,13 @@ TEST_F(AV1FrameSizeTestsLarge, ValidSizes) {
#endif
}
TEST_F(AV1FrameSizeTestsLarge, OneByOneVideo) {
#if CONFIG_LOOP_RESTORATION
// https://bugs.chromium.org/p/aomedia/issues/detail?id=312
#define ONE_BY_ONE_VIDEO_NAME DISABLED_OneByOneVideo
#else
#define ONE_BY_ONE_VIDEO_NAME OneByOneVideo
#endif
TEST_F(AV1FrameSizeTests, ONE_BY_ONE_VIDEO_NAME) {
::libaom_test::RandomVideoSource video;
video.SetSize(1, 1);
......@@ -92,4 +98,5 @@ TEST_F(AV1FrameSizeTestsLarge, OneByOneVideo) {
expected_res_ = AOM_CODEC_OK;
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
}
#undef ONE_BY_ONE_VIDEO_NAME
} // 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