From ad387378b287f7cb5e956e56ddd94bcfdd9522f3 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Fri, 1 Apr 2022 14:02:35 +0100
Subject: [PATCH] Add @ContentType IntDef to
 Util.getAdaptiveMimeTypeForContentType

Also add a case for RTSP, otherwise lint complains.

PiperOrigin-RevId: 438805903
---
 .../src/main/java/androidx/media3/common/C.java      | 12 ++++++------
 .../main/java/androidx/media3/common/util/Util.java  |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/libraries/common/src/main/java/androidx/media3/common/C.java b/libraries/common/src/main/java/androidx/media3/common/C.java
index 649c648207..24d4801d5c 100644
--- a/libraries/common/src/main/java/androidx/media3/common/C.java
+++ b/libraries/common/src/main/java/androidx/media3/common/C.java
@@ -732,17 +732,17 @@ public final class C {
   @Target({FIELD, METHOD, PARAMETER, LOCAL_VARIABLE, TYPE_USE})
   @IntDef({TYPE_DASH, TYPE_SS, TYPE_HLS, TYPE_RTSP, TYPE_OTHER})
   public @interface ContentType {}
-  /** Value returned by {@link Util#inferContentType(String)} for DASH manifests. */
+  /** Value returned by {@link Util#inferContentType} for DASH manifests. */
   @UnstableApi public static final int TYPE_DASH = 0;
-  /** Value returned by {@link Util#inferContentType(String)} for Smooth Streaming manifests. */
+  /** Value returned by {@link Util#inferContentType} for Smooth Streaming manifests. */
   @UnstableApi public static final int TYPE_SS = 1;
-  /** Value returned by {@link Util#inferContentType(String)} for HLS manifests. */
+  /** Value returned by {@link Util#inferContentType} for HLS manifests. */
   @UnstableApi public static final int TYPE_HLS = 2;
-  /** Value returned by {@link Util#inferContentType(String)} for RTSP. */
+  /** Value returned by {@link Util#inferContentType} for RTSP. */
   @UnstableApi public static final int TYPE_RTSP = 3;
   /**
-   * Value returned by {@link Util#inferContentType(String)} for files other than DASH, HLS or
-   * Smooth Streaming manifests, or RTSP URIs.
+   * Value returned by {@link Util#inferContentType} for files other than DASH, HLS or Smooth
+   * Streaming manifests, or RTSP URIs.
    */
   @UnstableApi public static final int TYPE_OTHER = 4;
 
diff --git a/libraries/common/src/main/java/androidx/media3/common/util/Util.java b/libraries/common/src/main/java/androidx/media3/common/util/Util.java
index a0619d1bfa..d3831ed4d0 100644
--- a/libraries/common/src/main/java/androidx/media3/common/util/Util.java
+++ b/libraries/common/src/main/java/androidx/media3/common/util/Util.java
@@ -1904,10 +1904,10 @@ public final class Util {
 
   /**
    * Returns the MIME type corresponding to the given adaptive {@link ContentType}, or {@code null}
-   * if the content type is {@link C#TYPE_OTHER}.
+   * if the content type is not adaptive.
    */
   @Nullable
-  public static String getAdaptiveMimeTypeForContentType(int contentType) {
+  public static String getAdaptiveMimeTypeForContentType(@ContentType int contentType) {
     switch (contentType) {
       case C.TYPE_DASH:
         return MimeTypes.APPLICATION_MPD;
@@ -1915,6 +1915,7 @@ public final class Util {
         return MimeTypes.APPLICATION_M3U8;
       case C.TYPE_SS:
         return MimeTypes.APPLICATION_SS;
+      case C.TYPE_RTSP:
       case C.TYPE_OTHER:
       default:
         return null;