Seamless splicing for adaptive HLS.

demo/src/main/java/com/google/android/exoplayer/demo/full/player/HlsRendererBuilder.java

@@ -16,6 +16,7 @@
 package com.google.android.exoplayer.demo.full.player;
 
 import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
+import com.google.android.exoplayer.MediaCodecUtil;
 import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
 import com.google.android.exoplayer.TrackRenderer;
 import com.google.android.exoplayer.demo.DemoUtil;
@@ -35,6 +36,7 @@ import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
 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.MimeTypes;
 
 import android.media.MediaCodec;
 import android.net.Uri;
@@ -92,7 +94,7 @@ public class HlsRendererBuilder implements RendererBuilder, ManifestCallback<Hls
 
     DataSource dataSource = new UriDataSource(userAgent, bandwidthMeter);
     HlsChunkSource chunkSource = new HlsChunkSource(dataSource, manifest, bandwidthMeter, null,
-        false);
+        MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_H264, false).adaptive);
     HlsSampleSource sampleSource = new HlsSampleSource(chunkSource, true, 3);
     MediaCodecVideoTrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(sampleSource,
         MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 0, player.getMainHandler(), player, 50);

demo/src/main/java/com/google/android/exoplayer/demo/simple/HlsRendererBuilder.java

@@ -16,6 +16,7 @@
 package com.google.android.exoplayer.demo.simple;
 
 import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
+import com.google.android.exoplayer.MediaCodecUtil;
 import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
 import com.google.android.exoplayer.TrackRenderer;
 import com.google.android.exoplayer.demo.DemoUtil;
@@ -32,6 +33,7 @@ import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
 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.MimeTypes;
 
 import android.media.MediaCodec;
 import android.net.Uri;
@@ -88,7 +90,7 @@ import java.util.Collections;
     DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();
     DataSource dataSource = new UriDataSource(userAgent, bandwidthMeter);
     HlsChunkSource chunkSource = new HlsChunkSource(dataSource, manifest, bandwidthMeter, null,
-        false);
+        MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_H264, false).adaptive);
     HlsSampleSource sampleSource = new HlsSampleSource(chunkSource, true, 2);
     MediaCodecVideoTrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(sampleSource,
         MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 0, playerActivity.getMainHandler(),

library/src/main/java/com/google/android/exoplayer/hls/HlsChunkSource.java

@@ -249,9 +249,6 @@ public class HlsChunkSource {
     } else {
       extractor = previousTsChunk.extractor;
     }
-    if (splicingOut) {
-      extractor.discardFromNextKeyframes();
-    }
 
     return new TsChunk(dataSource, dataSpec, extractor, enabledVariants[currentVariantIndex].index,
         startTimeUs, endTimeUs, nextChunkMediaSequence, splicingOut);

library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java

@@ -187,6 +187,13 @@ public class HlsSampleSource implements SampleSource, Loader.Callback {
       extractors.removeFirst().clear();
       extractor = extractors.getFirst();
     }
+
+    if (extractors.size() > 1) {
+      // If there's more than one extractor, attempt to configure a seamless splice from the
+      // current one to the next one.
+      extractor.configureSpliceTo(extractors.get(1));
+    }
+
     int extractorIndex = 0;
     while (extractors.size() > extractorIndex + 1 && !extractor.hasSamples(track)) {
       // We're finished reading from the extractor for this particular track, so advance to the