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
29ab6f74
authored
Sep 03, 2018
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Automatic styling fix
parent
fc47f222
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
9 deletions
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
View file @
29ab6f74
...
...
@@ -654,14 +654,22 @@ import java.util.List;
||
childAtomType
==
Atom
.
TYPE_vp09
)
{
parseVideoSampleEntry
(
stsd
,
childAtomType
,
childStartPosition
,
childAtomSize
,
trackId
,
rotationDegrees
,
drmInitData
,
out
,
i
);
}
else
if
(
childAtomType
==
Atom
.
TYPE_mp4a
||
childAtomType
==
Atom
.
TYPE_enca
||
childAtomType
==
Atom
.
TYPE_ac_3
||
childAtomType
==
Atom
.
TYPE_ec_3
||
childAtomType
==
Atom
.
TYPE_dtsc
||
childAtomType
==
Atom
.
TYPE_dtse
||
childAtomType
==
Atom
.
TYPE_dtsh
||
childAtomType
==
Atom
.
TYPE_dtsl
||
childAtomType
==
Atom
.
TYPE_samr
||
childAtomType
==
Atom
.
TYPE_sawb
||
childAtomType
==
Atom
.
TYPE_lpcm
||
childAtomType
==
Atom
.
TYPE_sowt
||
childAtomType
==
Atom
.
TYPE__mp3
||
childAtomType
==
Atom
.
TYPE_alac
||
childAtomType
==
Atom
.
TYPE_alaw
||
childAtomType
==
Atom
.
TYPE_ulaw
)
{
}
else
if
(
childAtomType
==
Atom
.
TYPE_mp4a
||
childAtomType
==
Atom
.
TYPE_enca
||
childAtomType
==
Atom
.
TYPE_ac_3
||
childAtomType
==
Atom
.
TYPE_ec_3
||
childAtomType
==
Atom
.
TYPE_dtsc
||
childAtomType
==
Atom
.
TYPE_dtse
||
childAtomType
==
Atom
.
TYPE_dtsh
||
childAtomType
==
Atom
.
TYPE_dtsl
||
childAtomType
==
Atom
.
TYPE_samr
||
childAtomType
==
Atom
.
TYPE_sawb
||
childAtomType
==
Atom
.
TYPE_lpcm
||
childAtomType
==
Atom
.
TYPE_sowt
||
childAtomType
==
Atom
.
TYPE__mp3
||
childAtomType
==
Atom
.
TYPE_alac
||
childAtomType
==
Atom
.
TYPE_alaw
||
childAtomType
==
Atom
.
TYPE_ulaw
)
{
parseAudioSampleEntry
(
stsd
,
childAtomType
,
childStartPosition
,
childAtomSize
,
trackId
,
language
,
isQuickTime
,
drmInitData
,
out
,
i
);
}
else
if
(
childAtomType
==
Atom
.
TYPE_TTML
||
childAtomType
==
Atom
.
TYPE_tx3g
...
...
@@ -956,7 +964,7 @@ import java.util.List;
mimeType
=
MimeTypes
.
AUDIO_ALAC
;
}
else
if
(
atomType
==
Atom
.
TYPE_alaw
)
{
mimeType
=
MimeTypes
.
AUDIO_ALAW
;
}
else
if
(
atomType
==
Atom
.
TYPE_ulaw
)
{
}
else
if
(
atomType
==
Atom
.
TYPE_ulaw
)
{
mimeType
=
MimeTypes
.
AUDIO_MLAW
;
}
...
...
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