From 476cefa7cca4e529643ba54880a7424b278eecf0 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Tue, 1 Sep 2015 14:11:50 +0100 Subject: [PATCH] Remove extra constructors. --- .../google/android/exoplayer/chunk/BaseMediaChunk.java | 7 ------- .../java/com/google/android/exoplayer/chunk/Chunk.java | 4 ---- .../android/exoplayer/chunk/ContainerMediaChunk.java | 9 --------- .../com/google/android/exoplayer/chunk/DataChunk.java | 5 +++-- .../android/exoplayer/chunk/SingleSampleChunkSource.java | 2 +- .../android/exoplayer/chunk/SingleSampleMediaChunk.java | 7 ------- .../com/google/android/exoplayer/hls/HlsChunkSource.java | 5 +++-- .../smoothstreaming/SmoothStreamingChunkSource.java | 2 +- 8 files changed, 8 insertions(+), 33 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/BaseMediaChunk.java b/library/src/main/java/com/google/android/exoplayer/chunk/BaseMediaChunk.java index f8ffcf8c4a..462a9f30ba 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/BaseMediaChunk.java +++ b/library/src/main/java/com/google/android/exoplayer/chunk/BaseMediaChunk.java @@ -38,13 +38,6 @@ public abstract class BaseMediaChunk extends MediaChunk { private DefaultTrackOutput output; private int firstSampleIndex; - public BaseMediaChunk(DataSource dataSource, DataSpec dataSpec, int trigger, Format format, - long startTimeUs, long endTimeUs, int chunkIndex, boolean isLastChunk, - boolean isMediaFormatFinal) { - this(dataSource, dataSpec, trigger, format, startTimeUs, endTimeUs, chunkIndex, isLastChunk, - isMediaFormatFinal, Chunk.NO_PARENT_ID); - } - /** * @param dataSource A {@link DataSource} for loading the data. * @param dataSpec Defines the data to be loaded. diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/Chunk.java b/library/src/main/java/com/google/android/exoplayer/chunk/Chunk.java index 548306cafe..db6996c4d8 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/Chunk.java +++ b/library/src/main/java/com/google/android/exoplayer/chunk/Chunk.java @@ -104,10 +104,6 @@ public abstract class Chunk implements Loadable { protected final DataSource dataSource; - public Chunk(DataSource dataSource, DataSpec dataSpec, int type, int trigger, Format format) { - this(dataSource, dataSpec, type, trigger, format, NO_PARENT_ID); - } - /** * @param dataSource The source from which the data should be loaded. * @param dataSpec Defines the data to be loaded. {@code dataSpec.length} must not exceed diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java b/library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java index 7a9199bce9..6e4655c34f 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java +++ b/library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java @@ -43,15 +43,6 @@ public class ContainerMediaChunk extends BaseMediaChunk implements SingleTrackOu private volatile int bytesLoaded; private volatile boolean loadCanceled; - public ContainerMediaChunk(DataSource dataSource, DataSpec dataSpec, int trigger, Format format, - long startTimeUs, long endTimeUs, int chunkIndex, boolean isLastChunk, long sampleOffsetUs, - ChunkExtractorWrapper extractorWrapper, MediaFormat mediaFormat, DrmInitData drmInitData, - boolean isMediaFormatFinal) { - this(dataSource, dataSpec, trigger, format, startTimeUs, endTimeUs, chunkIndex, isLastChunk, - sampleOffsetUs, extractorWrapper, mediaFormat, drmInitData, isMediaFormatFinal, - Chunk.NO_PARENT_ID); - } - /** * @param dataSource A {@link DataSource} for loading the data. * @param dataSpec Defines the data to be loaded. diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/DataChunk.java b/library/src/main/java/com/google/android/exoplayer/chunk/DataChunk.java index ed0331f120..985fc233df 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/DataChunk.java +++ b/library/src/main/java/com/google/android/exoplayer/chunk/DataChunk.java @@ -43,11 +43,12 @@ public abstract class DataChunk extends Chunk { * @param type See {@link #type}. * @param trigger See {@link #trigger}. * @param format See {@link #format}. + * @param parentId Identifier for a parent from which this chunk originates. * @param data An optional recycled array that can be used as a holder for the data. */ public DataChunk(DataSource dataSource, DataSpec dataSpec, int type, int trigger, Format format, - byte[] data) { - super(dataSource, dataSpec, type, trigger, format); + int parentId, byte[] data) { + super(dataSource, dataSpec, type, trigger, format, parentId); this.data = data; } diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleChunkSource.java b/library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleChunkSource.java index 3faea8b21a..7f753ae557 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleChunkSource.java @@ -116,7 +116,7 @@ public final class SingleSampleChunkSource implements ChunkSource { private SingleSampleMediaChunk initChunk() { return new SingleSampleMediaChunk(dataSource, dataSpec, Chunk.TRIGGER_UNSPECIFIED, format, 0, - durationUs, 0, true, mediaFormat, null); + durationUs, 0, true, mediaFormat, null, Chunk.NO_PARENT_ID); } } diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleMediaChunk.java b/library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleMediaChunk.java index e7dab3c3ad..e0f8a57ed2 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleMediaChunk.java +++ b/library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleMediaChunk.java @@ -35,13 +35,6 @@ public final class SingleSampleMediaChunk extends BaseMediaChunk { private volatile int bytesLoaded; private volatile boolean loadCanceled; - public SingleSampleMediaChunk(DataSource dataSource, DataSpec dataSpec, int trigger, - Format format, long startTimeUs, long endTimeUs, int chunkIndex, boolean isLastChunk, - MediaFormat sampleFormat, DrmInitData sampleDrmInitData) { - this(dataSource, dataSpec, trigger, format, startTimeUs, endTimeUs, chunkIndex, isLastChunk, - sampleFormat, sampleDrmInitData, Chunk.NO_PARENT_ID); - } - /** * @param dataSource A {@link DataSource} for loading the data. * @param dataSpec Defines the data to be loaded. diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsChunkSource.java b/library/src/main/java/com/google/android/exoplayer/hls/HlsChunkSource.java index 875f3e26a8..815473e6d7 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/HlsChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer/hls/HlsChunkSource.java @@ -658,7 +658,7 @@ public class HlsChunkSource { public MediaPlaylistChunk(DataSource dataSource, DataSpec dataSpec, byte[] scratchSpace, HlsPlaylistParser playlistParser, int variantIndex, String playlistUrl) { super(dataSource, dataSpec, Chunk.TYPE_MANIFEST, Chunk.TRIGGER_UNSPECIFIED, null, - scratchSpace); + Chunk.NO_PARENT_ID, scratchSpace); this.variantIndex = variantIndex; this.playlistParser = playlistParser; this.playlistUrl = playlistUrl; @@ -685,7 +685,8 @@ public class HlsChunkSource { public EncryptionKeyChunk(DataSource dataSource, DataSpec dataSpec, byte[] scratchSpace, String iv, int variantIndex) { - super(dataSource, dataSpec, Chunk.TYPE_DRM, Chunk.TRIGGER_UNSPECIFIED, null, scratchSpace); + super(dataSource, dataSpec, Chunk.TYPE_DRM, Chunk.TRIGGER_UNSPECIFIED, null, + Chunk.NO_PARENT_ID, scratchSpace); this.iv = iv; this.variantIndex = variantIndex; } diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java index 42ba0de0cd..3b02870bf9 100644 --- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java @@ -487,7 +487,7 @@ public class SmoothStreamingChunkSource implements ChunkSource, // To convert them the absolute timestamps, we need to set sampleOffsetUs to -chunkStartTimeUs. return new ContainerMediaChunk(dataSource, dataSpec, trigger, formatInfo, chunkStartTimeUs, chunkEndTimeUs, chunkIndex, isLast, chunkStartTimeUs, extractorWrapper, mediaFormat, - drmInitData, true); + drmInitData, true, Chunk.NO_PARENT_ID); } private static int getManifestTrackKey(int elementIndex, int trackIndex) {