From 4fbd09693a525e7c52cc19ef33b472700ac3c885 Mon Sep 17 00:00:00 2001 From: ibaker Date: Tue, 21 Jul 2020 13:44:48 +0100 Subject: [PATCH] Fix nullness error in Mp4Extractor This only manifests when turning ParsableByteArray#data into a getData() method but I'm fixing it beforehand to avoid introducing changes into a big refactoring change. #exofixit PiperOrigin-RevId: 322342497 --- .../google/android/exoplayer2/extractor/mp4/Mp4Extractor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java index 938d66e12a..1e0fc95ea3 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java @@ -328,8 +328,9 @@ public final class Mp4Extractor implements Extractor, SeekMap { // lengths greater than Integer.MAX_VALUE. Assertions.checkState(atomHeaderBytesRead == Atom.HEADER_SIZE); Assertions.checkState(atomSize <= Integer.MAX_VALUE); - atomData = new ParsableByteArray((int) atomSize); + ParsableByteArray atomData = new ParsableByteArray((int) atomSize); System.arraycopy(atomHeader.data, 0, atomData.data, 0, Atom.HEADER_SIZE); + this.atomData = atomData; parserState = STATE_READING_ATOM_PAYLOAD; } else { atomData = null;