From 684994fe61961142ba2fe629a7b99002b80f0477 Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Mon, 27 Jul 2020 18:43:47 +0100 Subject: [PATCH] Remove Renderer references to Format.drmInitData PiperOrigin-RevId: 323392470 --- .../google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java | 2 +- .../android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java | 2 +- .../android/exoplayer2/ext/ffmpeg/FfmpegVideoRenderer.java | 2 +- .../android/exoplayer2/ext/flac/LibflacAudioRenderer.java | 2 +- .../android/exoplayer2/ext/opus/LibopusAudioRenderer.java | 2 +- .../com/google/android/exoplayer2/ext/opus/OpusLibrary.java | 2 +- .../google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java | 2 +- .../java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java | 2 +- .../android/exoplayer2/audio/MediaCodecAudioRenderer.java | 2 +- .../android/exoplayer2/mediacodec/MediaCodecRenderer.java | 2 +- .../google/android/exoplayer2/metadata/MetadataRenderer.java | 2 +- .../java/com/google/android/exoplayer2/text/TextRenderer.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java b/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java index c07a590c68..7c558d24b2 100644 --- a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java +++ b/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java @@ -126,7 +126,7 @@ public class Libgav1VideoRenderer extends DecoderVideoRenderer { || !Gav1Library.isAvailable()) { return RendererCapabilities.create(FORMAT_UNSUPPORTED_TYPE); } - if (format.drmInitData != null && format.exoMediaCryptoType == null) { + if (format.exoMediaCryptoType != null) { return RendererCapabilities.create(FORMAT_UNSUPPORTED_DRM); } return RendererCapabilities.create(FORMAT_HANDLED, ADAPTIVE_SEAMLESS, TUNNELING_NOT_SUPPORTED); diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java index e8eaf641eb..e4b889c174 100644 --- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java +++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java @@ -103,7 +103,7 @@ public final class FfmpegAudioRenderer extends DecoderAudioRenderer { || (!sinkSupportsFormat(format, C.ENCODING_PCM_16BIT) && !sinkSupportsFormat(format, C.ENCODING_PCM_FLOAT))) { return FORMAT_UNSUPPORTED_SUBTYPE; - } else if (format.drmInitData != null && format.exoMediaCryptoType == null) { + } else if (format.exoMediaCryptoType != null) { return FORMAT_UNSUPPORTED_DRM; } else { return FORMAT_HANDLED; diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegVideoRenderer.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegVideoRenderer.java index 6f3b8b1fc7..c8b15ef3e6 100644 --- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegVideoRenderer.java +++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegVideoRenderer.java @@ -76,7 +76,7 @@ public final class FfmpegVideoRenderer extends DecoderVideoRenderer { return FORMAT_UNSUPPORTED_TYPE; } else if (!FfmpegLibrary.supportsFormat(format.sampleMimeType)) { return RendererCapabilities.create(FORMAT_UNSUPPORTED_SUBTYPE); - } else if (format.drmInitData != null && format.exoMediaCryptoType == null) { + } else if (format.exoMediaCryptoType != null) { return RendererCapabilities.create(FORMAT_UNSUPPORTED_DRM); } else { return RendererCapabilities.create( diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java index 18b05e8ecb..3ff9a5c275 100644 --- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java +++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java @@ -107,7 +107,7 @@ public final class LibflacAudioRenderer extends DecoderAudioRenderer { } if (!sinkSupportsFormat(outputFormat)) { return FORMAT_UNSUPPORTED_SUBTYPE; - } else if (format.drmInitData != null && format.exoMediaCryptoType == null) { + } else if (format.exoMediaCryptoType != null) { return FORMAT_UNSUPPORTED_DRM; } else { return FORMAT_HANDLED; diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java index 39d8a216d8..ff4385542b 100644 --- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java +++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java @@ -83,7 +83,7 @@ public class LibopusAudioRenderer extends DecoderAudioRenderer { @FormatSupport protected int supportsFormatInternal(Format format) { boolean drmIsSupported = - format.drmInitData == null + format.exoMediaCryptoType == null || OpusLibrary.matchesExpectedExoMediaCryptoType(format.exoMediaCryptoType); if (!OpusLibrary.isAvailable() || !MimeTypes.AUDIO_OPUS.equalsIgnoreCase(format.sampleMimeType)) { diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java index d09d69bf03..5529701c06 100644 --- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java +++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java @@ -68,7 +68,7 @@ public final class OpusLibrary { * protected content. */ public static boolean matchesExpectedExoMediaCryptoType( - @Nullable Class exoMediaCryptoType) { + Class exoMediaCryptoType) { return Util.areEqual(OpusLibrary.exoMediaCryptoType, exoMediaCryptoType); } diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java index 36a8b8c862..61ebc8b0d9 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java @@ -128,7 +128,7 @@ public class LibvpxVideoRenderer extends DecoderVideoRenderer { return RendererCapabilities.create(FORMAT_UNSUPPORTED_TYPE); } boolean drmIsSupported = - format.drmInitData == null + format.exoMediaCryptoType == null || VpxLibrary.matchesExpectedExoMediaCryptoType(format.exoMediaCryptoType); if (!drmIsSupported) { return RendererCapabilities.create(FORMAT_UNSUPPORTED_DRM); diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java index e620332fc8..5106ab67ad 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java @@ -87,7 +87,7 @@ public final class VpxLibrary { * protected content. */ public static boolean matchesExpectedExoMediaCryptoType( - @Nullable Class exoMediaCryptoType) { + Class exoMediaCryptoType) { return Util.areEqual(VpxLibrary.exoMediaCryptoType, exoMediaCryptoType); } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java index 45a9317085..7d49c12d7e 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java @@ -213,7 +213,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media } @TunnelingSupport int tunnelingSupport = Util.SDK_INT >= 21 ? TUNNELING_SUPPORTED : TUNNELING_NOT_SUPPORTED; - boolean formatHasDrm = format.drmInitData != null || format.exoMediaCryptoType != null; + boolean formatHasDrm = format.exoMediaCryptoType != null; boolean supportsFormatDrm = supportsFormatDrm(format); // In passthrough mode, if the format needs decryption then we need to use a passthrough // decoder. Else we don't don't need a decoder at all. diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java index 9a7eb2cacc..4b5118b9b4 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java @@ -1972,7 +1972,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer { /** Returns whether this renderer supports the given {@link Format Format's} DRM scheme. */ protected static boolean supportsFormatDrm(Format format) { - return format.drmInitData == null + return format.exoMediaCryptoType == null || FrameworkMediaCrypto.class.equals(format.exoMediaCryptoType); } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java index dd698691b4..d2b75635b1 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java @@ -103,7 +103,7 @@ public final class MetadataRenderer extends BaseRenderer implements Callback { public int supportsFormat(Format format) { if (decoderFactory.supportsFormat(format)) { return RendererCapabilities.create( - format.drmInitData == null ? FORMAT_HANDLED : FORMAT_UNSUPPORTED_DRM); + format.exoMediaCryptoType == null ? FORMAT_HANDLED : FORMAT_UNSUPPORTED_DRM); } else { return RendererCapabilities.create(FORMAT_UNSUPPORTED_TYPE); } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java index ffb1bc1559..6c140c74d1 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java @@ -133,7 +133,7 @@ public final class TextRenderer extends BaseRenderer implements Callback { public int supportsFormat(Format format) { if (decoderFactory.supportsFormat(format)) { return RendererCapabilities.create( - format.drmInitData == null ? FORMAT_HANDLED : FORMAT_UNSUPPORTED_DRM); + format.exoMediaCryptoType == null ? FORMAT_HANDLED : FORMAT_UNSUPPORTED_DRM); } else if (MimeTypes.isText(format.sampleMimeType)) { return RendererCapabilities.create(FORMAT_UNSUPPORTED_SUBTYPE); } else {