diff options
Diffstat (limited to 'tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTest.java')
| -rw-r--r-- | tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTest.java | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTest.java b/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTest.java index b6d428327f8..4721f8bc829 100644 --- a/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTest.java +++ b/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTest.java @@ -109,9 +109,9 @@ public class DecoderTest extends MediaTestBase { private static final String TAG = "DecoderTest"; private static final String REPORT_LOG_NAME = "CtsMediaDecoderTestCases"; - private static final int BOARD_SDK_LEVEL = - SystemProperties.getInt("ro.board.api_level", Build.VERSION_CODES.CUR_DEVELOPMENT); - public static final boolean IS_BOARD_AT_LEAST_S = BOARD_SDK_LEVEL >= Build.VERSION_CODES.S; + public static final boolean WAS_LAUNCHED_ON_S_OR_LATER = + SystemProperties.getInt("ro.board.first_api_level", Build.VERSION_CODES.CUR_DEVELOPMENT) + >= Build.VERSION_CODES.S; private static boolean IS_AT_LEAST_R = ApiLevelUtil.isAtLeast(Build.VERSION_CODES.R); private static boolean IS_BEFORE_S = ApiLevelUtil.isBefore(Build.VERSION_CODES.S); @@ -3531,7 +3531,8 @@ public class DecoderTest extends MediaTestBase { @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S) public void testTunneledVideoPeekOnHevc() throws Exception { // Requires vendor support of the TUNNEL_PEEK feature - Assume.assumeTrue("Board API level is not Android 12 or later.", IS_BOARD_AT_LEAST_S); + Assume.assumeTrue("First board API level is not Android 12 or later.", + WAS_LAUNCHED_ON_S_OR_LATER); testTunneledVideoPeekOn(MediaFormat.MIMETYPE_VIDEO_HEVC, "video_1280x720_mkv_h265_500kbps_25fps_aac_stereo_128kbps_44100hz.mkv", 25); } @@ -3544,7 +3545,8 @@ public class DecoderTest extends MediaTestBase { @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S) public void testTunneledVideoPeekOnAvc() throws Exception { // Requires vendor support of the TUNNEL_PEEK feature - Assume.assumeTrue("Board API level is not Android 12 or later.", IS_BOARD_AT_LEAST_S); + Assume.assumeTrue("First board API level is not Android 12 or later.", + WAS_LAUNCHED_ON_S_OR_LATER); testTunneledVideoPeekOn(MediaFormat.MIMETYPE_VIDEO_AVC, "video_480x360_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4", 25); } @@ -3557,7 +3559,8 @@ public class DecoderTest extends MediaTestBase { @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S) public void testTunneledVideoPeekOnVp9() throws Exception { // Requires vendor support of the TUNNEL_PEEK feature - Assume.assumeTrue("Board API level is not Android 12 or later.", IS_BOARD_AT_LEAST_S); + Assume.assumeTrue("First board API level is not Android 12 or later.", + WAS_LAUNCHED_ON_S_OR_LATER); testTunneledVideoPeekOn(MediaFormat.MIMETYPE_VIDEO_VP9, "bbb_s1_640x360_webm_vp9_0p21_1600kbps_30fps_vorbis_stereo_128kbps_48000hz.webm", 30); @@ -3629,7 +3632,8 @@ public class DecoderTest extends MediaTestBase { @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S) public void testTunneledVideoPeekOffHevc() throws Exception { // Requires vendor support of the TUNNEL_PEEK feature - Assume.assumeTrue("Board API level is not Android 12 or later.", IS_BOARD_AT_LEAST_S); + Assume.assumeTrue("First board API level is not Android 12 or later.", + WAS_LAUNCHED_ON_S_OR_LATER); testTunneledVideoPeekOff(MediaFormat.MIMETYPE_VIDEO_HEVC, "video_1280x720_mkv_h265_500kbps_25fps_aac_stereo_128kbps_44100hz.mkv", 25); } @@ -3642,7 +3646,8 @@ public class DecoderTest extends MediaTestBase { @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S) public void testTunneledVideoPeekOffAvc() throws Exception { // Requires vendor support of the TUNNEL_PEEK feature - Assume.assumeTrue("Board API level is not Android 12 or later.", IS_BOARD_AT_LEAST_S); + Assume.assumeTrue("First board API level is not Android 12 or later.", + WAS_LAUNCHED_ON_S_OR_LATER); testTunneledVideoPeekOff(MediaFormat.MIMETYPE_VIDEO_AVC, "video_480x360_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4", 25); } @@ -3655,7 +3660,8 @@ public class DecoderTest extends MediaTestBase { @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S) public void testTunneledVideoPeekOffVp9() throws Exception { // Requires vendor support of the TUNNEL_PEEK feature - Assume.assumeTrue("Board API level is not Android 12 or later.", IS_BOARD_AT_LEAST_S); + Assume.assumeTrue("First board API level is not Android 12 or later.", + WAS_LAUNCHED_ON_S_OR_LATER); testTunneledVideoPeekOff(MediaFormat.MIMETYPE_VIDEO_VP9, "bbb_s1_640x360_webm_vp9_0p21_1600kbps_30fps_vorbis_stereo_128kbps_48000hz.webm", 30); |