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 27a1ef9843..23e1985e3e 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 @@ -123,18 +123,6 @@ public class ParserException extends IOException { this(message, /* cause= */ null, /* contentIsMalformed= */ true, C.DATA_TYPE_UNKNOWN); } - /** - * Creates a new instance. - * - * @param cause The cause for the exception. - * @deprecated Use a factory method which initializes {@link #contentIsMalformed}, and {@link - * #dataType} instead. - */ - @Deprecated - public ParserException(Throwable cause) { - this(/* message= */ null, cause, /* contentIsMalformed= */ true, C.DATA_TYPE_UNKNOWN); - } - protected ParserException( @Nullable String message, @Nullable Throwable cause, diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java index 2feb09ac63..36ba4fea48 100644 --- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java +++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java @@ -1464,7 +1464,7 @@ public final class DashMediaSource extends BaseMediaSource { } return timestampMs; } catch (ParseException e) { - throw new ParserException(e); + throw ParserException.createForMalformedManifest(/* message= */ null, /* cause= */ e); } } } diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java index 2b849e9eba..09b3894744 100644 --- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java +++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java @@ -103,7 +103,7 @@ public class DashManifestParser extends DefaultHandler } return parseMediaPresentationDescription(xpp, uri.toString()); } catch (XmlPullParserException e) { - throw new ParserException(e); + throw ParserException.createForMalformedManifest(/* message= */ null, /* cause= */ e); } } diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/SefReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/SefReader.java index ccf5180f41..a3a71ac3f2 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/SefReader.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/SefReader.java @@ -240,7 +240,7 @@ import java.util.List; int speedDivisor = 1 << (speedMode - 1); segments.add(new SlowMotionData.Segment(startTimeMs, endTimeMs, speedDivisor)); } catch (NumberFormatException e) { - throw new ParserException(e); + throw ParserException.createForMalformedContainer(/* message= */ null, /* cause= */ e); } } return new SlowMotionData(segments); diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java index 1c683b9e42..06edd9236b 100644 --- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java +++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java @@ -74,7 +74,7 @@ public class SsManifestParser implements ParsingLoadable.Parser { new SmoothStreamingMediaParser(null, uri.toString()); return (SsManifest) smoothStreamingMediaParser.parse(xmlParser); } catch (XmlPullParserException e) { - throw new ParserException(e); + throw ParserException.createForMalformedManifest(/* message= */ null, /* cause= */ e); } } @@ -253,7 +253,7 @@ public class SsManifestParser implements ParsingLoadable.Parser { try { return Integer.parseInt(value); } catch (NumberFormatException e) { - throw new ParserException(e); + throw ParserException.createForMalformedManifest(/* message= */ null, /* cause= */ e); } } else { return defaultValue; @@ -266,7 +266,7 @@ public class SsManifestParser implements ParsingLoadable.Parser { try { return Integer.parseInt(value); } catch (NumberFormatException e) { - throw new ParserException(e); + throw ParserException.createForMalformedManifest(/* message= */ null, /* cause= */ e); } } else { throw new MissingFieldException(key); @@ -280,7 +280,7 @@ public class SsManifestParser implements ParsingLoadable.Parser { try { return Long.parseLong(value); } catch (NumberFormatException e) { - throw new ParserException(e); + throw ParserException.createForMalformedManifest(/* message= */ null, /* cause= */ e); } } else { return defaultValue; @@ -294,7 +294,7 @@ public class SsManifestParser implements ParsingLoadable.Parser { try { return Long.parseLong(value); } catch (NumberFormatException e) { - throw new ParserException(e); + throw ParserException.createForMalformedManifest(/* message= */ null, /* cause= */ e); } } else { throw new MissingFieldException(key);