loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-09 08:30:43 +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) {
// We have initialization and/or index requests to make.
Chunk initializationChunk = newInitializationChunk(pendingInitializationUri, pendingIndexUri,
selectedRepresentation, representationHolder.extractorWrapper, dataSource,
evaluation.trigger, evaluation.data);
Chunk initializationChunk = newInitializationChunk(representationHolder, dataSource,
selectedFormat, pendingInitializationUri, pendingIndexUri, evaluation.trigger,
evaluation.data);
lastChunkWasInitialization = true;
out.chunk = initializationChunk;
return;
@ -305,8 +305,8 @@ public class DashChunkSource implements ChunkSource {
}
}
private Chunk newInitializationChunk(RangedUri initializationUri, RangedUri indexUri,
Representation representation, ChunkExtractorWrapper extractor, DataSource dataSource,
private Chunk newInitializationChunk(RepresentationHolder representationHolder,
DataSource dataSource, Format trackFormat, RangedUri initializationUri, RangedUri indexUri,
int formatEvaluatorTrigger, Object formatEvaluatorData) {
RangedUri requestUri;
if (initializationUri != null) {
@ -320,9 +320,9 @@ public class DashChunkSource implements ChunkSource {
requestUri = indexUri;
}
DataSpec dataSpec = new DataSpec(requestUri.getUri(), requestUri.start, requestUri.length,
representation.getCacheKey());
return new InitializationChunk(dataSource, dataSpec, representation.format,
formatEvaluatorTrigger, formatEvaluatorData, extractor);
representationHolder.representation.getCacheKey());
return new InitializationChunk(dataSource, dataSpec, trackFormat,
formatEvaluatorTrigger, formatEvaluatorData, representationHolder.extractorWrapper);
}
private Chunk newMediaChunk(RepresentationHolder representationHolder, DataSource dataSource,