Snap for 4384531 from bb2e798ef4d546dd54cd9e95796403062b860c15 to oc-m2-releaseandroid-8.1.0_r8android-8.1.0_r52android-8.1.0_r50android-8.1.0_r47android-8.1.0_r46android-8.1.0_r43android-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20android-8.1.0_r2oreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release

Change-Id: I06099c50eb5f4c5791fab1e6055cca20fb367c6d

1 files changed, 6 insertions, 8 deletions

diff --git a/src/com/android/tv/tuner/exoplayer/FileSampleExtractor.java b/src/com/android/tv/tuner/exoplayer/FileSampleExtractor.java
index ec7b4b16..b7e42a7c 100644
--- a/src/com/android/tv/tuner/exoplayer/FileSampleExtractor.java
+++ b/src/com/android/tv/tuner/exoplayer/FileSampleExtractor.java
@@ -25,7 +25,6 @@ import com.android.tv.tuner.exoplayer.buffer.RecordingSampleBuffer;
 import com.android.tv.tuner.tvinput.PlaybackBufferListener;
 
 import android.os.Handler;
-import android.util.Pair;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -61,18 +60,17 @@ public class FileSampleExtractor implements SampleExtractor{
 
     @Override
     public boolean prepare() throws IOException {
-        ArrayList<Pair<String, android.media.MediaFormat>> trackInfos =
-                mBufferManager.readTrackInfoFiles();
-        if (trackInfos == null || trackInfos.isEmpty()) {
+        List<BufferManager.TrackFormat> trackFormatList = mBufferManager.readTrackInfoFiles();
+        if (trackFormatList == null || trackFormatList.isEmpty()) {
             throw new IOException("Cannot find meta files for the recording.");
         }
-        mTrackCount = trackInfos.size();
+        mTrackCount = trackFormatList.size();
         List<String> ids = new ArrayList<>();
         mTrackFormats.clear();
         for (int i = 0; i < mTrackCount; ++i) {
-            Pair<String, android.media.MediaFormat> pair = trackInfos.get(i);
-            ids.add(pair.first);
-            mTrackFormats.add(MediaFormatUtil.createMediaFormat(pair.second));
+            BufferManager.TrackFormat trackFormat = trackFormatList.get(i);
+            ids.add(trackFormat.trackId);
+            mTrackFormats.add(MediaFormatUtil.createMediaFormat(trackFormat.format));
         }
         mSampleBuffer = new RecordingSampleBuffer(mBufferManager, mBufferListener, true,
                 RecordingSampleBuffer.BUFFER_REASON_RECORDED_PLAYBACK);