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
eae1606b
authored
Feb 19, 2018
by
Drew Hill
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
comment and newline cleanup
parent
9e340291
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 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 @
eae1606b
...
@@ -1934,7 +1934,7 @@ public final class MatroskaExtractor implements Extractor {
...
@@ -1934,7 +1934,7 @@ public final class MatroskaExtractor implements Extractor {
*
*
* @return A pair object with the first object being the codec mime type
* @return A pair object with the first object being the codec mime type
* and the second object the initialization data for the {@link Format},
* and the second object the initialization data for the {@link Format},
* or null if the compression type is not
VC1
.
* or null if the compression type is not
a currently supported type (VC1 or H263)
.
* @throws ParserException If the initialization data could not be built.
* @throws ParserException If the initialization data could not be built.
*/
*/
private
static
Pair
<
String
,
List
<
byte
[]>>
parseFourCcPrivate
(
ParsableByteArray
buffer
)
private
static
Pair
<
String
,
List
<
byte
[]>>
parseFourCcPrivate
(
ParsableByteArray
buffer
)
...
@@ -1944,8 +1944,7 @@ public final class MatroskaExtractor implements Extractor {
...
@@ -1944,8 +1944,7 @@ public final class MatroskaExtractor implements Extractor {
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_H263
,
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).
int
startOffset
=
buffer
.
getPosition
()
+
20
;
int
startOffset
=
buffer
.
getPosition
()
+
20
;
...
...
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