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
5d8e1784
authored
Feb 18, 2019
by
andrewlewis
Committed by
Andrew Lewis
Feb 18, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix MIME type for divx in Matroska
Issue: #3863 PiperOrigin-RevId: 234453728
parent
cedfa199
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletions
library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
View file @
5d8e1784
...
@@ -2070,7 +2070,7 @@ public class MatroskaExtractor implements Extractor {
...
@@ -2070,7 +2070,7 @@ public class MatroskaExtractor implements Extractor {
buffer
.
skipBytes
(
16
);
// size(4), width(4), height(4), planes(2), bitcount(2).
buffer
.
skipBytes
(
16
);
// size(4), width(4), height(4), planes(2), bitcount(2).
long
compression
=
buffer
.
readLittleEndianUnsignedInt
();
long
compression
=
buffer
.
readLittleEndianUnsignedInt
();
if
(
compression
==
FOURCC_COMPRESSION_DIVX
)
{
if
(
compression
==
FOURCC_COMPRESSION_DIVX
)
{
return
new
Pair
<>(
MimeTypes
.
VIDEO_
H263
,
null
);
return
new
Pair
<>(
MimeTypes
.
VIDEO_
DIVX
,
null
);
}
else
if
(
compression
==
FOURCC_COMPRESSION_VC1
)
{
}
else
if
(
compression
==
FOURCC_COMPRESSION_VC1
)
{
// Search for the initialization data from the end of the BITMAPINFOHEADER. The last 20
// 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).
// bytes of which are: sizeImage(4), xPel/m (4), yPel/m (4), clrUsed(4), clrImportant(4).
...
...
library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
View file @
5d8e1784
...
@@ -41,6 +41,7 @@ public final class MimeTypes {
...
@@ -41,6 +41,7 @@ public final class MimeTypes {
public
static
final
String
VIDEO_MPEG
=
BASE_TYPE_VIDEO
+
"/mpeg"
;
public
static
final
String
VIDEO_MPEG
=
BASE_TYPE_VIDEO
+
"/mpeg"
;
public
static
final
String
VIDEO_MPEG2
=
BASE_TYPE_VIDEO
+
"/mpeg2"
;
public
static
final
String
VIDEO_MPEG2
=
BASE_TYPE_VIDEO
+
"/mpeg2"
;
public
static
final
String
VIDEO_VC1
=
BASE_TYPE_VIDEO
+
"/wvc1"
;
public
static
final
String
VIDEO_VC1
=
BASE_TYPE_VIDEO
+
"/wvc1"
;
public
static
final
String
VIDEO_DIVX
=
BASE_TYPE_VIDEO
+
"/divx"
;
public
static
final
String
VIDEO_DOLBY_VISION
=
BASE_TYPE_VIDEO
+
"/dolby-vision"
;
public
static
final
String
VIDEO_DOLBY_VISION
=
BASE_TYPE_VIDEO
+
"/dolby-vision"
;
public
static
final
String
VIDEO_UNKNOWN
=
BASE_TYPE_VIDEO
+
"/x-unknown"
;
public
static
final
String
VIDEO_UNKNOWN
=
BASE_TYPE_VIDEO
+
"/x-unknown"
;
...
...
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