From c510ab81bb99d76dddd9cccc916e107fa2e28ad9 Mon Sep 17 00:00:00 2001 From: tonihei Date: Mon, 15 Jul 2024 02:42:55 -0700 Subject: [PATCH] Update compileSdk to 35 This should have no influence on app behavior and other policies and just allows code to depend on new API 35 platform symbols. PiperOrigin-RevId: 652414026 --- constants.gradle | 2 +- .../media3/exoplayer/audio/MediaCodecAudioRenderer.java | 6 ++---- .../media3/exoplayer/video/MediaCodecVideoRenderer.java | 6 ++---- .../androidx/media3/transformer/DefaultDecoderFactory.java | 4 +--- .../androidx/media3/transformer/DefaultEncoderFactory.java | 4 +--- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/constants.gradle b/constants.gradle index 2e0070ba32..e8b33ab3e8 100644 --- a/constants.gradle +++ b/constants.gradle @@ -21,7 +21,7 @@ project.ext { // Upgrading this requires [Internal ref: b/193254928] to be fixed, or some // additional robolectric config. targetSdkVersion = 30 - compileSdkVersion = 34 + compileSdkVersion = 35 dexmakerVersion = '2.28.3' // Use the same JUnit version as the Android repo: // https://cs.android.com/android/platform/superproject/main/+/main:external/junit/METADATA diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java index fe06d0ef2e..84bdc6202e 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java @@ -969,8 +969,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media mediaFormat.setInteger(MediaFormat.KEY_MAX_OUTPUT_CHANNEL_COUNT, 99); } if (Util.SDK_INT >= 35) { - // TODO: b/333552477 - Use MediaFormat.KEY_IMPORTANCE once compileSdk >= 35 - mediaFormat.setInteger("importance", max(0, -rendererPriority)); + mediaFormat.setInteger(MediaFormat.KEY_IMPORTANCE, max(0, -rendererPriority)); } return mediaFormat; } @@ -983,8 +982,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media } if (Util.SDK_INT >= 35) { Bundle codecParameters = new Bundle(); - // TODO: b/333552477 - Use MediaFormat.KEY_IMPORTANCE once compileSdk >= 35 - codecParameters.putInt("importance", max(0, -rendererPriority)); + codecParameters.putInt(MediaFormat.KEY_IMPORTANCE, max(0, -rendererPriority)); codec.setParameters(codecParameters); } } diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java index 1635c2585c..4f9d6b5ef4 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java @@ -1883,8 +1883,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer } if (Util.SDK_INT >= 35) { Bundle codecParameters = new Bundle(); - // TODO: b/333552477 - Use MediaFormat.KEY_IMPORTANCE once compileSdk >= 35 - codecParameters.putInt("importance", max(0, -rendererPriority)); + codecParameters.putInt(MediaFormat.KEY_IMPORTANCE, max(0, -rendererPriority)); codec.setParameters(codecParameters); } } @@ -2020,8 +2019,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer configureTunnelingV21(mediaFormat, tunnelingAudioSessionId); } if (Util.SDK_INT >= 35) { - // TODO: b/333552477 - Use MediaFormat.KEY_IMPORTANCE once compileSdk >= 35 - mediaFormat.setInteger("importance", max(0, -rendererPriority)); + mediaFormat.setInteger(MediaFormat.KEY_IMPORTANCE, max(0, -rendererPriority)); } return mediaFormat; } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java index cb021a7ff6..c34ef22eaf 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java @@ -241,9 +241,7 @@ public final class DefaultDecoderFactory implements Codec.DecoderFactory { } if (SDK_INT >= 35) { - // TODO: b/333552477 - Redefinition of MediaFormat.KEY_IMPORTANCE, remove after API35 is - // released. - mediaFormat.setInteger("importance", max(0, -codecPriority)); + mediaFormat.setInteger(MediaFormat.KEY_IMPORTANCE, max(0, -codecPriority)); } return createCodecForMediaFormat( diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java index 58301168e6..aeaafe966a 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java @@ -360,9 +360,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { } if (Util.SDK_INT >= 35) { - // TODO: b/333552477 - Redefinition of MediaFormat.KEY_IMPORTANCE, remove after API35 is - // released. - mediaFormat.setInteger("importance", max(0, -codecPriority)); + mediaFormat.setInteger(MediaFormat.KEY_IMPORTANCE, max(0, -codecPriority)); } return new DefaultCodec(