diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-09-30 09:57:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-30 09:57:29 +0000 |
| commit | a1bdd435e5ecc2bc5a58268bfe01b69c6d1b9d8c (patch) | |
| tree | 1b7d95f27767668ea3e023dbab24cc0399341acf | |
| parent | 74b978ace18b7f67de9af6487e66e09b025e3d46 (diff) | |
| parent | cbf028ecce710e3a7c8d5011da9bb63fa26d13fb (diff) | |
| download | cts-a1bdd435e5ecc2bc5a58268bfe01b69c6d1b9d8c.tar.gz | |
Merge "Skip to check H.265 HEVC decoding support for automotive devices." into oreo-mr1-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 987d365ca76..2104118bcd1 100644 --- a/tests/tests/media/src/android/media/cts/MediaCodecListTest.java +++ b/tests/tests/media/src/android/media/cts/MediaCodecListTest.java @@ -302,6 +302,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 @@ -395,7 +400,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()) { |