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

Remove unnecessary parameter and local variables

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=144427132
This commit is contained in:
eguven 2017-01-13 03:47:06 -08:00 committed by Oliver Woodman
parent f194df1149
commit 060f2a5d6f
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/src/main/java/com/google/android/exoplayer2/source/dash/DashWrappingSegmentIndex.java
View file

@ -28,9 +28,8 @@ import com.google.android.exoplayer2.source.dash.manifest.RangedUri;
/** /**
* @param chunkIndex The {@link ChunkIndex} to wrap. * @param chunkIndex The {@link ChunkIndex} to wrap.
* @param uri The URI where the data is located.
*/ */
public DashWrappingSegmentIndex(ChunkIndex chunkIndex, String uri) { public DashWrappingSegmentIndex(ChunkIndex chunkIndex) {
this.chunkIndex = chunkIndex; this.chunkIndex = chunkIndex;
} }

13
library/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
View file

@ -185,10 +185,9 @@ public class DefaultDashChunkSource implements DashChunkSource {
} }
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(representationHolder, dataSource, out.chunk = newInitializationChunk(representationHolder, dataSource,
trackSelection.getSelectedFormat(), trackSelection.getSelectionReason(), trackSelection.getSelectedFormat(), trackSelection.getSelectionReason(),
trackSelection.getSelectionData(), pendingInitializationUri, pendingIndexUri); trackSelection.getSelectionData(), pendingInitializationUri, pendingIndexUri);
out.chunk = initializationChunk;
return; return;
} }
@ -233,10 +232,9 @@ public class DefaultDashChunkSource implements DashChunkSource {
} }
int maxSegmentCount = Math.min(maxSegmentsPerLoad, lastAvailableSegmentNum - segmentNum + 1); int maxSegmentCount = Math.min(maxSegmentsPerLoad, lastAvailableSegmentNum - segmentNum + 1);
Chunk nextMediaChunk = newMediaChunk(representationHolder, dataSource, out.chunk = newMediaChunk(representationHolder, dataSource, trackSelection.getSelectedFormat(),
trackSelection.getSelectedFormat(), trackSelection.getSelectionReason(), trackSelection.getSelectionReason(), trackSelection.getSelectionData(), sampleFormat,
trackSelection.getSelectionData(), sampleFormat, segmentNum, maxSegmentCount); segmentNum, maxSegmentCount);
out.chunk = nextMediaChunk;
} }
@Override @Override
@ -255,8 +253,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
if (representationHolder.segmentIndex == null) { if (representationHolder.segmentIndex == null) {
SeekMap seekMap = initializationChunk.getSeekMap(); SeekMap seekMap = initializationChunk.getSeekMap();
if (seekMap != null) { if (seekMap != null) {
representationHolder.segmentIndex = new DashWrappingSegmentIndex((ChunkIndex) seekMap, representationHolder.segmentIndex = new DashWrappingSegmentIndex((ChunkIndex) seekMap);
initializationChunk.dataSpec.uri.toString());
} }
} }
} }