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
235c6311
authored
Mar 17, 2020
by
olly
Committed by
Oliver Woodman
Mar 19, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
FfmpegAudioRenderer should use UNSUPPORTED_TYPE for non-audio formats
Issue: #2159 PiperOrigin-RevId: 301345559
parent
42b8fe26
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java
extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java
View file @
235c6311
...
...
@@ -89,10 +89,10 @@ public final class FfmpegAudioRenderer extends SimpleDecoderAudioRenderer {
@Override
@FormatSupport
protected
int
supportsFormatInternal
(
Format
format
)
{
Assertions
.
checkNotNull
(
format
.
sampleMimeType
);
if
(!
FfmpegLibrary
.
isAvailable
())
{
String
mimeType
=
Assertions
.
checkNotNull
(
format
.
sampleMimeType
);
if
(!
FfmpegLibrary
.
isAvailable
()
||
!
MimeTypes
.
isAudio
(
mimeType
)
)
{
return
FORMAT_UNSUPPORTED_TYPE
;
}
else
if
(!
FfmpegLibrary
.
supportsFormat
(
format
.
sampleM
imeType
)
||
!
isOutputSupported
(
format
))
{
}
else
if
(!
FfmpegLibrary
.
supportsFormat
(
m
imeType
)
||
!
isOutputSupported
(
format
))
{
return
FORMAT_UNSUPPORTED_SUBTYPE
;
}
else
if
(
format
.
drmInitData
!=
null
&&
format
.
exoMediaCryptoType
==
null
)
{
return
FORMAT_UNSUPPORTED_DRM
;
...
...
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