From 42ed6e4d0e531a5f90d59b5bb4faf28b2c243edb Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 13 Feb 2017 10:03:50 -0800 Subject: [PATCH] SmoothStreaming: Replace variant bitrate/start_time placeholders Issue: #2447 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=147358615 --- .../smoothstreaming/SmoothStreamingManifest.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java index 06b030b2161..7fbc249d8c2 100644 --- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java +++ b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java @@ -153,8 +153,10 @@ public static class StreamElement { public static final int TYPE_VIDEO = 1; public static final int TYPE_TEXT = 2; - private static final String URL_PLACEHOLDER_START_TIME = "{start time}"; - private static final String URL_PLACEHOLDER_BITRATE = "{bitrate}"; + private static final String URL_PLACEHOLDER_START_TIME_1 = "{start time}"; + private static final String URL_PLACEHOLDER_START_TIME_2 = "{start_time}"; + private static final String URL_PLACEHOLDER_BITRATE_1 = "{bitrate}"; + private static final String URL_PLACEHOLDER_BITRATE_2 = "{Bitrate}"; public final int type; public final String subType; @@ -243,9 +245,13 @@ public Uri buildRequestUri(int track, int chunkIndex) { Assertions.checkState(tracks != null); Assertions.checkState(chunkStartTimes != null); Assertions.checkState(chunkIndex < chunkStartTimes.size()); + String bitrateString = Integer.toString(tracks[track].format.bitrate); + String startTimeString = chunkStartTimes.get(chunkIndex).toString(); String chunkUrl = chunkTemplate - .replace(URL_PLACEHOLDER_BITRATE, Integer.toString(tracks[track].format.bitrate)) - .replace(URL_PLACEHOLDER_START_TIME, chunkStartTimes.get(chunkIndex).toString()); + .replace(URL_PLACEHOLDER_BITRATE_1, bitrateString) + .replace(URL_PLACEHOLDER_BITRATE_2, bitrateString) + .replace(URL_PLACEHOLDER_START_TIME_1, startTimeString) + .replace(URL_PLACEHOLDER_START_TIME_2, startTimeString); return UriUtil.resolveToUri(baseUri, chunkUrl); }