Commit 8e9711e8 by aquilescanta Committed by Oliver Woodman

Allow packed audio without PRIV timestamps

We use the segments' start time when the timestmap is not present.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=149006252
parent e40bba28
...@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.source.hls; ...@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.source.hls;
import android.text.TextUtils; import android.text.TextUtils;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.ParserException;
import com.google.android.exoplayer2.extractor.DefaultExtractorInput; import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
...@@ -250,10 +249,8 @@ import java.util.concurrent.atomic.AtomicInteger; ...@@ -250,10 +249,8 @@ import java.util.concurrent.atomic.AtomicInteger;
if (extractor == null) { if (extractor == null) {
// Media segment format is packed audio. // Media segment format is packed audio.
long id3Timestamp = peekId3PrivTimestamp(input); long id3Timestamp = peekId3PrivTimestamp(input);
if (id3Timestamp == C.TIME_UNSET) { extractor = buildPackedAudioExtractor(id3Timestamp != C.TIME_UNSET
throw new ParserException("ID3 PRIV timestamp missing."); ? timestampAdjuster.adjustTsTimestamp(id3Timestamp) : startTimeUs);
}
extractor = buildPackedAudioExtractor(timestampAdjuster.adjustTsTimestamp(id3Timestamp));
} }
if (skipLoadedBytes) { if (skipLoadedBytes) {
input.skipFully(bytesLoaded); input.skipFully(bytesLoaded);
......
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