commit 2d8faccd48fa40dd2a89bbba4dcd4a464841779d
author Ray Essick <essick@google.com> Wed Mar 23 13:52:40 2022 -0700
committer Ray Essick <essick@google.com> Wed Mar 23 16:56:04 2022 -0700
tree 25b01736c218ba484c1dcc2611ff0959ca9ba92f
parent f46dc239b58739d7faa0c564978cebab6a20e331

Dont test MediaFormat.KEY_MAX_OUTPUT_CHANNEL_COUNT before Android T

Bug: 226424823
Test: atest android.media.decoder.cts.DecoderTestAacFormat
Test: mts-tradefed run commandAndExit mts -m CtsMediaDecoderTestCases -t
Test: android.media.decoder.cts.DecoderTestAacFormat (on R devices)
Change-Id: I3f901a28cd8d04a6c05710a937701efa3254b856

tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTestAacFormat.java

diff --git a/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTestAacFormat.java b/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTestAacFormat.java
index 801ffd2..f001cf0 100644
--- a/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTestAacFormat.java
+++ b/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTestAacFormat.java
@@ -53,6 +53,9 @@
     static final String mInpPrefix = WorkDir.getMediaDirString();
     private static final boolean sIsAndroidRAndAbove =
             ApiLevelUtil.isAtLeast(Build.VERSION_CODES.R);
+    // TODO: replace > Sv2 with >= T once T is assigned.
+    private static final boolean sIsAtLeastT =
+            ApiLevelUtil.isAfter(Build.VERSION_CODES.S_V2);
 
     @Before
     public void setUp() throws Exception {
@@ -95,24 +98,29 @@
                 assertEquals("Number of channels differs for codec:" + codecName
                                 + " when downmixing with KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT",
                         2, aacDownmixParams.getNumChannels());
-                // - with codec-agnostic key
-                AudioParameter downmixParams = new AudioParameter();
-                decodeUpdateFormat(codecName, (String) sample[0] /* resource */, downmixParams,
-                        2 /*stereo downmix*/,
-                        MediaFormat.KEY_MAX_OUTPUT_CHANNEL_COUNT);
-                assertEquals("Number of channels differs for codec:" + codecName
-                                + " when downmixing with KEY_MAX_OUTPUT_CHANNEL_COUNT",
-                        2, downmixParams.getNumChannels());
 
-                // verify setting value larger than actual channel count behaves like no downmixing
-                AudioParameter bigChanParams = new AudioParameter();
-                final int tooManyChannels = ((Integer) sample[1]).intValue() + 99;
-                decodeUpdateFormat(codecName, (String) sample[0] /*resource*/, bigChanParams,
-                        tooManyChannels, MediaFormat.KEY_MAX_OUTPUT_CHANNEL_COUNT);
-                assertEquals("Number of channels differs for codec:" + codecName
-                                + " when setting " + tooManyChannels
-                                + " on KEY_MAX_OUTPUT_CHANNEL_COUNT",
-                        sample[1], bigChanParams.getNumChannels());
+                if (sIsAtLeastT) {
+                    // KEY_MAX)OUTPUT_CHANNEL_COUNT introduced in T
+                    // - with codec-agnostic key
+                    AudioParameter downmixParams = new AudioParameter();
+                    decodeUpdateFormat(codecName, (String) sample[0] /* resource */, downmixParams,
+                            2 /*stereo downmix*/,
+                            MediaFormat.KEY_MAX_OUTPUT_CHANNEL_COUNT);
+                    assertEquals("Number of channels differs for codec:" + codecName
+                                    + " when downmixing with KEY_MAX_OUTPUT_CHANNEL_COUNT",
+                            2, downmixParams.getNumChannels());
+
+                    // verify setting value larger than actual channel count behaves like
+                    // no downmixing
+                    AudioParameter bigChanParams = new AudioParameter();
+                    final int tooManyChannels = ((Integer) sample[1]).intValue() + 99;
+                    decodeUpdateFormat(codecName, (String) sample[0] /*resource*/, bigChanParams,
+                            tooManyChannels, MediaFormat.KEY_MAX_OUTPUT_CHANNEL_COUNT);
+                    assertEquals("Number of channels differs for codec:" + codecName
+                                    + " when setting " + tooManyChannels
+                                    + " on KEY_MAX_OUTPUT_CHANNEL_COUNT",
+                            sample[1], bigChanParams.getNumChannels());
+                }
             }
         }
     }