From d327cb4795d916d373158b97cd4c1bfad51d7c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Tue, 16 Jan 2024 11:57:57 +0100 Subject: [PATCH] Code cleanup --- .../src/main/java/androidx/media3/common/util/Util.java | 6 +----- .../media3/exoplayer/mediacodec/MediaCodecInfo.java | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/libraries/common/src/main/java/androidx/media3/common/util/Util.java b/libraries/common/src/main/java/androidx/media3/common/util/Util.java index 0d6a892ad5..47b9508250 100644 --- a/libraries/common/src/main/java/androidx/media3/common/util/Util.java +++ b/libraries/common/src/main/java/androidx/media3/common/util/Util.java @@ -3210,7 +3210,7 @@ public final class Util { if (SDK_INT >= 23) { getDisplaySizeV23(display, displaySize); } else { - getDisplaySizeV17(display, displaySize); + display.getRealSize(displaySize); } return displaySize; } @@ -3696,10 +3696,6 @@ public final class Util { outSize.y = mode.getPhysicalHeight(); } - private static void getDisplaySizeV17(Display display, Point outSize) { - display.getRealSize(outSize); - } - private static String[] getSystemLocales() { Configuration config = Resources.getSystem().getConfiguration(); return SDK_INT >= 24 diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfo.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfo.java index 23031f3521..ffaefde146 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfo.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfo.java @@ -695,10 +695,6 @@ public final class MediaCodecInfo { } private static boolean isAdaptive(CodecCapabilities capabilities) { - return isAdaptiveV19(capabilities); - } - - private static boolean isAdaptiveV19(CodecCapabilities capabilities) { return capabilities.isFeatureSupported(CodecCapabilities.FEATURE_AdaptivePlayback); }