sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix init data handling for FLAC in MP4

Browse source 
Issue: #6396
PiperOrigin-RevId: 267536336
This commit is contained in:
andrewlewis 2019-09-06 07:54:35 +01:00 committed by Oliver Woodman
parent 75435b4210
commit b77688533b
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASENOTES.md
View file

@ -95,6 +95,8 @@
* Fix issue where playback speeds are not used in adaptive track selections * Fix issue where playback speeds are not used in adaptive track selections
after manual selection changes for other renderers after manual selection changes for other renderers
([#6256](https://github.com/google/ExoPlayer/issues/6256)). ([#6256](https://github.com/google/ExoPlayer/issues/6256)).
* Fix initialization data handling for FLAC in MP4
([#6396](https://github.com/google/ExoPlayer/issues/6396)).
### 2.10.3 ### ### 2.10.3 ###

2
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
View file

@ -1162,7 +1162,7 @@ import java.util.List;
System.arraycopy(opusMagic, 0, initializationData, 0, opusMagic.length); System.arraycopy(opusMagic, 0, initializationData, 0, opusMagic.length);
parent.setPosition(childPosition + Atom.HEADER_SIZE); parent.setPosition(childPosition + Atom.HEADER_SIZE);
parent.readBytes(initializationData, opusMagic.length, childAtomBodySize); parent.readBytes(initializationData, opusMagic.length, childAtomBodySize);
} else if (childAtomSize == Atom.TYPE_dfLa || childAtomType == Atom.TYPE_alac) { } else if (childAtomType == Atom.TYPE_dfLa || childAtomType == Atom.TYPE_alac) {
int childAtomBodySize = childAtomSize - Atom.FULL_HEADER_SIZE; int childAtomBodySize = childAtomSize - Atom.FULL_HEADER_SIZE;
initializationData = new byte[childAtomBodySize]; initializationData = new byte[childAtomBodySize];
parent.setPosition(childPosition + Atom.FULL_HEADER_SIZE); parent.setPosition(childPosition + Atom.FULL_HEADER_SIZE);