From 3d775c164106d6709c4238ea6a02e61ee20f7afa Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Wed, 3 Dec 2014 18:50:31 +0000 Subject: [PATCH] Use C constants + minor cleanup. --- .../com/google/android/exoplayer/demo/DemoUtil.java | 4 +--- .../google/android/exoplayer/hls/HlsChunkSource.java | 5 ++--- .../google/android/exoplayer/hls/HlsMediaPlaylist.java | 10 ++++++---- .../android/exoplayer/hls/HlsPlaylistParser.java | 2 +- .../com/google/android/exoplayer/hls/TsExtractor.java | 5 +++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java b/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java index aab66b59b5..a2915f53ff 100644 --- a/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java +++ b/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java @@ -50,9 +50,7 @@ public class DemoUtil { public static final int TYPE_DASH = 0; public static final int TYPE_SS = 1; public static final int TYPE_OTHER = 2; - public static final int TYPE_DASH_LIVE = 3; - public static final int TYPE_DASH_LIVE_DVR = 4; - public static final int TYPE_HLS = 5; + public static final int TYPE_HLS = 3; public static final boolean EXPOSE_EXPERIMENTAL_FEATURES = false; 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 9306b5b218..0ca9ab4272 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 @@ -17,7 +17,6 @@ package com.google.android.exoplayer.hls; import com.google.android.exoplayer.C; import com.google.android.exoplayer.MediaFormat; -import com.google.android.exoplayer.TrackRenderer; import com.google.android.exoplayer.hls.TsExtractor.SamplePool; import com.google.android.exoplayer.upstream.Aes128DataSource; import com.google.android.exoplayer.upstream.BandwidthMeter; @@ -193,7 +192,7 @@ public class HlsChunkSource { } public long getDurationUs() { - return live ? TrackRenderer.UNKNOWN_TIME_US : durationUs; + return live ? C.UNKNOWN_TIME_US : durationUs; } /** @@ -313,7 +312,7 @@ public class HlsChunkSource { } else /* Not live */ { startTimeUs = segment.startTimeUs; } - long endTimeUs = startTimeUs + (long) (segment.durationSecs * 1000000); + long endTimeUs = startTimeUs + (long) (segment.durationSecs * C.MICROS_PER_SECOND); boolean isLastChunk = !mediaPlaylist.live && chunkIndex == mediaPlaylist.segments.size() - 1; // Configure the extractor that will read the chunk. diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsMediaPlaylist.java b/library/src/main/java/com/google/android/exoplayer/hls/HlsMediaPlaylist.java index 70192c87c4..3e9f151c08 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/HlsMediaPlaylist.java +++ b/library/src/main/java/com/google/android/exoplayer/hls/HlsMediaPlaylist.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer.hls; +import com.google.android.exoplayer.C; + import android.net.Uri; import java.util.List; @@ -77,11 +79,11 @@ public final class HlsMediaPlaylist extends HlsPlaylist { this.live = live; this.segments = segments; - if (this.segments.size() > 0) { - Segment lastSegment = segments.get(this.segments.size() - 1); - this.durationUs = lastSegment.startTimeUs + (long) (lastSegment.durationSecs * 1000000); + if (!segments.isEmpty()) { + Segment last = segments.get(segments.size() - 1); + durationUs = last.startTimeUs + (long) (last.durationSecs * C.MICROS_PER_SECOND); } else { - this.durationUs = 0; + durationUs = 0; } } diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsPlaylistParser.java b/library/src/main/java/com/google/android/exoplayer/hls/HlsPlaylistParser.java index 8ee093c91d..a2497e3218 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/HlsPlaylistParser.java +++ b/library/src/main/java/com/google/android/exoplayer/hls/HlsPlaylistParser.java @@ -223,7 +223,7 @@ public final class HlsPlaylistParser implements ManifestParser { segments.add(new Segment(line, segmentDurationSecs, segmentDiscontinuity, segmentStartTimeUs, segmentEncryptionMethod, segmentEncryptionKeyUri, segmentEncryptionIV, segmentByterangeOffset, segmentByterangeLength)); - segmentStartTimeUs += (long) (segmentDurationSecs * 1000000); + segmentStartTimeUs += (long) (segmentDurationSecs * C.MICROS_PER_SECOND); segmentDiscontinuity = false; segmentDurationSecs = 0.0; if (segmentByterangeLength != C.LENGTH_UNBOUNDED) { diff --git a/library/src/main/java/com/google/android/exoplayer/hls/TsExtractor.java b/library/src/main/java/com/google/android/exoplayer/hls/TsExtractor.java index 9b66dce6b7..c78402a5de 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/TsExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer/hls/TsExtractor.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer.hls; +import com.google.android.exoplayer.C; import com.google.android.exoplayer.MediaFormat; import com.google.android.exoplayer.SampleHolder; import com.google.android.exoplayer.metadata.Eia608Parser; @@ -480,7 +481,7 @@ public final class TsExtractor { pesBuffer.skipBits(1); pts |= pesBuffer.readBitsLong(15); pesBuffer.skipBits(1); - timeUs = pts * 1000000 / 90000; + timeUs = (pts * C.MICROS_PER_SECOND) / 90000; // Skip the rest of the header. pesBuffer.skipBytes(headerDataLength - 5); } else { @@ -1035,7 +1036,7 @@ public final class TsExtractor { MediaFormat mediaFormat = MediaFormat.createAudioFormat(MimeTypes.AUDIO_AAC, MediaFormat.NO_VALUE, audioParams.second, audioParams.first, Collections.singletonList(audioSpecificConfig)); - frameDurationUs = (1000000 * 1024L) / mediaFormat.sampleRate; + frameDurationUs = (C.MICROS_PER_SECOND * 1024L) / mediaFormat.sampleRate; setMediaFormat(mediaFormat); } else { adtsBuffer.skipBits(10);