Merge "Merge changes Id4e4a997,I523d727d,Ie842a567 into oreo-cts-dev am: 9f925e3128"
diff --git a/hostsidetests/media/bitstreams/app/src/android/media/cts/bitstreams/app/MediaBitstreamsDeviceSideTest.java b/hostsidetests/media/bitstreams/app/src/android/media/cts/bitstreams/app/MediaBitstreamsDeviceSideTest.java
index af0ae8d..e59e7a3 100644
--- a/hostsidetests/media/bitstreams/app/src/android/media/cts/bitstreams/app/MediaBitstreamsDeviceSideTest.java
+++ b/hostsidetests/media/bitstreams/app/src/android/media/cts/bitstreams/app/MediaBitstreamsDeviceSideTest.java
@@ -285,13 +285,19 @@
MediaExtractor ex = new MediaExtractor();
MediaCodec d = null;
try {
- MediaCodec decoder = d = MediaCodec.createByCodecName(name);
- ex.setDataSource(path);
- ex.selectTrack(0);
- ex.seekTo(0, MediaExtractor.SEEK_TO_NEXT_SYNC);
+ Future<MediaCodec> dec = mExecutorService.submit(new Callable<MediaCodec>() {
+ @Override
+ public MediaCodec call() throws Exception {
+ return MediaCodec.createByCodecName(name);
+ }
+ });
+ MediaCodec decoder = d = dec.get(1, TimeUnit.SECONDS);
Future<Boolean> conform = mExecutorService.submit(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
+ ex.setDataSource(path);
+ ex.selectTrack(0);
+ ex.seekTo(0, MediaExtractor.SEEK_TO_NEXT_SYNC);
return MediaUtils.verifyDecoder(decoder, ex, frameChecksums);
}
});
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv444BitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv444BitstreamsTest.java
deleted file mode 100644
index 0c16855..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv444BitstreamsTest.java
+++ /dev/null
@@ -1,36 +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.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class HevcYuv444BitstreamsTest extends MediaBitstreamsTest {
-
- @Parameters(name = "{1}")
- public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("hevc/yuv444", BitstreamPackage.STANDARD);
- }
-
- public HevcYuv444BitstreamsTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
- }
-
-}
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 9da57f3..cb21724 100644
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/MediaBitstreamsTest.java
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/MediaBitstreamsTest.java
@@ -428,7 +428,8 @@
device.pushString(getBitstreamsListString(), mBitstreamsListTxt);
return true;
} catch (RuntimeException e) {
- CLog.e("Error parsing report; saving report to %s", device.pullFile(reportPath));
+ File hostFile = reportPath == null ? null : device.pullFile(reportPath);
+ CLog.e("Error parsing report; saving report to %s", hostFile);
CLog.e(e);
return false;
}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv444BitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv444BitstreamsTest.java
deleted file mode 100644
index c226173..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv444BitstreamsTest.java
+++ /dev/null
@@ -1,36 +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.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class Vp9Yuv444BitstreamsTest extends MediaBitstreamsTest {
-
- @Parameters(name = "{1}")
- public static Iterable<Object[]> bitstreams() {
- return MediaBitstreamsTest.bitstreams("vp9/yuv444", BitstreamPackage.STANDARD);
- }
-
- public Vp9Yuv444BitstreamsTest(String prefix, String path,
- BitstreamPackage pkg, BitstreamPackage packageToRun) {
- super(prefix, path, pkg, packageToRun);
- }
-
-}