Revert "CtsMediaBitstreamsTestCases: bitstreams package via annotation"
This reverts commit 6ca2a7dded89d14f7f937d3c2ed01960b2f0ba66.
Bug: 64342361
Change-Id: I3db25eb76327dae3cc0cb6cdb22f8d7d2af98703
diff --git a/hostsidetests/media/bitstreams/AndroidTest.xml b/hostsidetests/media/bitstreams/AndroidTest.xml
index 21b59cd..71c8519 100644
--- a/hostsidetests/media/bitstreams/AndroidTest.xml
+++ b/hostsidetests/media/bitstreams/AndroidTest.xml
@@ -25,11 +25,8 @@
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsMediaBitstreamsTestCases.jar" />
- <option name="runtime-hint" value="5h6m" />
+ <option name="runtime-hint" value="4h50m" />
<!-- shard-unit must be class -->
<option name="shard-unit" value="class" />
- <!-- remove exclude-annotation option and use include-annotation
- android.media.cts.bitstreams.FullPackage instead to run full package -->
- <option name="exclude-annotation" value="android.media.cts.bitstreams.FullPackage" />
</test>
</configuration>
diff --git a/hostsidetests/media/bitstreams/common/src/android/media/cts/bitstreams/MediaBitstreams.java b/hostsidetests/media/bitstreams/common/src/android/media/cts/bitstreams/MediaBitstreams.java
index 13b70a5..774e5be 100644
--- a/hostsidetests/media/bitstreams/common/src/android/media/cts/bitstreams/MediaBitstreams.java
+++ b/hostsidetests/media/bitstreams/common/src/android/media/cts/bitstreams/MediaBitstreams.java
@@ -60,7 +60,6 @@
public static final String DYNAMIC_CONFIG_ENTRY = "entry";
public static final String DYNAMIC_CONFIG_KEY = "key";
public static final String DYNAMIC_CONFIG_VALUE = "value";
- public static final String DYNAMIC_CONFIG_PACKAGE = "package";
/* utilities */
/**
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/FullPackage.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/FullPackage.java
deleted file mode 100644
index 376cb8a..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/FullPackage.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package android.media.cts.bitstreams;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface FullPackage {
-
-}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitBpBitstreamsFullTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitBpBitstreamsFullTest.java
deleted file mode 100644
index 457c636..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitBpBitstreamsFullTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.cts.bitstreams;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@FullPackage
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class H264Yuv420_8bitBpBitstreamsFullTest extends MediaBitstreamsTest {
-
- @Parameters(name = "{1}")
- public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("h264/yuv420/8bit/bp", BitstreamPackage.FULL);
- }
-
- public H264Yuv420_8bitBpBitstreamsFullTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
- }
-
- @Test
- @Override
- @FullPackage
- public void testBitstreamsConformance() {
- super.testBitstreamsConformance();
- }
-}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitBpBitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitBpBitstreamsTest.java
index 78cd436..b1a1c05 100644
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitBpBitstreamsTest.java
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitBpBitstreamsTest.java
@@ -25,12 +25,11 @@
@Parameters(name = "{1}")
public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("h264/yuv420/8bit/bp", BitstreamPackage.STANDARD);
+ return MediaBitstreamsTest.bitstreams("h264/yuv420/8bit/bp");
}
- public H264Yuv420_8bitBpBitstreamsTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
+ public H264Yuv420_8bitBpBitstreamsTest(String prefix, String path) {
+ super(prefix, path);
}
}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitHpBitstreamsFullTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitHpBitstreamsFullTest.java
deleted file mode 100644
index 606a169..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitHpBitstreamsFullTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.cts.bitstreams;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@FullPackage
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class H264Yuv420_8bitHpBitstreamsFullTest extends MediaBitstreamsTest {
-
- @Parameters(name = "{1}")
- public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("h264/yuv420/8bit/hp", BitstreamPackage.FULL);
- }
-
- public H264Yuv420_8bitHpBitstreamsFullTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
- }
-
- @Test
- @Override
- @FullPackage
- public void testBitstreamsConformance() {
- super.testBitstreamsConformance();
- }
-}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitHpBitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitHpBitstreamsTest.java
index 792fa5e..4d4d1cb 100644
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitHpBitstreamsTest.java
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitHpBitstreamsTest.java
@@ -25,12 +25,11 @@
@Parameters(name = "{1}")
public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("h264/yuv420/8bit/hp", BitstreamPackage.STANDARD);
+ return MediaBitstreamsTest.bitstreams("h264/yuv420/8bit/hp");
}
- public H264Yuv420_8bitHpBitstreamsTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
+ public H264Yuv420_8bitHpBitstreamsTest(String prefix, String path) {
+ super(prefix, path);
}
}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitMpBitstreamsFullTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitMpBitstreamsFullTest.java
deleted file mode 100644
index ebacc3c..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitMpBitstreamsFullTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.cts.bitstreams;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@FullPackage
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class H264Yuv420_8bitMpBitstreamsFullTest extends MediaBitstreamsTest {
-
- @Parameters(name = "{1}")
- public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("h264/yuv420/8bit/mp", BitstreamPackage.FULL);
- }
-
- public H264Yuv420_8bitMpBitstreamsFullTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
- }
-
- @Test
- @Override
- @FullPackage
- public void testBitstreamsConformance() {
- super.testBitstreamsConformance();
- }
-}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitMpBitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitMpBitstreamsTest.java
index ce80c96..baa10c1 100644
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitMpBitstreamsTest.java
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/H264Yuv420_8bitMpBitstreamsTest.java
@@ -25,12 +25,11 @@
@Parameters(name = "{1}")
public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("h264/yuv420/8bit/mp", BitstreamPackage.STANDARD);
+ return MediaBitstreamsTest.bitstreams("h264/yuv420/8bit/mp");
}
- public H264Yuv420_8bitMpBitstreamsTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
+ public H264Yuv420_8bitMpBitstreamsTest(String prefix, String path) {
+ super(prefix, path);
}
}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv400BitstreamsFullTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv400BitstreamsFullTest.java
deleted file mode 100644
index 59ba131..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv400BitstreamsFullTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.cts.bitstreams;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@FullPackage
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class HevcYuv400BitstreamsFullTest extends MediaBitstreamsTest {
-
- @Parameters(name = "{1}")
- public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("hevc/yuv400", BitstreamPackage.FULL);
- }
-
- public HevcYuv400BitstreamsFullTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
- }
-
- @Test
- @Override
- @FullPackage
- public void testBitstreamsConformance() {
- super.testBitstreamsConformance();
- }
-}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv400BitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv400BitstreamsTest.java
index 68903cf..87a045c 100644
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv400BitstreamsTest.java
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv400BitstreamsTest.java
@@ -25,12 +25,11 @@
@Parameters(name = "{1}")
public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("hevc/yuv400", BitstreamPackage.STANDARD);
+ return MediaBitstreamsTest.bitstreams("hevc/yuv400");
}
- public HevcYuv400BitstreamsTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
+ public HevcYuv400BitstreamsTest(String prefix, String path) {
+ super(prefix, path);
}
}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv420BitstreamsFullTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv420BitstreamsFullTest.java
deleted file mode 100644
index 1680ff2..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv420BitstreamsFullTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.cts.bitstreams;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@FullPackage
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class HevcYuv420BitstreamsFullTest extends MediaBitstreamsTest {
-
- @Parameters(name = "{1}")
- public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("hevc/yuv420", BitstreamPackage.FULL);
- }
-
- public HevcYuv420BitstreamsFullTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
- }
-
- @Test
- @Override
- @FullPackage
- public void testBitstreamsConformance() {
- super.testBitstreamsConformance();
- }
-}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv420BitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv420BitstreamsTest.java
index 0fd0c3c..189b368 100644
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv420BitstreamsTest.java
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv420BitstreamsTest.java
@@ -25,12 +25,11 @@
@Parameters(name = "{1}")
public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("hevc/yuv420", BitstreamPackage.STANDARD);
+ return MediaBitstreamsTest.bitstreams("hevc/yuv420");
}
- public HevcYuv420BitstreamsTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
+ public HevcYuv420BitstreamsTest(String prefix, String path) {
+ super(prefix, path);
}
}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv422BitstreamsFullTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv422BitstreamsFullTest.java
deleted file mode 100644
index ee7a683..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv422BitstreamsFullTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.cts.bitstreams;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@FullPackage
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class HevcYuv422BitstreamsFullTest extends MediaBitstreamsTest {
-
- @Parameters(name = "{1}")
- public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("hevc/yuv422", BitstreamPackage.FULL);
- }
-
- public HevcYuv422BitstreamsFullTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
- }
-
- @Test
- @Override
- @FullPackage
- public void testBitstreamsConformance() {
- super.testBitstreamsConformance();
- }
-}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv422BitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv422BitstreamsTest.java
index 329932e..5cc0131 100644
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv422BitstreamsTest.java
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv422BitstreamsTest.java
@@ -25,12 +25,11 @@
@Parameters(name = "{1}")
public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("hevc/yuv422", BitstreamPackage.STANDARD);
+ return MediaBitstreamsTest.bitstreams("hevc/yuv422");
}
- public HevcYuv422BitstreamsTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
+ public HevcYuv422BitstreamsTest(String prefix, String path) {
+ super(prefix, path);
}
}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv444BitstreamsFullTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv444BitstreamsFullTest.java
deleted file mode 100644
index f167cb6..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv444BitstreamsFullTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.cts.bitstreams;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@FullPackage
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class HevcYuv444BitstreamsFullTest extends MediaBitstreamsTest {
-
- @Parameters(name = "{1}")
- public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("hevc/yuv444", BitstreamPackage.FULL);
- }
-
- public HevcYuv444BitstreamsFullTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
- }
-
- @Test
- @Override
- @FullPackage
- public void testBitstreamsConformance() {
- super.testBitstreamsConformance();
- }
-}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv444BitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv444BitstreamsTest.java
index 0c16855..38391b5 100644
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv444BitstreamsTest.java
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv444BitstreamsTest.java
@@ -25,12 +25,11 @@
@Parameters(name = "{1}")
public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("hevc/yuv444", BitstreamPackage.STANDARD);
+ return MediaBitstreamsTest.bitstreams("hevc/yuv444");
}
- public HevcYuv444BitstreamsTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
+ public HevcYuv444BitstreamsTest(String prefix, String path) {
+ super(prefix, path);
}
}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/MediaBitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/MediaBitstreamsTest.java
index 4c91e04..41cb5c9 100644
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/MediaBitstreamsTest.java
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/MediaBitstreamsTest.java
@@ -101,13 +101,11 @@
* Which subset of bitstreams to test
*/
enum BitstreamPackage {
+ SMALL,
STANDARD,
FULL,
}
- private BitstreamPackage mPackage = BitstreamPackage.FULL;
- private BitstreamPackage mPackageToRun = BitstreamPackage.STANDARD;
-
static class ConformanceEntry {
final String mPath, mCodecName, mStatus;
ConformanceEntry(String path, String codecName, String status) {
@@ -129,7 +127,7 @@
private IAbi mAbi;
private ITestDevice mDevice;
- static Collection<Object[]> bitstreams(String prefix, BitstreamPackage packageToRun) {
+ static Collection<Object[]> bitstreams(String prefix) {
final String dynConfXml = new File("/", MediaBitstreams.DYNAMIC_CONFIG_XML).toString();
try (InputStream is = MediaBitstreamsTest.class.getResourceAsStream(dynConfXml)) {
List<Object[]> entries = new ArrayList<>();
@@ -147,32 +145,7 @@
if (!bitstream.startsWith(prefix)) {
continue;
}
- while (parser.next() != XmlPullParser.END_DOCUMENT) {
- if (parser.getEventType() != XmlPullParser.START_TAG) {
- continue;
- }
- if (MediaBitstreams.DYNAMIC_CONFIG_VALUE.equals(parser.getName())) {
- parser.next();
- break;
- }
- }
- String format = parser.getText();
- String[] kvPairs = format.split(",");
- BitstreamPackage curPackage = BitstreamPackage.FULL;
- for (String kvPair : kvPairs) {
- String[] kv = kvPair.split("=");
- if (MediaBitstreams.DYNAMIC_CONFIG_PACKAGE.equals(kv[0])) {
- String packageName = kv[1];
- try {
- curPackage = BitstreamPackage.valueOf(packageName.toUpperCase());
- } catch (Exception e) {
- CLog.w(e);
- }
- }
- }
- if (curPackage.compareTo(packageToRun) <= 0) {
- entries.add(new Object[] {prefix, bitstream, curPackage, packageToRun});
- }
+ entries.add(new Object[] {prefix, bitstream});
}
return entries;
} catch (XmlPullParserException | IOException e) {
@@ -181,12 +154,9 @@
}
}
- public MediaBitstreamsTest(String prefix, String path, BitstreamPackage pkg, BitstreamPackage packageToRun
- ) {
+ public MediaBitstreamsTest(String prefix, String path) {
mPrefix = prefix;
mPath = path;
- mPackage = pkg;
- mPackageToRun = packageToRun;
}
@Override
@@ -450,7 +420,7 @@
device,
MediaBitstreams.K_TEST_GET_SUPPORTED_BITSTREAMS,
MediaBitstreams.KEY_SUPPORTED_BITSTREAMS_TXT);
- Collection<Object[]> bitstreams = bitstreams(mPrefix, mPackageToRun);
+ Collection<Object[]> bitstreams = bitstreams(mPrefix);
Set<String> supportedBitstreams = preparer.getSupportedBitstreams();
CLog.i("%d supported bitstreams under %s", supportedBitstreams.size(), prefix);
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp8BitstreamsFullTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp8BitstreamsFullTest.java
deleted file mode 100644
index 7755b4a..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp8BitstreamsFullTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.cts.bitstreams;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@FullPackage
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class Vp8BitstreamsFullTest extends MediaBitstreamsTest {
-
- @Parameters(name = "{1}")
- public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("vp8", BitstreamPackage.FULL);
- }
-
- public Vp8BitstreamsFullTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
- }
-
- @Test
- @Override
- @FullPackage
- public void testBitstreamsConformance() {
- super.testBitstreamsConformance();
- }
-}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp8BitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp8BitstreamsTest.java
index de05f93..e7a6cec 100644
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp8BitstreamsTest.java
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp8BitstreamsTest.java
@@ -25,12 +25,11 @@
@Parameters(name = "{1}")
public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("vp8", BitstreamPackage.STANDARD);
+ return MediaBitstreamsTest.bitstreams("vp8");
}
- public Vp8BitstreamsTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
+ public Vp8BitstreamsTest(String prefix, String path) {
+ super(prefix, path);
}
}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv420BitstreamsFullTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv420BitstreamsFullTest.java
deleted file mode 100644
index 747e3a9..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv420BitstreamsFullTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.cts.bitstreams;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@FullPackage
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class Vp9Yuv420BitstreamsFullTest extends MediaBitstreamsTest {
-
- @Parameters(name = "{1}")
- public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("vp9/yuv420", BitstreamPackage.FULL);
- }
-
- public Vp9Yuv420BitstreamsFullTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
- }
-
- @Test
- @Override
- @FullPackage
- public void testBitstreamsConformance() {
- super.testBitstreamsConformance();
- }
-}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv420BitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv420BitstreamsTest.java
index 76af826..dde31b8 100644
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv420BitstreamsTest.java
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv420BitstreamsTest.java
@@ -25,12 +25,11 @@
@Parameters(name = "{1}")
public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("vp9/yuv420", BitstreamPackage.STANDARD);
+ return MediaBitstreamsTest.bitstreams("vp9/yuv420");
}
- public Vp9Yuv420BitstreamsTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
+ public Vp9Yuv420BitstreamsTest(String prefix, String path) {
+ super(prefix, path);
}
}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv422BitstreamsFullTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv422BitstreamsFullTest.java
deleted file mode 100644
index 2856e36..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv422BitstreamsFullTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.cts.bitstreams;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@FullPackage
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class Vp9Yuv422BitstreamsFullTest extends MediaBitstreamsTest {
-
- @Parameters(name = "{1}")
- public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("vp9/yuv422", BitstreamPackage.FULL);
- }
-
- public Vp9Yuv422BitstreamsFullTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
- }
-
- @Test
- @Override
- @FullPackage
- public void testBitstreamsConformance() {
- super.testBitstreamsConformance();
- }
-}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv422BitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv422BitstreamsTest.java
index eeb465a..a04aca4 100644
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv422BitstreamsTest.java
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv422BitstreamsTest.java
@@ -25,12 +25,11 @@
@Parameters(name = "{1}")
public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("vp9/yuv422", BitstreamPackage.STANDARD);
+ return MediaBitstreamsTest.bitstreams("vp9/yuv422");
}
- public Vp9Yuv422BitstreamsTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
+ public Vp9Yuv422BitstreamsTest(String prefix, String path) {
+ super(prefix, path);
}
}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv444BitstreamsFullTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv444BitstreamsFullTest.java
deleted file mode 100644
index 46af097..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv444BitstreamsFullTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.cts.bitstreams;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@FullPackage
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class Vp9Yuv444BitstreamsFullTest extends MediaBitstreamsTest {
-
- @Parameters(name = "{1}")
- public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("vp9/yuv444", BitstreamPackage.FULL);
- }
-
- public Vp9Yuv444BitstreamsFullTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
- }
-
- @Test
- @Override
- @FullPackage
- public void testBitstreamsConformance() {
- super.testBitstreamsConformance();
- }
-}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv444BitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv444BitstreamsTest.java
index c226173..dadd1c9 100644
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv444BitstreamsTest.java
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv444BitstreamsTest.java
@@ -25,12 +25,11 @@
@Parameters(name = "{1}")
public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("vp9/yuv444", BitstreamPackage.STANDARD);
+ return MediaBitstreamsTest.bitstreams("vp9/yuv444");
}
- public Vp9Yuv444BitstreamsTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
+ public Vp9Yuv444BitstreamsTest(String prefix, String path) {
+ super(prefix, path);
}
}