diff --git a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java b/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java
index 7bbcd58cee..a32f14eebd 100644
--- a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java
+++ b/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java
@@ -54,9 +54,9 @@ public class DashRendererBuilder implements ManifestCallback<MediaPresentationDe
   private static final int VIDEO_BUFFER_SEGMENTS = 200;
   private static final int AUDIO_BUFFER_SEGMENTS = 60;
 
-  private String manifestUrl;
-  private String userAgent;
-  private VideoPlayer player;
+  private final String manifestUrl;
+  private final String userAgent;
+  private final VideoPlayer player;
 
   public DashRendererBuilder(String manifestUrl, String userAgent, VideoPlayer player) {
     this.manifestUrl = manifestUrl;
@@ -105,7 +105,7 @@ public class DashRendererBuilder implements ManifestCallback<MediaPresentationDe
     // Build the video renderer.
     LibvpxVideoTrackRenderer videoRenderer = null;
     if (!videoRepresentationsList.isEmpty()) {
-      DataSource videoDataSource = new DefaultUriDataSource(userAgent, bandwidthMeter);
+      DataSource videoDataSource = new DefaultUriDataSource(player, bandwidthMeter, userAgent);
       ChunkSource videoChunkSource;
       String mimeType = videoRepresentations[0].format.mimeType;
       if (mimeType.equals(MimeTypes.VIDEO_WEBM)) {
@@ -124,7 +124,7 @@ public class DashRendererBuilder implements ManifestCallback<MediaPresentationDe
     MultiTrackChunkSource audioChunkSource = null;
     TrackRenderer audioRenderer = null;
     if (!audioRepresentationsList.isEmpty()) {
-      DataSource audioDataSource = new DefaultUriDataSource(userAgent, bandwidthMeter);
+      DataSource audioDataSource = new DefaultUriDataSource(player, bandwidthMeter, userAgent);
       ChunkSource[] audioChunkSources = new ChunkSource[audioRepresentationsList.size()];
       FormatEvaluator audioEvaluator = new FormatEvaluator.FixedEvaluator();
       for (int i = 0; i < audioRepresentationsList.size(); i++) {
diff --git a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java b/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java
index 2af9cb14d4..f6ea05e407 100644
--- a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java
+++ b/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java
@@ -160,7 +160,7 @@ public class VideoPlayer extends Activity implements OnClickListener,
     mediaController.setEnabled(true);
     ExtractorSampleSource sampleSource = new ExtractorSampleSource(
         Uri.fromFile(new File(filename)),
-        new DefaultUriDataSource(Util.getUserAgent(this, "ExoPlayerExtWebMDemo"), null),
+        new DefaultUriDataSource(this, Util.getUserAgent(this, "ExoPlayerExtWebMDemo")),
         new WebmExtractor(), 2, EXTRACTOR_BUFFER_SIZE);
     TrackRenderer videoRenderer =
         new LibvpxVideoTrackRenderer(sampleSource, true, handler, this, 50);