From 6b4c48a329efc7838ac57591b34d68abac4dd72a Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Thu, 21 Feb 2019 11:48:00 +0000 Subject: [PATCH] Replace initLoadCompleted with initDataLoadRequired PiperOrigin-RevId: 234966936 --- .../android/exoplayer2/source/hls/HlsMediaChunk.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java index d3f2e2c661..419d11cba1 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java @@ -205,7 +205,7 @@ import java.util.concurrent.atomic.AtomicInteger; private HlsSampleStreamWrapper output; private int initSegmentBytesLoaded; private int nextLoadPosition; - private boolean initLoadCompleted; + private boolean initDataLoadRequired; private volatile boolean loadCanceled; private boolean loadCompleted; @@ -258,6 +258,7 @@ import java.util.concurrent.atomic.AtomicInteger; this.id3Decoder = id3Decoder; this.scratchId3Data = scratchId3Data; this.shouldSpliceIn = shouldSpliceIn; + initDataLoadRequired = initDataSpec != null; uid = uidSource.getAndIncrement(); } @@ -288,7 +289,7 @@ import java.util.concurrent.atomic.AtomicInteger; if (extractor == null && previousExtractor != null) { extractor = previousExtractor; isExtractorReusable = true; - initLoadCompleted = initDataSpec != null; + initDataLoadRequired = false; output.init(uid, shouldSpliceIn, /* reusingExtractor= */ true); } maybeLoadInitData(); @@ -303,8 +304,7 @@ import java.util.concurrent.atomic.AtomicInteger; // Internal methods. private void maybeLoadInitData() throws IOException, InterruptedException { - if (initLoadCompleted || initDataSpec == null) { - // Note: The HLS spec forbids initialization segments for packed audio. + if (!initDataLoadRequired) { return; } DataSpec initSegmentDataSpec; @@ -332,7 +332,7 @@ import java.util.concurrent.atomic.AtomicInteger; } finally { Util.closeQuietly(initDataSource); } - initLoadCompleted = true; + initDataLoadRequired = false; } private void loadMedia() throws IOException, InterruptedException {