diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 625741f3b2..00ad07766e 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -26,6 +26,8 @@ * Add `BasePreloadManager.Listener` to propagate preload events to apps. * Allow changing SNTP client timeout ([#1540](https://github.com/androidx/media/issues/1540)). + * Remove `MediaCodecAdapter.Configuration.flags` as the field was always + zero. * Transformer: * Add `SurfaceAssetLoader`, which supports queueing video data to Transformer via a `Surface`. diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/AsynchronousMediaCodecAdapter.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/AsynchronousMediaCodecAdapter.java index e2445b518a..ea1a31c013 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/AsynchronousMediaCodecAdapter.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/AsynchronousMediaCodecAdapter.java @@ -103,7 +103,7 @@ import java.nio.ByteBuffer; try { TraceUtil.beginSection("createCodec:" + codecName); codec = MediaCodec.createByCodecName(codecName); - int flags = configuration.flags; + int flags = 0; MediaCodecBufferEnqueuer bufferEnqueuer; if (enableSynchronousBufferQueueingWithAsyncCryptoFlag && useSynchronousBufferQueueingWithAsyncCryptoFlag(configuration.format)) { diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecAdapter.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecAdapter.java index 9a89bfd3a2..2184b28f0e 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecAdapter.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecAdapter.java @@ -57,8 +57,7 @@ public interface MediaCodecAdapter { MediaFormat mediaFormat, Format format, @Nullable MediaCrypto crypto) { - return new Configuration( - codecInfo, mediaFormat, format, /* surface= */ null, crypto, /* flags= */ 0); + return new Configuration(codecInfo, mediaFormat, format, /* surface= */ null, crypto); } /** @@ -77,7 +76,7 @@ public interface MediaCodecAdapter { Format format, @Nullable Surface surface, @Nullable MediaCrypto crypto) { - return new Configuration(codecInfo, mediaFormat, format, surface, crypto, /* flags= */ 0); + return new Configuration(codecInfo, mediaFormat, format, surface, crypto); } /** Information about the {@link MediaCodec} being configured. */ @@ -99,22 +98,17 @@ public interface MediaCodecAdapter { /** For DRM protected playbacks, a {@link MediaCrypto} to use for decryption. */ @Nullable public final MediaCrypto crypto; - /** See {@link MediaCodec#configure}. */ - public final int flags; - private Configuration( MediaCodecInfo codecInfo, MediaFormat mediaFormat, Format format, @Nullable Surface surface, - @Nullable MediaCrypto crypto, - int flags) { + @Nullable MediaCrypto crypto) { this.codecInfo = codecInfo; this.mediaFormat = mediaFormat; this.format = format; this.surface = surface; this.crypto = crypto; - this.flags = flags; } } diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/SynchronousMediaCodecAdapter.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/SynchronousMediaCodecAdapter.java index 9b9a707a39..02c01e9935 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/SynchronousMediaCodecAdapter.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/SynchronousMediaCodecAdapter.java @@ -50,10 +50,7 @@ public final class SynchronousMediaCodecAdapter implements MediaCodecAdapter { codec = createCodec(configuration); TraceUtil.beginSection("configureCodec"); codec.configure( - configuration.mediaFormat, - configuration.surface, - configuration.crypto, - configuration.flags); + configuration.mediaFormat, configuration.surface, configuration.crypto, /* flags= */ 0); TraceUtil.endSection(); TraceUtil.beginSection("startCodec"); codec.start();