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
973d2354
authored
Sep 25, 2020
by
samrobinson
Committed by
Oliver Woodman
Oct 17, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Add support for mp2 boxes.
Issue: #7967 PiperOrigin-RevId: 333709003
parent
a1999ef8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletions
RELEASENOTES.md
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
RELEASENOTES.md
View file @
973d2354
...
...
@@ -11,6 +11,9 @@
(
[
#7866
](
https://github.com/google/ExoPlayer/issues/7866
)
).
*
Text:
*
Add support for
`\h`
SSA/ASS style override code (non-breaking space).
*
Extractors:
*
Add support for .mp2 boxes in the
`AtomParsers`
(
[
#7967
](
https://github.com/google/ExoPlayer/issues/7967
)
).
### 2.12.0 (2020-09-11) ###
...
...
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
View file @
973d2354
...
...
@@ -116,6 +116,9 @@ import java.util.List;
public
static
final
int
TYPE_mp4a
=
0x6d703461
;
@SuppressWarnings
(
"ConstantCaseForConstants"
)
public
static
final
int
TYPE__mp2
=
0x2e6d7032
;
@SuppressWarnings
(
"ConstantCaseForConstants"
)
public
static
final
int
TYPE__mp3
=
0x2e6d7033
;
@SuppressWarnings
(
"ConstantCaseForConstants"
)
...
...
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
View file @
973d2354
...
...
@@ -878,6 +878,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
||
childAtomType
==
Atom
.
TYPE_lpcm
||
childAtomType
==
Atom
.
TYPE_sowt
||
childAtomType
==
Atom
.
TYPE_twos
||
childAtomType
==
Atom
.
TYPE__mp2
||
childAtomType
==
Atom
.
TYPE__mp3
||
childAtomType
==
Atom
.
TYPE_alac
||
childAtomType
==
Atom
.
TYPE_alaw
...
...
@@ -1243,7 +1244,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
}
else
if
(
atomType
==
Atom
.
TYPE_twos
)
{
mimeType
=
MimeTypes
.
AUDIO_RAW
;
pcmEncoding
=
C
.
ENCODING_PCM_16BIT_BIG_ENDIAN
;
}
else
if
(
atomType
==
Atom
.
TYPE__mp3
)
{
}
else
if
(
atomType
==
Atom
.
TYPE__mp
2
||
atomType
==
Atom
.
TYPE__mp
3
)
{
mimeType
=
MimeTypes
.
AUDIO_MPEG
;
}
else
if
(
atomType
==
Atom
.
TYPE_alac
)
{
mimeType
=
MimeTypes
.
AUDIO_ALAC
;
...
...
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