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 e4d1d2bce7..437062c570 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 @@ -16,6 +16,8 @@ package androidx.media3.exoplayer.video; import static android.view.Display.DEFAULT_DISPLAY; +import static androidx.media3.common.util.Assertions.checkNotNull; +import static androidx.media3.common.util.Assertions.checkState; import static androidx.media3.exoplayer.DecoderReuseEvaluation.DISCARD_REASON_MAX_INPUT_SIZE_EXCEEDED; import static androidx.media3.exoplayer.DecoderReuseEvaluation.DISCARD_REASON_VIDEO_MAX_RESOLUTION_EXCEEDED; import static androidx.media3.exoplayer.DecoderReuseEvaluation.REUSE_RESULT_NO; @@ -48,7 +50,6 @@ import androidx.media3.common.DrmInitData; import androidx.media3.common.Format; import androidx.media3.common.MimeTypes; import androidx.media3.common.VideoSize; -import androidx.media3.common.util.Assertions; import androidx.media3.common.util.Log; import androidx.media3.common.util.MediaFormatUtil; import androidx.media3.common.util.TraceUtil; @@ -532,7 +533,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { throws ExoPlaybackException { super.onEnabled(joining, mayRenderStartOfStream); boolean tunneling = getConfiguration().tunneling; - Assertions.checkState(!tunneling || tunnelingAudioSessionId != C.AUDIO_SESSION_ID_UNSET); + checkState(!tunneling || tunnelingAudioSessionId != C.AUDIO_SESSION_ID_UNSET); if (this.tunneling != tunneling) { this.tunneling = tunneling; releaseCodec(); @@ -894,10 +895,9 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { eventDispatcher.decoderInitialized(name, initializedTimestampMs, initializationDurationMs); codecNeedsSetOutputSurfaceWorkaround = codecNeedsSetOutputSurfaceWorkaround(name); codecHandlesHdr10PlusOutOfBandMetadata = - Assertions.checkNotNull(getCodecInfo()).isHdr10PlusOutOfBandMetadataSupported(); + checkNotNull(getCodecInfo()).isHdr10PlusOutOfBandMetadataSupported(); if (Util.SDK_INT >= 23 && tunneling) { - tunnelingOnFrameRenderedListener = - new OnFrameRenderedListenerV23(Assertions.checkNotNull(getCodec())); + tunnelingOnFrameRenderedListener = new OnFrameRenderedListenerV23(checkNotNull(getCodec())); } } @@ -955,7 +955,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { currentWidth = format.width; currentHeight = format.height; } else { - Assertions.checkNotNull(mediaFormat); + checkNotNull(mediaFormat); boolean hasCrop = mediaFormat.containsKey(KEY_CROP_RIGHT) && mediaFormat.containsKey(KEY_CROP_LEFT) @@ -995,7 +995,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { if (!codecHandlesHdr10PlusOutOfBandMetadata) { return; } - ByteBuffer data = Assertions.checkNotNull(buffer.supplementalData); + ByteBuffer data = checkNotNull(buffer.supplementalData); if (data.remaining() >= 7) { // Check for HDR10+ out-of-band metadata. See User_data_registered_itu_t_t35 in ST 2094-40. byte ituTT35CountryCode = data.get(); @@ -1033,7 +1033,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { boolean isLastBuffer, Format format) throws ExoPlaybackException { - Assertions.checkNotNull(codec); // Can not render video without codec + checkNotNull(codec); // Can not render video without codec if (initialPositionUs == C.TIME_UNSET) { initialPositionUs = positionUs;