Commit ba32d95d by andrewlewis Committed by Oliver Woodman

Make HlsMediaSource.Builder a factory for HlsMediaSources

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=178384204
parent 8947950b
...@@ -396,9 +396,7 @@ import java.util.ArrayList; ...@@ -396,9 +396,7 @@ import java.util.ArrayList;
new DefaultDashChunkSource.Factory(DATA_SOURCE_FACTORY), DATA_SOURCE_FACTORY) new DefaultDashChunkSource.Factory(DATA_SOURCE_FACTORY), DATA_SOURCE_FACTORY)
.createMediaSource(uri); .createMediaSource(uri);
case DemoUtil.MIME_TYPE_HLS: case DemoUtil.MIME_TYPE_HLS:
return HlsMediaSource.Builder return new HlsMediaSource.Factory(DATA_SOURCE_FACTORY).createMediaSource(uri);
.forDataSource(uri, DATA_SOURCE_FACTORY)
.build();
case DemoUtil.MIME_TYPE_VIDEO_MP4: case DemoUtil.MIME_TYPE_VIDEO_MP4:
return new ExtractorMediaSource.Builder(uri, DATA_SOURCE_FACTORY).build(); return new ExtractorMediaSource.Builder(uri, DATA_SOURCE_FACTORY).build();
default: { default: {
......
...@@ -375,10 +375,8 @@ public class PlayerActivity extends Activity implements OnClickListener, ...@@ -375,10 +375,8 @@ public class PlayerActivity extends Activity implements OnClickListener,
buildDataSourceFactory(false)) buildDataSourceFactory(false))
.createMediaSource(uri, mainHandler, eventLogger); .createMediaSource(uri, mainHandler, eventLogger);
case C.TYPE_HLS: case C.TYPE_HLS:
return HlsMediaSource.Builder return new HlsMediaSource.Factory(mediaDataSourceFactory)
.forDataSource(uri, mediaDataSourceFactory) .createMediaSource(uri, mainHandler, eventLogger);
.setEventListener(mainHandler, eventLogger)
.build();
case C.TYPE_OTHER: case C.TYPE_OTHER:
return new ExtractorMediaSource.Builder(uri, mediaDataSourceFactory) return new ExtractorMediaSource.Builder(uri, mediaDataSourceFactory)
.setEventListener(mainHandler, eventLogger) .setEventListener(mainHandler, eventLogger)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment