From 17cc7b59b831c44f447eb66a46ba9c6fce3b04e7 Mon Sep 17 00:00:00 2001 From: claincly Date: Tue, 6 Sep 2022 19:06:17 +0000 Subject: [PATCH] Remove redundant constant definition PiperOrigin-RevId: 472522846 (cherry picked from commit c401fb9771454e48b2b7eddba281ddda0ca5e398) --- .../analysis/EncoderCapabilityAnalysisTest.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java index a1bd9d255d..45546a0409 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java @@ -46,14 +46,6 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class EncoderCapabilityAnalysisTest { - // TODO(b/228167357): Remove after bumping compileApiVersion to 33. - /** Re-definition of {@code MediaCodecInfo.CodecCapabilities.FEATURE_HdrEditing} in API33. */ - private static final String FEATURE_HdrEditing = "hdr-editing"; - /** - * Re-definition of {@code MediaCodecInfo.CodecCapabilities.FEATURE_EncodingStatistics} in API33. - */ - private static final String FEATURE_EncodingStatistics = "encoding-statistics"; - private static final String CAMCORDER_FORMAT_STRING = "%dx%d@%dfps:%dkbps"; private static final String CAMCORDER_TIMELAPSE_FORMAT_STRING = "timelapse_%dx%d@%dfps:%dkbps"; private static final String CAMCORDER_HIGH_SPEED_FORMAT_STRING = "highspeed_%dx%d@%dfps:%dkbps"; @@ -162,13 +154,16 @@ public class EncoderCapabilityAnalysisTest { capabilities.put( "supports_hdr_editing", Util.SDK_INT >= 33 - && EncoderUtil.isFeatureSupported(encoderInfo, mimeType, FEATURE_HdrEditing)); + && EncoderUtil.isFeatureSupported( + encoderInfo, mimeType, MediaCodecInfo.CodecCapabilities.FEATURE_HdrEditing)); capabilities.put( "supports_encoding_statistics", Util.SDK_INT >= 33 && EncoderUtil.isFeatureSupported( - encoderInfo, mimeType, FEATURE_EncodingStatistics)); + encoderInfo, + mimeType, + MediaCodecInfo.CodecCapabilities.FEATURE_EncodingStatistics)); encoderCapabilitiesForMimeType.add(capabilities); }