From 37827be8cbea4bf930af379df88f0ba99cbd9bb5 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Tue, 5 May 2015 20:32:28 +0100 Subject: [PATCH] Use a UriDataSource for DASH manifests. This allows loading a manifest from a file:// URI. --- .../android/exoplayer/demo/player/DashRendererBuilder.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/player/DashRendererBuilder.java b/demo/src/main/java/com/google/android/exoplayer/demo/player/DashRendererBuilder.java index 195f974965..26933cf5e4 100644 --- a/demo/src/main/java/com/google/android/exoplayer/demo/player/DashRendererBuilder.java +++ b/demo/src/main/java/com/google/android/exoplayer/demo/player/DashRendererBuilder.java @@ -51,9 +51,8 @@ import com.google.android.exoplayer.text.webvtt.WebvttParser; import com.google.android.exoplayer.upstream.DataSource; import com.google.android.exoplayer.upstream.DefaultAllocator; import com.google.android.exoplayer.upstream.DefaultBandwidthMeter; -import com.google.android.exoplayer.upstream.DefaultHttpDataSource; import com.google.android.exoplayer.upstream.DefaultUriDataSource; -import com.google.android.exoplayer.upstream.HttpDataSource; +import com.google.android.exoplayer.upstream.UriDataSource; import com.google.android.exoplayer.util.ManifestFetcher; import com.google.android.exoplayer.util.ManifestFetcher.ManifestCallback; import com.google.android.exoplayer.util.Util; @@ -112,7 +111,7 @@ public class DashRendererBuilder implements RendererBuilder, private DemoPlayer player; private RendererBuilderCallback callback; private ManifestFetcher manifestFetcher; - private HttpDataSource manifestDataSource; + private UriDataSource manifestDataSource; private MediaPresentationDescription manifest; private long elapsedRealtimeOffset; @@ -132,7 +131,7 @@ public class DashRendererBuilder implements RendererBuilder, this.player = player; this.callback = callback; MediaPresentationDescriptionParser parser = new MediaPresentationDescriptionParser(); - manifestDataSource = new DefaultHttpDataSource(userAgent, null); + manifestDataSource = new DefaultUriDataSource(userAgent, null); manifestFetcher = new ManifestFetcher(url, manifestDataSource, parser); manifestFetcher.singleLoad(player.getMainHandler().getLooper(), this);