loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-09 16:40:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the correct format for init segments loads.

Browse Source 
This is causing getTrackIndex to fail for live playbacks.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=126189387
This commit is contained in:
olly 2016-06-29 07:28:59 -07:00 committed by Oliver Woodman
parent e33278436f
commit 5c2bb2a852
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java
View File

@ -195,9 +195,9 @@ public class DashChunkSource implements ChunkSource {
} }
if (pendingInitializationUri != null || pendingIndexUri != null) { if (pendingInitializationUri != null || pendingIndexUri != null) {
// We have initialization and/or index requests to make. // We have initialization and/or index requests to make.
Chunk initializationChunk = newInitializationChunk(pendingInitializationUri, pendingIndexUri, Chunk initializationChunk = newInitializationChunk(representationHolder, dataSource,
selectedRepresentation, representationHolder.extractorWrapper, dataSource, selectedFormat, pendingInitializationUri, pendingIndexUri, evaluation.trigger,
evaluation.trigger, evaluation.data); evaluation.data);
lastChunkWasInitialization = true; lastChunkWasInitialization = true;
out.chunk = initializationChunk; out.chunk = initializationChunk;
return; return;
@ -305,8 +305,8 @@ public class DashChunkSource implements ChunkSource {
} }
} }
private Chunk newInitializationChunk(RangedUri initializationUri, RangedUri indexUri, private Chunk newInitializationChunk(RepresentationHolder representationHolder,
Representation representation, ChunkExtractorWrapper extractor, DataSource dataSource, DataSource dataSource, Format trackFormat, RangedUri initializationUri, RangedUri indexUri,
int formatEvaluatorTrigger, Object formatEvaluatorData) { int formatEvaluatorTrigger, Object formatEvaluatorData) {
RangedUri requestUri; RangedUri requestUri;
if (initializationUri != null) { if (initializationUri != null) {
@ -320,9 +320,9 @@ public class DashChunkSource implements ChunkSource {
requestUri = indexUri; requestUri = indexUri;
} }
DataSpec dataSpec = new DataSpec(requestUri.getUri(), requestUri.start, requestUri.length, DataSpec dataSpec = new DataSpec(requestUri.getUri(), requestUri.start, requestUri.length,
representation.getCacheKey()); representationHolder.representation.getCacheKey());
return new InitializationChunk(dataSource, dataSpec, representation.format, return new InitializationChunk(dataSource, dataSpec, trackFormat,
formatEvaluatorTrigger, formatEvaluatorData, extractor); formatEvaluatorTrigger, formatEvaluatorData, representationHolder.extractorWrapper);
} }
private Chunk newMediaChunk(RepresentationHolder representationHolder, DataSource dataSource, private Chunk newMediaChunk(RepresentationHolder representationHolder, DataSource dataSource,