sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ignore file extension for HLS Subtitle Renditions

Browse source 
According to the spec, subtitle renditions must be Webvtt media
segments.

Issue:#2025
Issue:#2355

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=145289266
This commit is contained in:
aquilescanta 2017-01-23 08:30:39 -08:00 committed by Oliver Woodman
parent 18d7cdf39f
commit 497651c7b9
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
View file

@ -187,7 +187,7 @@ import java.util.concurrent.atomic.AtomicInteger;
public void load() throws IOException, InterruptedException { public void load() throws IOException, InterruptedException {
if (extractor == null && !isPackedAudio) { if (extractor == null && !isPackedAudio) {
// See HLS spec, version 20, Section 3.4 for more information on packed audio extraction. // See HLS spec, version 20, Section 3.4 for more information on packed audio extraction.
extractor = buildExtractorByExtension(); extractor = createExtractor();
} }
maybeLoadInitData(); maybeLoadInitData();
if (!loadCanceled) { if (!loadCanceled) {
@ -329,11 +329,12 @@ import java.util.concurrent.atomic.AtomicInteger;
return new Aes128DataSource(dataSource, encryptionKey, encryptionIv); return new Aes128DataSource(dataSource, encryptionKey, encryptionIv);
} }
private Extractor buildExtractorByExtension() { private Extractor createExtractor() {
// Set the extractor that will read the chunk. // Select the extractor that will read the chunk.
Extractor extractor; Extractor extractor;
boolean usingNewExtractor = true; boolean usingNewExtractor = true;
if (lastPathSegment.endsWith(WEBVTT_FILE_EXTENSION) if (MimeTypes.TEXT_VTT.equals(hlsUrl.format.sampleMimeType)
|| lastPathSegment.endsWith(WEBVTT_FILE_EXTENSION)
|| lastPathSegment.endsWith(VTT_FILE_EXTENSION)) { || lastPathSegment.endsWith(VTT_FILE_EXTENSION)) {
extractor = new WebvttExtractor(trackFormat.language, timestampAdjuster); extractor = new WebvttExtractor(trackFormat.language, timestampAdjuster);
} else if (!needNewExtractor) { } else if (!needNewExtractor) {