From 24b2c09287276945ded18de6b0a8bce27eca4bf8 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Thu, 24 Mar 2016 06:27:04 -0700 Subject: [PATCH] Use longs rather than ints for HLS byterange. Issue: #1387 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=118024270 --- .../google/android/exoplayer/hls/HlsMediaPlaylist.java | 6 +++--- .../google/android/exoplayer/hls/HlsPlaylistParser.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) 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 44c760bccf..acf21d21f4 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 @@ -36,12 +36,12 @@ public final class HlsMediaPlaylist extends HlsPlaylist { public final boolean isEncrypted; public final String encryptionKeyUri; public final String encryptionIV; - public final int byterangeOffset; - public final int byterangeLength; + public final long byterangeOffset; + public final long byterangeLength; public Segment(String uri, double durationSecs, int discontinuitySequenceNumber, long startTimeUs, boolean isEncrypted, String encryptionKeyUri, String encryptionIV, - int byterangeOffset, int byterangeLength) { + long byterangeOffset, long byterangeLength) { this.url = uri; this.durationSecs = durationSecs; this.discontinuitySequenceNumber = discontinuitySequenceNumber; 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 4d79dc7246..bcc12d73b7 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 @@ -244,8 +244,8 @@ public final class HlsPlaylistParser implements UriLoadable.Parser double segmentDurationSecs = 0.0; int discontinuitySequenceNumber = 0; long segmentStartTimeUs = 0; - int segmentByterangeOffset = 0; - int segmentByterangeLength = C.LENGTH_UNBOUNDED; + long segmentByterangeOffset = 0; + long segmentByterangeLength = C.LENGTH_UNBOUNDED; int segmentMediaSequence = 0; boolean isEncrypted = false; @@ -279,9 +279,9 @@ public final class HlsPlaylistParser implements UriLoadable.Parser } else if (line.startsWith(BYTERANGE_TAG)) { String byteRange = HlsParserUtil.parseStringAttr(line, BYTERANGE_REGEX, BYTERANGE_TAG); String[] splitByteRange = byteRange.split("@"); - segmentByterangeLength = Integer.parseInt(splitByteRange[0]); + segmentByterangeLength = Long.parseLong(splitByteRange[0]); if (splitByteRange.length > 1) { - segmentByterangeOffset = Integer.parseInt(splitByteRange[1]); + segmentByterangeOffset = Long.parseLong(splitByteRange[1]); } } else if (line.startsWith(DISCONTINUITY_SEQUENCE_TAG)) { discontinuitySequenceNumber = Integer.parseInt(line.substring(line.indexOf(':') + 1));