loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Sample Size For Supplemental Data In MatroskaExtractor

Browse Source 
For when a track is both encrypted and has supplemental data, the sample size will be equal to `block sample size - encryption data size`.

PiperOrigin-RevId: 427807612
This commit is contained in:
olly 2022-02-10 19:50:11 +00:00 committed by Ian Baker
parent ba3558c0c6
commit 1af8d57032
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
View File

@ -1552,12 +1552,13 @@ public class MatroskaExtractor implements Extractor {
blockFlags |= C.BUFFER_FLAG_HAS_SUPPLEMENTAL_DATA; blockFlags |= C.BUFFER_FLAG_HAS_SUPPLEMENTAL_DATA;
blockAdditionalData.reset(/* limit= */ 0); blockAdditionalData.reset(/* limit= */ 0);
// If there is supplemental data, the structure of the sample data is: // If there is supplemental data, the structure of the sample data is:
// sample size (4 bytes) || sample data || supplemental data // encryption data (if any) || sample size (4 bytes) || sample data || supplemental data
int sampleSize = size + sampleStrippedBytes.limit() - sampleBytesRead;
scratch.reset(/* limit= */ 4); scratch.reset(/* limit= */ 4);
scratch.getData()[0] = (byte) ((size >> 24) & 0xFF); scratch.getData()[0] = (byte) ((sampleSize >> 24) & 0xFF);
scratch.getData()[1] = (byte) ((size >> 16) & 0xFF); scratch.getData()[1] = (byte) ((sampleSize >> 16) & 0xFF);
scratch.getData()[2] = (byte) ((size >> 8) & 0xFF); scratch.getData()[2] = (byte) ((sampleSize >> 8) & 0xFF);
scratch.getData()[3] = (byte) (size & 0xFF); scratch.getData()[3] = (byte) (sampleSize & 0xFF);
output.sampleData(scratch, 4, TrackOutput.SAMPLE_DATA_PART_SUPPLEMENTAL); output.sampleData(scratch, 4, TrackOutput.SAMPLE_DATA_PART_SUPPLEMENTAL);
sampleBytesWritten += 4; sampleBytesWritten += 4;
} }