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
8edecd5c
authored
Feb 25, 2019
by
andrewlewis
Committed by
Oliver Woodman
Mar 06, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Update Matroska video codec FourCCs
Issue: #5503 PiperOrigin-RevId: 235523955
parent
f394697d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
View file @
8edecd5c
...
...
@@ -219,8 +219,9 @@ public class MatroskaExtractor implements Extractor {
private
static
final
int
LACING_FIXED_SIZE
=
2
;
private
static
final
int
LACING_EBML
=
3
;
private
static
final
int
FOURCC_COMPRESSION_VC1
=
0x31435657
;
private
static
final
int
FOURCC_COMPRESSION_DIVX
=
0x58564944
;
private
static
final
int
FOURCC_COMPRESSION_H263
=
0x33363248
;
private
static
final
int
FOURCC_COMPRESSION_VC1
=
0x31435657
;
/**
* A template for the prefix that must be added to each subrip sample. The 12 byte end timecode
...
...
@@ -2057,8 +2058,6 @@ public class MatroskaExtractor implements Extractor {
/**
* Builds initialization data for a {@link Format} from FourCC codec private data.
*
* <p>VC1 and H263 are the only supported compression types.
*
* @return The codec mime type and initialization data. If the compression type is not supported
* then the mime type is set to {@link MimeTypes#VIDEO_UNKNOWN} and the initialization data
* is {@code null}.
...
...
@@ -2071,6 +2070,8 @@ public class MatroskaExtractor implements Extractor {
long
compression
=
buffer
.
readLittleEndianUnsignedInt
();
if
(
compression
==
FOURCC_COMPRESSION_DIVX
)
{
return
new
Pair
<>(
MimeTypes
.
VIDEO_DIVX
,
null
);
}
else
if
(
compression
==
FOURCC_COMPRESSION_H263
)
{
return
new
Pair
<>(
MimeTypes
.
VIDEO_H263
,
null
);
}
else
if
(
compression
==
FOURCC_COMPRESSION_VC1
)
{
// Search for the initialization data from the end of the BITMAPINFOHEADER. The last 20
// bytes of which are: sizeImage(4), xPel/m (4), yPel/m (4), clrUsed(4), clrImportant(4).
...
...
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