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
6682e623
authored
Nov 19, 2020
by
xufuji456
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Compat video coding with mpeg1video in Mp4Extractor
parent
4bc392a8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletions
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
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
View file @
6682e623
...
@@ -385,6 +385,9 @@ import java.util.List;
...
@@ -385,6 +385,9 @@ import java.util.List;
@SuppressWarnings
(
"ConstantCaseForConstants"
)
@SuppressWarnings
(
"ConstantCaseForConstants"
)
public
static
final
int
TYPE_twos
=
0x74776f73
;
public
static
final
int
TYPE_twos
=
0x74776f73
;
@SuppressWarnings
(
"ConstantCaseForConstants"
)
public
static
final
int
TYPE__m1v
=
0x6d317620
;
public
final
int
type
;
public
final
int
type
;
public
Atom
(
int
type
)
{
public
Atom
(
int
type
)
{
...
...
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
View file @
6682e623
...
@@ -869,7 +869,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
...
@@ -869,7 +869,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
||
childAtomType
==
Atom
.
TYPE_dvav
||
childAtomType
==
Atom
.
TYPE_dvav
||
childAtomType
==
Atom
.
TYPE_dva1
||
childAtomType
==
Atom
.
TYPE_dva1
||
childAtomType
==
Atom
.
TYPE_dvhe
||
childAtomType
==
Atom
.
TYPE_dvhe
||
childAtomType
==
Atom
.
TYPE_dvh1
)
{
||
childAtomType
==
Atom
.
TYPE_dvh1
||
childAtomType
==
Atom
.
TYPE__m1v
)
{
parseVideoSampleEntry
(
stsd
,
childAtomType
,
childStartPosition
,
childAtomSize
,
trackId
,
parseVideoSampleEntry
(
stsd
,
childAtomType
,
childStartPosition
,
childAtomSize
,
trackId
,
rotationDegrees
,
drmInitData
,
out
,
i
);
rotationDegrees
,
drmInitData
,
out
,
i
);
}
else
if
(
childAtomType
==
Atom
.
TYPE_mp4a
}
else
if
(
childAtomType
==
Atom
.
TYPE_mp4a
...
@@ -1087,6 +1088,10 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
...
@@ -1087,6 +1088,10 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
childPosition
+=
childAtomSize
;
childPosition
+=
childAtomSize
;
}
}
if
(
mimeType
==
null
&&
atomType
==
Atom
.
TYPE__m1v
)
{
mimeType
=
MimeTypes
.
VIDEO_MPEG
;
}
// If the media type was not recognized, ignore the track.
// If the media type was not recognized, ignore the track.
if
(
mimeType
==
null
)
{
if
(
mimeType
==
null
)
{
return
;
return
;
...
...
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