From af4b891c998a4365aa605a6c55141f6a581b27e6 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 3 Jun 2021 17:17:52 +0100
Subject: [PATCH] Use UnrecognizedFormatException for progressive media only

PiperOrigin-RevId: 377303025
---
 .../java/com/google/android/exoplayer2/ParserException.java  | 2 +-
 .../exoplayer2/source/UnrecognizedInputFormatException.java  | 3 ++-
 .../exoplayer2/source/hls/playlist/HlsPlaylistParser.java    | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/common/src/main/java/com/google/android/exoplayer2/ParserException.java b/library/common/src/main/java/com/google/android/exoplayer2/ParserException.java
index 9f1a9ca7a6..27a1ef9843 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/ParserException.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/ParserException.java
@@ -135,7 +135,7 @@ public class ParserException extends IOException {
     this(/* message= */ null, cause, /* contentIsMalformed= */ true, C.DATA_TYPE_UNKNOWN);
   }
 
-  private ParserException(
+  protected ParserException(
       @Nullable String message,
       @Nullable Throwable cause,
       boolean contentIsMalformed,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/UnrecognizedInputFormatException.java b/library/core/src/main/java/com/google/android/exoplayer2/source/UnrecognizedInputFormatException.java
index 5ba1bfb5e0..ec94e40777 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/UnrecognizedInputFormatException.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/UnrecognizedInputFormatException.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.source;
 
 import android.net.Uri;
+import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ParserException;
 
 /** Thrown if the input format was not recognized. */
@@ -29,7 +30,7 @@ public class UnrecognizedInputFormatException extends ParserException {
    * @param uri The {@link Uri} from which the unrecognized data was read.
    */
   public UnrecognizedInputFormatException(String message, Uri uri) {
-    super(message);
+    super(message, /* cause= */ null, /* contentIsMalformed= */ false, C.DATA_TYPE_MEDIA);
     this.uri = uri;
   }
 }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index fdb5349f32..c8d16efe43 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -30,7 +30,6 @@ import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
 import com.google.android.exoplayer2.metadata.Metadata;
-import com.google.android.exoplayer2.source.UnrecognizedInputFormatException;
 import com.google.android.exoplayer2.source.hls.HlsTrackMetadataEntry;
 import com.google.android.exoplayer2.source.hls.HlsTrackMetadataEntry.VariantInfo;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.Rendition;
@@ -255,8 +254,8 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
     String line;
     try {
       if (!checkPlaylistHeader(reader)) {
-        throw new UnrecognizedInputFormatException(
-            "Input does not start with the #EXTM3U header.", uri);
+        throw ParserException.createForMalformedManifest(
+            /* message= */ "Input does not start with the #EXTM3U header.", /* cause= */ null);
       }
       while ((line = reader.readLine()) != null) {
         line = line.trim();