Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b5dbadee
authored
Jun 10, 2021
by
aquilescanta
Committed by
Oliver Woodman
Jun 10, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Remove ParserException(cause) constructor
PiperOrigin-RevId: 378635295
parent
c728de99
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
20 deletions
library/common/src/main/java/com/google/android/exoplayer2/ParserException.java
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/SefReader.java
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
library/common/src/main/java/com/google/android/exoplayer2/ParserException.java
View file @
b5dbadee
...
@@ -123,18 +123,6 @@ public class ParserException extends IOException {
...
@@ -123,18 +123,6 @@ public class ParserException extends IOException {
this
(
message
,
/* cause= */
null
,
/* contentIsMalformed= */
true
,
C
.
DATA_TYPE_UNKNOWN
);
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
(
protected
ParserException
(
@Nullable
String
message
,
@Nullable
String
message
,
@Nullable
Throwable
cause
,
@Nullable
Throwable
cause
,
...
...
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file @
b5dbadee
...
@@ -1464,7 +1464,7 @@ public final class DashMediaSource extends BaseMediaSource {
...
@@ -1464,7 +1464,7 @@ public final class DashMediaSource extends BaseMediaSource {
}
}
return
timestampMs
;
return
timestampMs
;
}
catch
(
ParseException
e
)
{
}
catch
(
ParseException
e
)
{
throw
new
ParserException
(
e
);
throw
ParserException
.
createForMalformedManifest
(
/* message= */
null
,
/* cause= */
e
);
}
}
}
}
}
}
...
...
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
View file @
b5dbadee
...
@@ -103,7 +103,7 @@ public class DashManifestParser extends DefaultHandler
...
@@ -103,7 +103,7 @@ public class DashManifestParser extends DefaultHandler
}
}
return
parseMediaPresentationDescription
(
xpp
,
uri
.
toString
());
return
parseMediaPresentationDescription
(
xpp
,
uri
.
toString
());
}
catch
(
XmlPullParserException
e
)
{
}
catch
(
XmlPullParserException
e
)
{
throw
new
ParserException
(
e
);
throw
ParserException
.
createForMalformedManifest
(
/* message= */
null
,
/* cause= */
e
);
}
}
}
}
...
...
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/SefReader.java
View file @
b5dbadee
...
@@ -240,7 +240,7 @@ import java.util.List;
...
@@ -240,7 +240,7 @@ import java.util.List;
int
speedDivisor
=
1
<<
(
speedMode
-
1
);
int
speedDivisor
=
1
<<
(
speedMode
-
1
);
segments
.
add
(
new
SlowMotionData
.
Segment
(
startTimeMs
,
endTimeMs
,
speedDivisor
));
segments
.
add
(
new
SlowMotionData
.
Segment
(
startTimeMs
,
endTimeMs
,
speedDivisor
));
}
catch
(
NumberFormatException
e
)
{
}
catch
(
NumberFormatException
e
)
{
throw
new
ParserException
(
e
);
throw
ParserException
.
createForMalformedContainer
(
/* message= */
null
,
/* cause= */
e
);
}
}
}
}
return
new
SlowMotionData
(
segments
);
return
new
SlowMotionData
(
segments
);
...
...
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
View file @
b5dbadee
...
@@ -74,7 +74,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
...
@@ -74,7 +74,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
new
SmoothStreamingMediaParser
(
null
,
uri
.
toString
());
new
SmoothStreamingMediaParser
(
null
,
uri
.
toString
());
return
(
SsManifest
)
smoothStreamingMediaParser
.
parse
(
xmlParser
);
return
(
SsManifest
)
smoothStreamingMediaParser
.
parse
(
xmlParser
);
}
catch
(
XmlPullParserException
e
)
{
}
catch
(
XmlPullParserException
e
)
{
throw
new
ParserException
(
e
);
throw
ParserException
.
createForMalformedManifest
(
/* message= */
null
,
/* cause= */
e
);
}
}
}
}
...
@@ -253,7 +253,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
...
@@ -253,7 +253,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
try
{
try
{
return
Integer
.
parseInt
(
value
);
return
Integer
.
parseInt
(
value
);
}
catch
(
NumberFormatException
e
)
{
}
catch
(
NumberFormatException
e
)
{
throw
new
ParserException
(
e
);
throw
ParserException
.
createForMalformedManifest
(
/* message= */
null
,
/* cause= */
e
);
}
}
}
else
{
}
else
{
return
defaultValue
;
return
defaultValue
;
...
@@ -266,7 +266,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
...
@@ -266,7 +266,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
try
{
try
{
return
Integer
.
parseInt
(
value
);
return
Integer
.
parseInt
(
value
);
}
catch
(
NumberFormatException
e
)
{
}
catch
(
NumberFormatException
e
)
{
throw
new
ParserException
(
e
);
throw
ParserException
.
createForMalformedManifest
(
/* message= */
null
,
/* cause= */
e
);
}
}
}
else
{
}
else
{
throw
new
MissingFieldException
(
key
);
throw
new
MissingFieldException
(
key
);
...
@@ -280,7 +280,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
...
@@ -280,7 +280,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
try
{
try
{
return
Long
.
parseLong
(
value
);
return
Long
.
parseLong
(
value
);
}
catch
(
NumberFormatException
e
)
{
}
catch
(
NumberFormatException
e
)
{
throw
new
ParserException
(
e
);
throw
ParserException
.
createForMalformedManifest
(
/* message= */
null
,
/* cause= */
e
);
}
}
}
else
{
}
else
{
return
defaultValue
;
return
defaultValue
;
...
@@ -294,7 +294,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
...
@@ -294,7 +294,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
try
{
try
{
return
Long
.
parseLong
(
value
);
return
Long
.
parseLong
(
value
);
}
catch
(
NumberFormatException
e
)
{
}
catch
(
NumberFormatException
e
)
{
throw
new
ParserException
(
e
);
throw
ParserException
.
createForMalformedManifest
(
/* message= */
null
,
/* cause= */
e
);
}
}
}
else
{
}
else
{
throw
new
MissingFieldException
(
key
);
throw
new
MissingFieldException
(
key
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment