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
e1a110e6
authored
Jan 08, 2020
by
andrewlewis
Committed by
Oliver Woodman
Jan 17, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix TrueHD chunking in Matroska
Issue: #6845 PiperOrigin-RevId: 288688716
parent
7fe55cd4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
RELEASENOTES.md
library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
RELEASENOTES.md
View file @
e1a110e6
...
@@ -14,6 +14,8 @@
...
@@ -14,6 +14,8 @@
to proceed.
to proceed.
*
Fix handling of E-AC-3 streams that contain AC-3 syncframes
*
Fix handling of E-AC-3 streams that contain AC-3 syncframes
(
[
#6602
](
https://github.com/google/ExoPlayer/issues/6602
)
).
(
[
#6602
](
https://github.com/google/ExoPlayer/issues/6602
)
).
*
Fix playback of TrueHD streams in Matroska
(
[
#6845
](
https://github.com/google/ExoPlayer/issues/6845
)
).
*
Support "twos" codec (big endian PCM) in MP4
*
Support "twos" codec (big endian PCM) in MP4
(
[
#5789
](
https://github.com/google/ExoPlayer/issues/5789
)
).
(
[
#5789
](
https://github.com/google/ExoPlayer/issues/5789
)
).
*
WAV: Support IMA ADPCM encoded data.
*
WAV: Support IMA ADPCM encoded data.
...
...
library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
View file @
e1a110e6
...
@@ -1827,11 +1827,9 @@ public class MatroskaExtractor implements Extractor {
...
@@ -1827,11 +1827,9 @@ public class MatroskaExtractor implements Extractor {
chunkSize
+=
size
;
chunkSize
+=
size
;
chunkOffset
=
offset
;
// The offset is to the end of the sample.
chunkOffset
=
offset
;
// The offset is to the end of the sample.
if
(
chunkSampleCount
>=
Ac3Util
.
TRUEHD_RECHUNK_SAMPLE_COUNT
)
{
if
(
chunkSampleCount
>=
Ac3Util
.
TRUEHD_RECHUNK_SAMPLE_COUNT
)
{
// We haven't read enough samples to output a chunk.
return
;
}
outputPendingSampleMetadata
(
track
);
outputPendingSampleMetadata
(
track
);
}
}
}
public
void
outputPendingSampleMetadata
(
Track
track
)
{
public
void
outputPendingSampleMetadata
(
Track
track
)
{
if
(
chunkSampleCount
>
0
)
{
if
(
chunkSampleCount
>
0
)
{
...
...
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