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
c010d28b
authored
Jul 27, 2020
by
olly
Committed by
Oliver Woodman
Aug 19, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
FLV: Ignore invalid SCRIPTDATA name type, rather than fail playback
Issue: #7675 PiperOrigin-RevId: 323371286
parent
3198c51b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
RELEASENOTES.md
library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java
RELEASENOTES.md
View file @
c010d28b
...
@@ -9,6 +9,8 @@
...
@@ -9,6 +9,8 @@
*
FMP4: Fix
`saiz`
and
`senc`
sample count checks, resolving a "length
*
FMP4: Fix
`saiz`
and
`senc`
sample count checks, resolving a "length
mismatch"
`ParserException`
when playing certain protected FMP4 streams
mismatch"
`ParserException`
when playing certain protected FMP4 streams
(
[
#7592
](
https://github.com/google/ExoPlayer/issues/7592
)
).
(
[
#7592
](
https://github.com/google/ExoPlayer/issues/7592
)
).
*
FLV: Ignore SCRIPTDATA segments with invalid name types, rather than failing
playback (
[
#7675
](
https://github.com/google/ExoPlayer/issues/7675
)
).
*
IMA extension: Upgrade to IMA SDK 3.19.4, bringing in a fix for setting the
*
IMA extension: Upgrade to IMA SDK 3.19.4, bringing in a fix for setting the
media load timeout
media load timeout
(
[
#7170
](
https://github.com/google/ExoPlayer/issues/7170
)
).
(
[
#7170
](
https://github.com/google/ExoPlayer/issues/7170
)
).
...
...
library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java
View file @
c010d28b
...
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.extractor.flv;
...
@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.extractor.flv;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.ParserException
;
import
com.google.android.exoplayer2.extractor.DummyTrackOutput
;
import
com.google.android.exoplayer2.extractor.DummyTrackOutput
;
import
com.google.android.exoplayer2.util.ParsableByteArray
;
import
com.google.android.exoplayer2.util.ParsableByteArray
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
@@ -65,11 +64,11 @@ import java.util.Map;
...
@@ -65,11 +64,11 @@ import java.util.Map;
}
}
@Override
@Override
protected
boolean
parsePayload
(
ParsableByteArray
data
,
long
timeUs
)
throws
ParserException
{
protected
boolean
parsePayload
(
ParsableByteArray
data
,
long
timeUs
)
{
int
nameType
=
readAmfType
(
data
);
int
nameType
=
readAmfType
(
data
);
if
(
nameType
!=
AMF_TYPE_STRING
)
{
if
(
nameType
!=
AMF_TYPE_STRING
)
{
//
Should never happen
.
//
Ignore segments with unexpected name type
.
throw
new
ParserException
()
;
return
false
;
}
}
String
name
=
readAmfString
(
data
);
String
name
=
readAmfString
(
data
);
if
(!
NAME_METADATA
.
equals
(
name
))
{
if
(!
NAME_METADATA
.
equals
(
name
))
{
...
...
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