loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove redundant constant definition

Browse Source 
PiperOrigin-RevId: 472522846
(cherry picked from commit c401fb9771454e48b2b7eddba281ddda0ca5e398)
This commit is contained in:
claincly 2022-09-06 19:06:17 +00:00 committed by microkatz
parent 1b3aecde5a
commit 17cc7b59b8
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java
View File

@ -46,14 +46,6 @@ import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class EncoderCapabilityAnalysisTest { 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_FORMAT_STRING = "%dx%d@%dfps:%dkbps";
private static final String CAMCORDER_TIMELAPSE_FORMAT_STRING = "timelapse_%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"; private static final String CAMCORDER_HIGH_SPEED_FORMAT_STRING = "highspeed_%dx%d@%dfps:%dkbps";
@ -162,13 +154,16 @@ public class EncoderCapabilityAnalysisTest {
capabilities.put( capabilities.put(
"supports_hdr_editing", "supports_hdr_editing",
Util.SDK_INT >= 33 Util.SDK_INT >= 33
&& EncoderUtil.isFeatureSupported(encoderInfo, mimeType, FEATURE_HdrEditing)); && EncoderUtil.isFeatureSupported(
encoderInfo, mimeType, MediaCodecInfo.CodecCapabilities.FEATURE_HdrEditing));
capabilities.put( capabilities.put(
"supports_encoding_statistics", "supports_encoding_statistics",
Util.SDK_INT >= 33 Util.SDK_INT >= 33
&& EncoderUtil.isFeatureSupported( && EncoderUtil.isFeatureSupported(
encoderInfo, mimeType, FEATURE_EncodingStatistics)); encoderInfo,
mimeType,
MediaCodecInfo.CodecCapabilities.FEATURE_EncodingStatistics));
encoderCapabilitiesForMimeType.add(capabilities); encoderCapabilitiesForMimeType.add(capabilities);
} }