Skip to content

SDK / exoplayer

Go to a project
Commit 4c71d636 by andrewlewis Committed by Oliver Woodman
Options

Make SsMediaSource.Builder a factory for SsMediaSources 

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=178380856
parent a0d42b53
Inline Side-by-side
Showing with 99 additions and 83 deletions
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
...@@ -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),
......
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
...@@ -29,6 +29,7 @@ import com.google.android.exoplayer2.source.MediaSource; ...@@ -29,6 +29,7 @@ import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.MediaSourceEventListener; import com.google.android.exoplayer2.source.MediaSourceEventListener;
import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher; import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
import com.google.android.exoplayer2.source.SinglePeriodTimeline; import com.google.android.exoplayer2.source.SinglePeriodTimeline;
import com.google.android.exoplayer2.source.ads.AdsMediaSource;
import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest; import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest.StreamElement; import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest.StreamElement;
import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifestParser; import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifestParser;
...@@ -52,59 +53,31 @@ public final class SsMediaSource implements MediaSource, ...@@ -52,59 +53,31 @@ public final class SsMediaSource implements MediaSource,
ExoPlayerLibraryInfo.registerModule("goog.exo.smoothstreaming"); ExoPlayerLibraryInfo.registerModule("goog.exo.smoothstreaming");
} }
/** /** Factory for {@link SsMediaSource}. */
* Builder for {@link SsMediaSource}. Each builder instance can only be used once. public static final class Factory implements AdsMediaSource.MediaSourceFactory {
*/
public static final class Builder {
private final SsManifest manifest;
private final Uri manifestUri;
private final DataSource.Factory manifestDataSourceFactory;
private final SsChunkSource.Factory chunkSourceFactory; private final SsChunkSource.Factory chunkSourceFactory;
private final @Nullable DataSource.Factory manifestDataSourceFactory;
private ParsingLoadable.Parser<? extends SsManifest> manifestParser; private @Nullable ParsingLoadable.Parser<? extends SsManifest> manifestParser;
private MediaSourceEventListener eventListener;
private Handler eventHandler;
private int minLoadableRetryCount; private int minLoadableRetryCount;
private long livePresentationDelayMs; private long livePresentationDelayMs;
private boolean isBuildCalled; private boolean isCreateCalled;
/** /**
* Creates a {@link Builder} for a {@link SsMediaSource} with a side-loaded manifest. * Creates a new factory for {@link SsMediaSource}s.
* *
* @param manifest The manifest. {@link SsManifest#isLive} must be false.
* @param chunkSourceFactory A factory for {@link SsChunkSource} instances. * @param chunkSourceFactory A factory for {@link SsChunkSource} instances.
* @return A new builder.
*/
public static Builder forSideLoadedManifest(SsManifest manifest,
SsChunkSource.Factory chunkSourceFactory) {
Assertions.checkArgument(!manifest.isLive);
return new Builder(manifest, null, null, chunkSourceFactory);
}
/**
* Creates a {@link Builder} for a {@link SsMediaSource} with a loadable manifest Uri.
*
* @param manifestUri The manifest {@link Uri}.
* @param manifestDataSourceFactory A factory for {@link DataSource} instances that will be used * @param manifestDataSourceFactory A factory for {@link DataSource} instances that will be used
* to load (and refresh) the manifest. * to load (and refresh) the manifest. May be {@code null} if the factory will only ever be
* @param chunkSourceFactory A factory for {@link SsChunkSource} instances. * used to create create media sources with sideloaded manifests via {@link
* @return A new builder. * #createMediaSource(SsManifest, Handler, MediaSourceEventListener)}.
*/ */
public static Builder forManifestUri(Uri manifestUri, public Factory(
DataSource.Factory manifestDataSourceFactory, SsChunkSource.Factory chunkSourceFactory) { SsChunkSource.Factory chunkSourceFactory,
return new Builder(null, manifestUri, manifestDataSourceFactory, chunkSourceFactory); @Nullable DataSource.Factory manifestDataSourceFactory) {
} this.chunkSourceFactory = Assertions.checkNotNull(chunkSourceFactory);
private Builder(@Nullable SsManifest manifest, @Nullable Uri manifestUri,
@Nullable DataSource.Factory manifestDataSourceFactory,
SsChunkSource.Factory chunkSourceFactory) {
this.manifest = manifest;
this.manifestUri = manifestUri;
this.manifestDataSourceFactory = manifestDataSourceFactory; this.manifestDataSourceFactory = manifestDataSourceFactory;
this.chunkSourceFactory = chunkSourceFactory;
minLoadableRetryCount = DEFAULT_MIN_LOADABLE_RETRY_COUNT; minLoadableRetryCount = DEFAULT_MIN_LOADABLE_RETRY_COUNT;
livePresentationDelayMs = DEFAULT_LIVE_PRESENTATION_DELAY_MS; livePresentationDelayMs = DEFAULT_LIVE_PRESENTATION_DELAY_MS;
} }
...@@ -114,73 +87,117 @@ public final class SsMediaSource implements MediaSource, ...@@ -114,73 +87,117 @@ public final class SsMediaSource implements MediaSource,
* {@link #DEFAULT_MIN_LOADABLE_RETRY_COUNT}. * {@link #DEFAULT_MIN_LOADABLE_RETRY_COUNT}.
* *
* @param minLoadableRetryCount The minimum number of times to retry if a loading error occurs. * @param minLoadableRetryCount The minimum number of times to retry if a loading error occurs.
* @return This builder. * @return This factory, for convenience.
* @throws IllegalStateException If one of the {@code create} methods has already been called.
*/ */
public Builder setMinLoadableRetryCount(int minLoadableRetryCount) { public Factory setMinLoadableRetryCount(int minLoadableRetryCount) {
Assertions.checkState(!isCreateCalled);
this.minLoadableRetryCount = minLoadableRetryCount; this.minLoadableRetryCount = minLoadableRetryCount;
return this; return this;
} }
/** /**
* Sets the duration in milliseconds by which the default start position should precede the end * Sets the duration in milliseconds by which the default start position should precede the end
* of the live window for live playbacks. The default value is * of the live window for live playbacks. The default value is {@link
* {@link #DEFAULT_LIVE_PRESENTATION_DELAY_MS}. * #DEFAULT_LIVE_PRESENTATION_DELAY_MS}.
* *
* @param livePresentationDelayMs For live playbacks, the duration in milliseconds by which the * @param livePresentationDelayMs For live playbacks, the duration in milliseconds by which the
* default start position should precede the end of the live window. * default start position should precede the end of the live window.
* @return This builder. * @return This factory, for convenience.
* @throws IllegalStateException If one of the {@code create} methods has already been called.
*/ */
public Builder setLivePresentationDelayMs(long livePresentationDelayMs) { public Factory setLivePresentationDelayMs(long livePresentationDelayMs) {
Assertions.checkState(!isCreateCalled);
this.livePresentationDelayMs = livePresentationDelayMs; this.livePresentationDelayMs = livePresentationDelayMs;
return this; return this;
} }
/** /**
* Sets the listener to respond to adaptive {@link MediaSource} events and the handler to * Sets the manifest parser to parse loaded manifest data when loading a manifest URI.
* deliver these events. *
* @param manifestParser A parser for loaded manifest data.
* @return This factory, for convenience.
* @throws IllegalStateException If one of the {@code create} methods has already been called.
*/
public Factory setManifestParser(ParsingLoadable.Parser<? extends SsManifest> manifestParser) {
Assertions.checkState(!isCreateCalled);
this.manifestParser = Assertions.checkNotNull(manifestParser);
return this;
}
/**
* Returns a new {@link SsMediaSource} using the current parameters and the specified sideloaded
* manifest.
* *
* @param manifest The manifest. {@link SsManifest#isLive} must be false.
* @param eventHandler A handler for events. * @param eventHandler A handler for events.
* @param eventListener A listener of events. * @param eventListener A listener of events.
* @return This builder. * @return The new {@link SsMediaSource}.
* @throws IllegalArgumentException If {@link SsManifest#isLive} is true.
*/ */
public Builder setEventListener(Handler eventHandler, MediaSourceEventListener eventListener) { public SsMediaSource createMediaSource(
this.eventHandler = eventHandler; SsManifest manifest,
this.eventListener = eventListener; @Nullable Handler eventHandler,
return this; @Nullable MediaSourceEventListener eventListener) {
Assertions.checkArgument(!manifest.isLive);
isCreateCalled = true;
return new SsMediaSource(
manifest,
null,
null,
null,
chunkSourceFactory,
minLoadableRetryCount,
livePresentationDelayMs,
eventHandler,
eventListener);
} }
/** /**
* Sets the manifest parser to parse loaded manifest data. The default is an instance of * Returns a new {@link SsMediaSource} using the current parameters. Media source events will
* {@link SsManifestParser}, or {@code null} if the manifest is sideloaded. * not be delivered.
* *
* @param manifestParser A parser for loaded manifest data. * @param manifestUri The manifest {@link Uri}.
* @return This builder. * @return The new {@link SsMediaSource}.
*/ */
public Builder setManifestParser(ParsingLoadable.Parser<? extends SsManifest> manifestParser) { public SsMediaSource createMediaSource(Uri manifestUri) {
this.manifestParser = manifestParser; return createMediaSource(manifestUri, null, null);
return this;
} }
/** /**
* Builds a new {@link SsMediaSource} using the current parameters. * Returns a new {@link SsMediaSource} using the current parameters.
* <p>
* After this call, the builder should not be re-used.
* *
* @return The newly built {@link SsMediaSource}. * @param manifestUri The manifest {@link Uri}.
* @param eventHandler A handler for events.
* @param eventListener A listener of events.
* @return The new {@link SsMediaSource}.
*/ */
public SsMediaSource build() { @Override
Assertions.checkArgument((eventListener == null) == (eventHandler == null)); public SsMediaSource createMediaSource(
Assertions.checkState(!isBuildCalled); Uri manifestUri,
isBuildCalled = true; @Nullable Handler eventHandler,
boolean loadableManifestUri = manifestUri != null; @Nullable MediaSourceEventListener eventListener) {
if (loadableManifestUri && manifestParser == null) { isCreateCalled = true;
if (manifestParser == null) {
manifestParser = new SsManifestParser(); manifestParser = new SsManifestParser();
} }
return new SsMediaSource(manifest, manifestUri, manifestDataSourceFactory, manifestParser, return new SsMediaSource(
chunkSourceFactory, minLoadableRetryCount, livePresentationDelayMs, eventHandler, null,
Assertions.checkNotNull(manifestUri),
manifestDataSourceFactory,
manifestParser,
chunkSourceFactory,
minLoadableRetryCount,
livePresentationDelayMs,
eventHandler,
eventListener); eventListener);
} }
@Override
public int[] getSupportedTypes() {
return new int[] {C.TYPE_SS};
}
} }
/** /**
...@@ -228,7 +245,7 @@ public final class SsMediaSource implements MediaSource, ...@@ -228,7 +245,7 @@ public final class SsMediaSource implements MediaSource,
* @param chunkSourceFactory A factory for {@link SsChunkSource} instances. * @param chunkSourceFactory A factory for {@link SsChunkSource} instances.
* @param eventHandler A handler for events. May be null if delivery of events is not required. * @param eventHandler A handler for events. May be null if delivery of events is not required.
* @param eventListener A listener of events. May be null if delivery of events is not required. * @param eventListener A listener of events. May be null if delivery of events is not required.
* @deprecated Use {@link Builder} instead. * @deprecated Use {@link Factory} instead.
*/ */
@Deprecated @Deprecated
public SsMediaSource(SsManifest manifest, SsChunkSource.Factory chunkSourceFactory, public SsMediaSource(SsManifest manifest, SsChunkSource.Factory chunkSourceFactory,
...@@ -245,7 +262,7 @@ public final class SsMediaSource implements MediaSource, ...@@ -245,7 +262,7 @@ public final class SsMediaSource implements MediaSource,
* @param minLoadableRetryCount The minimum number of times to retry if a loading error occurs. * @param minLoadableRetryCount The minimum number of times to retry if a loading error occurs.
* @param eventHandler A handler for events. May be null if delivery of events is not required. * @param eventHandler A handler for events. May be null if delivery of events is not required.
* @param eventListener A listener of events. May be null if delivery of events is not required. * @param eventListener A listener of events. May be null if delivery of events is not required.
* @deprecated Use {@link Builder} instead. * @deprecated Use {@link Factory} instead.
*/ */
@Deprecated @Deprecated
public SsMediaSource(SsManifest manifest, SsChunkSource.Factory chunkSourceFactory, public SsMediaSource(SsManifest manifest, SsChunkSource.Factory chunkSourceFactory,
...@@ -264,7 +281,7 @@ public final class SsMediaSource implements MediaSource, ...@@ -264,7 +281,7 @@ public final class SsMediaSource implements MediaSource,
* @param chunkSourceFactory A factory for {@link SsChunkSource} instances. * @param chunkSourceFactory A factory for {@link SsChunkSource} instances.
* @param eventHandler A handler for events. May be null if delivery of events is not required. * @param eventHandler A handler for events. May be null if delivery of events is not required.
* @param eventListener A listener of events. May be null if delivery of events is not required. * @param eventListener A listener of events. May be null if delivery of events is not required.
* @deprecated Use {@link Builder} instead. * @deprecated Use {@link Factory} instead.
*/ */
@Deprecated @Deprecated
public SsMediaSource(Uri manifestUri, DataSource.Factory manifestDataSourceFactory, public SsMediaSource(Uri manifestUri, DataSource.Factory manifestDataSourceFactory,
...@@ -288,7 +305,7 @@ public final class SsMediaSource implements MediaSource, ...@@ -288,7 +305,7 @@ public final class SsMediaSource implements MediaSource,
* default start position should precede the end of the live window. * default start position should precede the end of the live window.
* @param eventHandler A handler for events. May be null if delivery of events is not required. * @param eventHandler A handler for events. May be null if delivery of events is not required.
* @param eventListener A listener of events. May be null if delivery of events is not required. * @param eventListener A listener of events. May be null if delivery of events is not required.
* @deprecated Use {@link Builder} instead. * @deprecated Use {@link Factory} instead.
*/ */
@Deprecated @Deprecated
public SsMediaSource(Uri manifestUri, DataSource.Factory manifestDataSourceFactory, public SsMediaSource(Uri manifestUri, DataSource.Factory manifestDataSourceFactory,
...@@ -312,7 +329,7 @@ public final class SsMediaSource implements MediaSource, ...@@ -312,7 +329,7 @@ public final class SsMediaSource implements MediaSource,
* default start position should precede the end of the live window. * default start position should precede the end of the live window.
* @param eventHandler A handler for events. May be null if delivery of events is not required. * @param eventHandler A handler for events. May be null if delivery of events is not required.
* @param eventListener A listener of events. May be null if delivery of events is not required. * @param eventListener A listener of events. May be null if delivery of events is not required.
* @deprecated Use {@link Builder} instead. * @deprecated Use {@link Factory} instead.
*/ */
@Deprecated @Deprecated
public SsMediaSource(Uri manifestUri, DataSource.Factory manifestDataSourceFactory, public SsMediaSource(Uri manifestUri, DataSource.Factory manifestDataSourceFactory,
......
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