Commit b7768853 by andrewlewis Committed by Oliver Woodman

Fix init data handling for FLAC in MP4

Issue: #6396
PiperOrigin-RevId: 267536336
parent 75435b42
...@@ -95,6 +95,8 @@ ...@@ -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 ###
......
...@@ -1162,7 +1162,7 @@ import java.util.List; ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment