Remove Renderer references to Format.drmInitData

PiperOrigin-RevId: 323392470

extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java

@@ -126,7 +126,7 @@ public class Libgav1VideoRenderer extends DecoderVideoRenderer {
         || !Gav1Library.isAvailable()) {
         || !Gav1Library.isAvailable()) {
       return RendererCapabilities.create(FORMAT_UNSUPPORTED_TYPE);
       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_UNSUPPORTED_DRM);
     }
     }
     return RendererCapabilities.create(FORMAT_HANDLED, ADAPTIVE_SEAMLESS, TUNNELING_NOT_SUPPORTED);
     return RendererCapabilities.create(FORMAT_HANDLED, ADAPTIVE_SEAMLESS, TUNNELING_NOT_SUPPORTED);

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_16BIT)
             && !sinkSupportsFormat(format, C.ENCODING_PCM_FLOAT))) {
             && !sinkSupportsFormat(format, C.ENCODING_PCM_FLOAT))) {
       return FORMAT_UNSUPPORTED_SUBTYPE;
       return FORMAT_UNSUPPORTED_SUBTYPE;
-    } else if (format.drmInitData != null && format.exoMediaCryptoType == null) {
+    } else if (format.exoMediaCryptoType != null) {
       return FORMAT_UNSUPPORTED_DRM;
       return FORMAT_UNSUPPORTED_DRM;
     } else {
     } else {
       return FORMAT_HANDLED;
       return FORMAT_HANDLED;

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;
       return FORMAT_UNSUPPORTED_TYPE;
     } else if (!FfmpegLibrary.supportsFormat(format.sampleMimeType)) {
     } else if (!FfmpegLibrary.supportsFormat(format.sampleMimeType)) {
       return RendererCapabilities.create(FORMAT_UNSUPPORTED_SUBTYPE);
       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);
       return RendererCapabilities.create(FORMAT_UNSUPPORTED_DRM);
     } else {
     } else {
       return RendererCapabilities.create(
       return RendererCapabilities.create(

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)) {
     if (!sinkSupportsFormat(outputFormat)) {
       return FORMAT_UNSUPPORTED_SUBTYPE;
       return FORMAT_UNSUPPORTED_SUBTYPE;
-    } else if (format.drmInitData != null && format.exoMediaCryptoType == null) {
+    } else if (format.exoMediaCryptoType != null) {
       return FORMAT_UNSUPPORTED_DRM;
       return FORMAT_UNSUPPORTED_DRM;
     } else {
     } else {
       return FORMAT_HANDLED;
       return FORMAT_HANDLED;

extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java

@@ -83,7 +83,7 @@ public class LibopusAudioRenderer extends DecoderAudioRenderer {
   @FormatSupport
   @FormatSupport
   protected int supportsFormatInternal(Format format) {
   protected int supportsFormatInternal(Format format) {
     boolean drmIsSupported =
     boolean drmIsSupported =
-        format.drmInitData == null
+        format.exoMediaCryptoType == null
             || OpusLibrary.matchesExpectedExoMediaCryptoType(format.exoMediaCryptoType);
             || OpusLibrary.matchesExpectedExoMediaCryptoType(format.exoMediaCryptoType);
     if (!OpusLibrary.isAvailable()
     if (!OpusLibrary.isAvailable()
         || !MimeTypes.AUDIO_OPUS.equalsIgnoreCase(format.sampleMimeType)) {
         || !MimeTypes.AUDIO_OPUS.equalsIgnoreCase(format.sampleMimeType)) {

extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java

@@ -68,7 +68,7 @@ public final class OpusLibrary {
    * protected content.
    * protected content.
    */
    */
   public static boolean matchesExpectedExoMediaCryptoType(
   public static boolean matchesExpectedExoMediaCryptoType(
-      @Nullable Class<? extends ExoMediaCrypto> exoMediaCryptoType) {
+      Class<? extends ExoMediaCrypto> exoMediaCryptoType) {
     return Util.areEqual(OpusLibrary.exoMediaCryptoType, exoMediaCryptoType);
     return Util.areEqual(OpusLibrary.exoMediaCryptoType, exoMediaCryptoType);
   }
   }
 
 

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);
       return RendererCapabilities.create(FORMAT_UNSUPPORTED_TYPE);
     }
     }
     boolean drmIsSupported =
     boolean drmIsSupported =
-        format.drmInitData == null
+        format.exoMediaCryptoType == null
             || VpxLibrary.matchesExpectedExoMediaCryptoType(format.exoMediaCryptoType);
             || VpxLibrary.matchesExpectedExoMediaCryptoType(format.exoMediaCryptoType);
     if (!drmIsSupported) {
     if (!drmIsSupported) {
       return RendererCapabilities.create(FORMAT_UNSUPPORTED_DRM);
       return RendererCapabilities.create(FORMAT_UNSUPPORTED_DRM);

extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java

@@ -87,7 +87,7 @@ public final class VpxLibrary {
    * protected content.
    * protected content.
    */
    */
   public static boolean matchesExpectedExoMediaCryptoType(
   public static boolean matchesExpectedExoMediaCryptoType(
-      @Nullable Class<? extends ExoMediaCrypto> exoMediaCryptoType) {
+      Class<? extends ExoMediaCrypto> exoMediaCryptoType) {
     return Util.areEqual(VpxLibrary.exoMediaCryptoType, exoMediaCryptoType);
     return Util.areEqual(VpxLibrary.exoMediaCryptoType, exoMediaCryptoType);
   }
   }
 
 

library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java

@@ -213,7 +213,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
     }
     }
     @TunnelingSupport
     @TunnelingSupport
     int tunnelingSupport = Util.SDK_INT >= 21 ? TUNNELING_SUPPORTED : TUNNELING_NOT_SUPPORTED;
     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);
     boolean supportsFormatDrm = supportsFormatDrm(format);
     // In passthrough mode, if the format needs decryption then we need to use a passthrough
     // 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.
     // decoder. Else we don't don't need a decoder at all.

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. */
   /** Returns whether this renderer supports the given {@link Format Format's} DRM scheme. */
   protected static boolean supportsFormatDrm(Format format) {
   protected static boolean supportsFormatDrm(Format format) {
-    return format.drmInitData == null
+    return format.exoMediaCryptoType == null
         || FrameworkMediaCrypto.class.equals(format.exoMediaCryptoType);
         || FrameworkMediaCrypto.class.equals(format.exoMediaCryptoType);
   }
   }
 
 

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) {
   public int supportsFormat(Format format) {
     if (decoderFactory.supportsFormat(format)) {
     if (decoderFactory.supportsFormat(format)) {
       return RendererCapabilities.create(
       return RendererCapabilities.create(
-          format.drmInitData == null ? FORMAT_HANDLED : FORMAT_UNSUPPORTED_DRM);
+          format.exoMediaCryptoType == null ? FORMAT_HANDLED : FORMAT_UNSUPPORTED_DRM);
     } else {
     } else {
       return RendererCapabilities.create(FORMAT_UNSUPPORTED_TYPE);
       return RendererCapabilities.create(FORMAT_UNSUPPORTED_TYPE);
     }
     }

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) {
   public int supportsFormat(Format format) {
     if (decoderFactory.supportsFormat(format)) {
     if (decoderFactory.supportsFormat(format)) {
       return RendererCapabilities.create(
       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)) {
     } else if (MimeTypes.isText(format.sampleMimeType)) {
       return RendererCapabilities.create(FORMAT_UNSUPPORTED_SUBTYPE);
       return RendererCapabilities.create(FORMAT_UNSUPPORTED_SUBTYPE);
     } else {
     } else {