Commit 8947950b by andrewlewis Committed by Oliver Woodman

Make SsMediaSource.Builder a factory for SsMediaSources

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=178380856
parent e419154b
...@@ -388,10 +388,9 @@ import java.util.ArrayList; ...@@ -388,10 +388,9 @@ import java.util.ArrayList;
Uri uri = Uri.parse(sample.uri); Uri uri = Uri.parse(sample.uri);
switch (sample.mimeType) { switch (sample.mimeType) {
case DemoUtil.MIME_TYPE_SS: case DemoUtil.MIME_TYPE_SS:
return SsMediaSource.Builder return new SsMediaSource.Factory(
.forManifestUri(uri, DATA_SOURCE_FACTORY, new DefaultSsChunkSource.Factory(DATA_SOURCE_FACTORY), DATA_SOURCE_FACTORY)
new DefaultSsChunkSource.Factory(DATA_SOURCE_FACTORY)) .createMediaSource(uri);
.build();
case DemoUtil.MIME_TYPE_DASH: case DemoUtil.MIME_TYPE_DASH:
return new DashMediaSource.Factory( return new DashMediaSource.Factory(
new DefaultDashChunkSource.Factory(DATA_SOURCE_FACTORY), DATA_SOURCE_FACTORY) new DefaultDashChunkSource.Factory(DATA_SOURCE_FACTORY), DATA_SOURCE_FACTORY)
......
...@@ -365,11 +365,10 @@ public class PlayerActivity extends Activity implements OnClickListener, ...@@ -365,11 +365,10 @@ public class PlayerActivity extends Activity implements OnClickListener,
: Util.inferContentType("." + overrideExtension); : Util.inferContentType("." + overrideExtension);
switch (type) { switch (type) {
case C.TYPE_SS: case C.TYPE_SS:
return SsMediaSource.Builder return new SsMediaSource.Factory(
.forManifestUri(uri, buildDataSourceFactory(false), new DefaultSsChunkSource.Factory(mediaDataSourceFactory),
new DefaultSsChunkSource.Factory(mediaDataSourceFactory)) buildDataSourceFactory(false))
.setEventListener(mainHandler, eventLogger) .createMediaSource(uri, mainHandler, eventLogger);
.build();
case C.TYPE_DASH: case C.TYPE_DASH:
return new DashMediaSource.Factory( return new DashMediaSource.Factory(
new DefaultDashChunkSource.Factory(mediaDataSourceFactory), new DefaultDashChunkSource.Factory(mediaDataSourceFactory),
......
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