From 5c2bb2a8520c4ad9dad978b884db4a330fe90d08 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 29 Jun 2016 07:28:59 -0700
Subject: [PATCH] Use the correct format for init segments loads.

This is causing getTrackIndex to fail for live playbacks.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=126189387
---
 .../android/exoplayer/dash/DashChunkSource.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java b/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java
index 404112879d..7537e68e98 100644
--- a/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java
+++ b/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java
@@ -195,9 +195,9 @@ public class DashChunkSource implements ChunkSource {
     }
     if (pendingInitializationUri != null || pendingIndexUri != null) {
       // We have initialization and/or index requests to make.
-      Chunk initializationChunk = newInitializationChunk(pendingInitializationUri, pendingIndexUri,
-          selectedRepresentation, representationHolder.extractorWrapper, dataSource,
-          evaluation.trigger, evaluation.data);
+      Chunk initializationChunk = newInitializationChunk(representationHolder, dataSource,
+          selectedFormat, pendingInitializationUri, pendingIndexUri, evaluation.trigger,
+          evaluation.data);
       lastChunkWasInitialization = true;
       out.chunk = initializationChunk;
       return;
@@ -305,8 +305,8 @@ public class DashChunkSource implements ChunkSource {
     }
   }
 
-  private Chunk newInitializationChunk(RangedUri initializationUri, RangedUri indexUri,
-      Representation representation, ChunkExtractorWrapper extractor, DataSource dataSource,
+  private Chunk newInitializationChunk(RepresentationHolder representationHolder,
+      DataSource dataSource, Format trackFormat, RangedUri initializationUri, RangedUri indexUri,
       int formatEvaluatorTrigger, Object formatEvaluatorData) {
     RangedUri requestUri;
     if (initializationUri != null) {
@@ -320,9 +320,9 @@ public class DashChunkSource implements ChunkSource {
       requestUri = indexUri;
     }
     DataSpec dataSpec = new DataSpec(requestUri.getUri(), requestUri.start, requestUri.length,
-        representation.getCacheKey());
-    return new InitializationChunk(dataSource, dataSpec, representation.format,
-        formatEvaluatorTrigger, formatEvaluatorData, extractor);
+        representationHolder.representation.getCacheKey());
+    return new InitializationChunk(dataSource, dataSpec, trackFormat,
+        formatEvaluatorTrigger, formatEvaluatorData, representationHolder.extractorWrapper);
   }
 
   private Chunk newMediaChunk(RepresentationHolder representationHolder, DataSource dataSource,
-- 
GitLab