diff options
| author | Android Merger <noreply-android-build-merger@google.com> | 2019-09-30 10:17:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-30 10:17:48 +0000 |
| commit | b8a4480a1ceae631fa2c7d299237463452f377ea (patch) | |
| tree | e3eb91b9265443bec060bf89119feeaaa22f5f68 | |
| parent | a5743b1dea4c0d1b0f6047496ff993f0e99571eb (diff) | |
| parent | 3470b8b6da484241a7e17b5672b3bb1b359ecf9d (diff) | |
| download | cts-b8a4480a1ceae631fa2c7d299237463452f377ea.tar.gz | |
Merge "Merge "Skip to check H.265 HEVC decoding support for automotive devices." into oreo-mr1-cts-dev am: a1bdd435e5" into pie-cts-dev
| -rw-r--r-- | tests/tests/media/src/android/media/cts/MediaCodecListTest.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/tests/media/src/android/media/cts/MediaCodecListTest.java b/tests/tests/media/src/android/media/cts/MediaCodecListTest.java index 311c7914912..c08511774fb 100644 --- a/tests/tests/media/src/android/media/cts/MediaCodecListTest.java +++ b/tests/tests/media/src/android/media/cts/MediaCodecListTest.java @@ -306,6 +306,11 @@ public class MediaCodecListTest extends AndroidTestCase { && !pm.hasSystemFeature(pm.FEATURE_TELEVISION); } + private boolean isAutomotive() { + PackageManager pm = getContext().getPackageManager(); + return pm.hasSystemFeature(pm.FEATURE_AUTOMOTIVE); + } + // Find whether the given codec can be found using MediaCodecList.find methods. private boolean codecCanBeFound(boolean isEncoder, MediaFormat format) { String codecName = isEncoder @@ -399,7 +404,11 @@ public class MediaCodecListTest extends AndroidTestCase { list.add(new VideoCodec(MediaFormat.MIMETYPE_VIDEO_VP8, false)); // vp8 decoder list.add(new VideoCodec(MediaFormat.MIMETYPE_VIDEO_VP8, true)); // vp8 encoder list.add(new VideoCodec(MediaFormat.MIMETYPE_VIDEO_VP9, false)); // vp9 decoder - list.add(new VideoCodec(MediaFormat.MIMETYPE_VIDEO_HEVC, false)); // hevc decoder + + //According to CDD, hevc decoding is not mandatory for automotive devices + if (!isAutomotive()) { + list.add(new VideoCodec(MediaFormat.MIMETYPE_VIDEO_HEVC, false)); // hevc decoder + } list.add(new VideoCodec(MediaFormat.MIMETYPE_VIDEO_MPEG4, false)); // m4v decoder list.add(new VideoCodec(MediaFormat.MIMETYPE_VIDEO_H263, false)); // h263 decoder if (hasCamera()) { |