diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java index 870e5fdfd2e..fd693e82740 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java @@ -30,6 +30,7 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.TextureView; +import androidx.annotation.DoNotInline; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.media3.common.AudioAttributes; @@ -1879,6 +1880,7 @@ public Timeline getTimeline() { private static final class Api31 { private Api31() {} + @DoNotInline public static PlayerId createPlayerId() { // TODO: Create a MediaMetricsListener and obtain LogSessionId from it. return new PlayerId(LogSessionId.LOG_SESSION_ID_NONE); diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java index ceedeed8c2c..c6a57bd050c 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java @@ -28,6 +28,7 @@ import android.os.Handler; import android.os.SystemClock; import android.util.Pair; +import androidx.annotation.DoNotInline; import androidx.annotation.IntDef; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; @@ -2242,6 +2243,7 @@ public void clear() { private static final class Api31 { private Api31() {} + @DoNotInline public static void setLogSessionIdOnAudioTrack(AudioTrack audioTrack, PlayerId playerId) { LogSessionId logSessionId = playerId.getLogSessionId(); if (!logSessionId.equals(LogSessionId.LOG_SESSION_ID_NONE)) { diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java index 4eae9ad741c..b1cb3daac67 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java @@ -42,6 +42,7 @@ import android.os.SystemClock; import androidx.annotation.CallSuper; import androidx.annotation.CheckResult; +import androidx.annotation.DoNotInline; import androidx.annotation.IntDef; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; @@ -2433,6 +2434,7 @@ private static boolean codecNeedsMonoChannelCountWorkaround(String name, Format private static final class Api31 { private Api31() {} + @DoNotInline public static void setLogSessionIdToMediaCodecFormat( MediaCodecAdapter.Configuration codecConfiguration, PlayerId playerId) { LogSessionId logSessionId = playerId.getLogSessionId(); diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/MediaParserUtil.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/MediaParserUtil.java index 0363d561a27..6f1db58141d 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/MediaParserUtil.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/MediaParserUtil.java @@ -18,6 +18,7 @@ import android.media.MediaFormat; import android.media.MediaParser; import android.media.metrics.LogSessionId; +import androidx.annotation.DoNotInline; import androidx.annotation.RequiresApi; import androidx.media3.common.Format; import androidx.media3.common.util.UnstableApi; @@ -78,6 +79,7 @@ public static void setLogSessionIdOnMediaParser(MediaParser mediaParser, PlayerI private static final class Api31 { private Api31() {} + @DoNotInline public static void setLogSessionIdOnMediaParser(MediaParser mediaParser, PlayerId playerId) { LogSessionId logSessionId = playerId.getLogSessionId(); if (!logSessionId.equals(LogSessionId.LOG_SESSION_ID_NONE)) {