Skip to content

SDK / exoplayer

Go to a project
Commit bd3574df by olly Committed by Oliver Woodman
Options

Allow SampleSourceProvider concatenation, simplify demo. 

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=126196431
parent 5c2bb2a8
Expand all
Inline Side-by-side
Showing with 96 additions and 86 deletions
demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer.demo; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer.demo;
import com.google.android.exoplayer.AspectRatioFrameLayout; import com.google.android.exoplayer.AspectRatioFrameLayout;
import com.google.android.exoplayer.C; import com.google.android.exoplayer.C;
import com.google.android.exoplayer.ConcatenatingSampleSourceProvider;
import com.google.android.exoplayer.DefaultBufferingPolicy; import com.google.android.exoplayer.DefaultBufferingPolicy;
import com.google.android.exoplayer.DefaultTrackSelectionPolicy; import com.google.android.exoplayer.DefaultTrackSelectionPolicy;
import com.google.android.exoplayer.DefaultTrackSelector; import com.google.android.exoplayer.DefaultTrackSelector;
...@@ -26,6 +27,7 @@ import com.google.android.exoplayer.ExoPlayer; ...@@ -26,6 +27,7 @@ import com.google.android.exoplayer.ExoPlayer;
import com.google.android.exoplayer.ExoPlayerFactory; import com.google.android.exoplayer.ExoPlayerFactory;
import com.google.android.exoplayer.MediaCodecTrackRenderer.DecoderInitializationException; import com.google.android.exoplayer.MediaCodecTrackRenderer.DecoderInitializationException;
import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException; import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException;
import com.google.android.exoplayer.SampleSourceProvider;
import com.google.android.exoplayer.SimpleExoPlayer; import com.google.android.exoplayer.SimpleExoPlayer;
import com.google.android.exoplayer.TrackGroupArray; import com.google.android.exoplayer.TrackGroupArray;
import com.google.android.exoplayer.drm.DrmSessionManager; import com.google.android.exoplayer.drm.DrmSessionManager;
...@@ -85,19 +87,15 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback, ...@@ -85,19 +87,15 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback,
ExoPlayer.EventListener, SimpleExoPlayer.VideoListener, SimpleExoPlayer.CaptionListener, ExoPlayer.EventListener, SimpleExoPlayer.VideoListener, SimpleExoPlayer.CaptionListener,
SimpleExoPlayer.Id3MetadataListener, DefaultTrackSelector.EventListener { SimpleExoPlayer.Id3MetadataListener, DefaultTrackSelector.EventListener {
// For use within demo app code. public static final String URIS_LIST_EXTRA = "uris";
public static final String CONTENT_TYPE_EXTRA = "content_type"; public static final String CONTENT_EXT_EXTRA = "extension";
public static final String DRM_SCHEME_UUID_EXTRA = "drm_scheme_uuid"; public static final String DRM_SCHEME_UUID_EXTRA = "drm_scheme_uuid";
public static final String DRM_CONTENT_ID_EXTRA = "drm_content_id"; public static final String DRM_CONTENT_ID_EXTRA = "drm_content_id";
public static final String DRM_PROVIDER_EXTRA = "drm_provider"; public static final String DRM_PROVIDER_EXTRA = "drm_provider";
public static final String PREFER_EXTENSION_DECODERS = "prefer_extension_decoders"; public static final String PREFER_EXTENSION_DECODERS = "prefer_extension_decoders";
// For use when launching the demo app using adb.
public static final String ACTION_VIEW = "com.google.android.exoplayer.demo.action.VIEW"; public static final String ACTION_VIEW = "com.google.android.exoplayer.demo.action.VIEW";
private static final String ACTION_VIEW_LIST = public static final String ACTION_VIEW_LIST =
"com.google.android.exoplayer.demo.action.VIEW_LIST"; "com.google.android.exoplayer.demo.action.VIEW_LIST";
private static final String CONTENT_EXT_EXTRA = "type";
private static final String URIS_LIST_EXTRA = "uris";
private static final String TAG = "PlayerActivity"; private static final String TAG = "PlayerActivity";
...@@ -287,20 +285,14 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback, ...@@ -287,20 +285,14 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback,
if (playerNeedsSource) { if (playerNeedsSource) {
String action = intent.getAction(); String action = intent.getAction();
Uri[] uris; Uri[] uris;
UriSampleSourceProvider sourceProvider;
if (ACTION_VIEW.equals(action)) { if (ACTION_VIEW.equals(action)) {
uris = new Uri[] {intent.getData()}; uris = new Uri[] {intent.getData()};
sourceProvider = new UriSampleSourceProvider(player, dataSourceFactory, intent.getData(),
intent.getIntExtra(CONTENT_TYPE_EXTRA, UriSampleSourceProvider.UNKNOWN_TYPE),
intent.getStringExtra(CONTENT_EXT_EXTRA), mainHandler, eventLogger);
} else if (ACTION_VIEW_LIST.equals(action)) { } else if (ACTION_VIEW_LIST.equals(action)) {
String[] uriStrings = intent.getStringArrayExtra(URIS_LIST_EXTRA); String[] uriStrings = intent.getStringArrayExtra(URIS_LIST_EXTRA);
uris = new Uri[uriStrings.length]; uris = new Uri[uriStrings.length];
for (int i = 0; i < uriStrings.length; i++) { for (int i = 0; i < uriStrings.length; i++) {
uris[i] = Uri.parse(uriStrings[i]); uris[i] = Uri.parse(uriStrings[i]);
} }
sourceProvider = new UriSampleSourceProvider(player, dataSourceFactory, uris, mainHandler,
eventLogger);
} else { } else {
Log.w(TAG, "Unexpected intent action: " + action); Log.w(TAG, "Unexpected intent action: " + action);
return; return;
...@@ -309,6 +301,14 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback, ...@@ -309,6 +301,14 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback,
// The player will be reinitialized if permission is granted. // The player will be reinitialized if permission is granted.
return; return;
} }
UriSampleSourceProvider[] providers = new UriSampleSourceProvider[uris.length];
for (int i = 0; i < uris.length; i++) {
providers[i] = new UriSampleSourceProvider(player.getBandwidthMeter(), dataSourceFactory,
uris[i], intent.getStringExtra(CONTENT_EXT_EXTRA), mainHandler, eventLogger);
}
SampleSourceProvider sourceProvider = providers.length == 1 ? providers[0]
: new ConcatenatingSampleSourceProvider(providers);
player.setSourceProvider(sourceProvider); player.setSourceProvider(sourceProvider);
playerNeedsSource = false; playerNeedsSource = false;
updateButtonVisibilities(); updateButtonVisibilities();
......
demo/src/main/java/com/google/android/exoplayer/demo/SampleChooserActivity.java
...@@ -93,7 +93,7 @@ public class SampleChooserActivity extends Activity { ...@@ -93,7 +93,7 @@ public class SampleChooserActivity extends Activity {
Intent intent = new Intent(this, PlayerActivity.class) Intent intent = new Intent(this, PlayerActivity.class)
.setAction(PlayerActivity.ACTION_VIEW) .setAction(PlayerActivity.ACTION_VIEW)
.setData(Uri.parse(sample.uri)) .setData(Uri.parse(sample.uri))
.putExtra(PlayerActivity.CONTENT_TYPE_EXTRA, sample.type) .putExtra(PlayerActivity.CONTENT_EXT_EXTRA, sample.extension)
.putExtra(PlayerActivity.DRM_SCHEME_UUID_EXTRA, sample.drmSchemeUuid) .putExtra(PlayerActivity.DRM_SCHEME_UUID_EXTRA, sample.drmSchemeUuid)
.putExtra(PlayerActivity.DRM_CONTENT_ID_EXTRA, sample.drmContentId) .putExtra(PlayerActivity.DRM_CONTENT_ID_EXTRA, sample.drmContentId)
.putExtra(PlayerActivity.DRM_PROVIDER_EXTRA, sample.drmProvider) .putExtra(PlayerActivity.DRM_PROVIDER_EXTRA, sample.drmProvider)
...@@ -167,7 +167,7 @@ public class SampleChooserActivity extends Activity { ...@@ -167,7 +167,7 @@ public class SampleChooserActivity extends Activity {
private Sample readSample(JsonReader reader) throws IOException { private Sample readSample(JsonReader reader) throws IOException {
String sampleName = null; String sampleName = null;
String uri = null; String uri = null;
int type = Util.TYPE_OTHER; String extension = null;
UUID drmUuid = null; UUID drmUuid = null;
String drmContentId = null; String drmContentId = null;
String drmProvider = null; String drmProvider = null;
...@@ -182,8 +182,8 @@ public class SampleChooserActivity extends Activity { ...@@ -182,8 +182,8 @@ public class SampleChooserActivity extends Activity {
case "uri": case "uri":
uri = reader.nextString(); uri = reader.nextString();
break; break;
case "type": case "extension":
type = getType(reader.nextString()); extension = reader.nextString();
break; break;
case "drm": case "drm":
String[] drmComponents = reader.nextString().split(":", -1); String[] drmComponents = reader.nextString().split(":", -1);
...@@ -201,7 +201,7 @@ public class SampleChooserActivity extends Activity { ...@@ -201,7 +201,7 @@ public class SampleChooserActivity extends Activity {
if (sampleName == null || uri == null) { if (sampleName == null || uri == null) {
throw new ParserException("Invalid sample (name or uri missing)"); throw new ParserException("Invalid sample (name or uri missing)");
} }
return new Sample(sampleName, uri, type, drmUuid, drmContentId, drmProvider, return new Sample(sampleName, uri, extension, drmUuid, drmContentId, drmProvider,
preferExtensionDecoders); preferExtensionDecoders);
} }
...@@ -227,22 +227,6 @@ public class SampleChooserActivity extends Activity { ...@@ -227,22 +227,6 @@ public class SampleChooserActivity extends Activity {
} }
} }
private int getType(String typeString) {
if (typeString == null) {
return Util.TYPE_OTHER;
}
switch (typeString.toLowerCase()) {
case "dash":
return Util.TYPE_DASH;
case "smoothstreaming":
return Util.TYPE_SS;
case "hls":
return Util.TYPE_HLS;
default:
return Util.TYPE_OTHER;
}
}
} }
private static final class SampleAdapter extends BaseExpandableListAdapter { private static final class SampleAdapter extends BaseExpandableListAdapter {
...@@ -337,17 +321,17 @@ public class SampleChooserActivity extends Activity { ...@@ -337,17 +321,17 @@ public class SampleChooserActivity extends Activity {
public final String name; public final String name;
public final String uri; public final String uri;
public final int type; public final String extension;
public final UUID drmSchemeUuid; public final UUID drmSchemeUuid;
public final String drmContentId; public final String drmContentId;
public final String drmProvider; public final String drmProvider;
public final boolean preferExtensionDecoders; public final boolean preferExtensionDecoders;
public Sample(String name, String uri, int type, UUID drmSchemeUuid, String drmContentId, public Sample(String name, String uri, String extension, UUID drmSchemeUuid,
String drmProvider, boolean preferExtensionDecoders) { String drmContentId, String drmProvider, boolean preferExtensionDecoders) {
this.name = name; this.name = name;
this.uri = uri; this.uri = uri;
this.type = type; this.extension = extension;
this.drmSchemeUuid = drmSchemeUuid; this.drmSchemeUuid = drmSchemeUuid;
this.drmContentId = drmContentId; this.drmContentId = drmContentId;
this.drmProvider = drmProvider; this.drmProvider = drmProvider;
......
demo/src/main/java/com/google/android/exoplayer/demo/UriSampleSourceProvider.java
...@@ -17,11 +17,11 @@ package com.google.android.exoplayer.demo; ...@@ -17,11 +17,11 @@ package com.google.android.exoplayer.demo;
import com.google.android.exoplayer.SampleSource; import com.google.android.exoplayer.SampleSource;
import com.google.android.exoplayer.SampleSourceProvider; import com.google.android.exoplayer.SampleSourceProvider;
import com.google.android.exoplayer.SimpleExoPlayer;
import com.google.android.exoplayer.dash.DashSampleSource; import com.google.android.exoplayer.dash.DashSampleSource;
import com.google.android.exoplayer.extractor.ExtractorSampleSource; import com.google.android.exoplayer.extractor.ExtractorSampleSource;
import com.google.android.exoplayer.hls.HlsSampleSource; import com.google.android.exoplayer.hls.HlsSampleSource;
import com.google.android.exoplayer.smoothstreaming.SmoothStreamingSampleSource; import com.google.android.exoplayer.smoothstreaming.SmoothStreamingSampleSource;
import com.google.android.exoplayer.upstream.BandwidthMeter;
import com.google.android.exoplayer.upstream.DataSourceFactory; import com.google.android.exoplayer.upstream.DataSourceFactory;
import com.google.android.exoplayer.util.Util; import com.google.android.exoplayer.util.Util;
...@@ -30,17 +30,14 @@ import android.os.Handler; ...@@ -30,17 +30,14 @@ import android.os.Handler;
import android.text.TextUtils; import android.text.TextUtils;
/** /**
* Provides {@link SampleSource}s to play back media loaded from one or more URI/URIs. * Provides a {@link SampleSource} to play back media loaded from a {@link Uri}.
*/ */
public final class UriSampleSourceProvider implements SampleSourceProvider { public final class UriSampleSourceProvider implements SampleSourceProvider {
public static final int UNKNOWN_TYPE = -1; private final BandwidthMeter bandwidthMeter;
private final SimpleExoPlayer player;
private final DataSourceFactory dataSourceFactory; private final DataSourceFactory dataSourceFactory;
private final Uri[] uris; private final Uri uri;
private final String overrideExtension; private final String overrideExtension;
private final int type;
private final Handler handler; private final Handler handler;
private final EventLogger eventLogger; private final EventLogger eventLogger;
...@@ -48,71 +45,42 @@ public final class UriSampleSourceProvider implements SampleSourceProvider { ...@@ -48,71 +45,42 @@ public final class UriSampleSourceProvider implements SampleSourceProvider {
* Constructs a source provider for {@link SampleSource} to play back media at the specified * Constructs a source provider for {@link SampleSource} to play back media at the specified
* URI, using the specified type. * URI, using the specified type.
* *
* @param player The demo player, which will listen to source events. * @param bandwidthMeter A bandwidth meter.
* @param dataSourceFactory A data source factory. * @param dataSourceFactory A data source factory.
* @param uri The URI to play back. * @param uri The URI to play back.
* @param type A {@code PlayerActivity.TYPE_*} constant specifying the type of the source, or
* {@link #UNKNOWN_TYPE}, in which case it is inferred from the URI's extension.
* @param overrideExtension An overriding file extension used when inferring the source's type, * @param overrideExtension An overriding file extension used when inferring the source's type,
* or {@code null}. * or {@code null}.
* @param handler A handler to use for logging events. * @param handler A handler to use for logging events.
* @param eventLogger An event logger. * @param eventLogger An event logger.
*/ */
public UriSampleSourceProvider(SimpleExoPlayer player, DataSourceFactory dataSourceFactory, public UriSampleSourceProvider(BandwidthMeter bandwidthMeter, DataSourceFactory dataSourceFactory,
Uri uri, int type, String overrideExtension, Handler handler, EventLogger eventLogger) { Uri uri, String overrideExtension, Handler handler, EventLogger eventLogger) {
this.player = player; this.bandwidthMeter = bandwidthMeter;
this.dataSourceFactory = dataSourceFactory; this.dataSourceFactory = dataSourceFactory;
this.uri = uri;
this.overrideExtension = overrideExtension; this.overrideExtension = overrideExtension;
this.type = type;
this.handler = handler; this.handler = handler;
this.eventLogger = eventLogger; this.eventLogger = eventLogger;
uris = new Uri[] {uri};
}
/**
* Constructs a source provider for {@link SampleSource}s to play back media at one or more
* {@link Uri}s. The content type of each URI is inferred based on its last path segment.
*
* @param player The demo player, which will listen to source events.
* @param dataSourceFactory A data source factory.
* @param uris The URIs to play back.
* @param handler A handler to use for logging events.
* @param eventLogger An event logger.
*/
public UriSampleSourceProvider(SimpleExoPlayer player, DataSourceFactory dataSourceFactory,
Uri[] uris, Handler handler, EventLogger eventLogger) {
this.player = player;
this.dataSourceFactory = dataSourceFactory;
this.uris = uris;
this.handler = handler;
this.eventLogger = eventLogger;
overrideExtension = null;
type = UNKNOWN_TYPE;
} }
@Override @Override
public int getSourceCount() { public int getSourceCount() {
return uris.length; return 1;
} }
@Override @Override
public SampleSource createSource(int index) { public SampleSource createSource(int index) {
Uri uri = uris[index]; int type = inferContentType(uri, overrideExtension);
int type = this.type == UNKNOWN_TYPE ? inferContentType(uri, overrideExtension) : this.type;
switch (type) { switch (type) {
case Util.TYPE_SS: case Util.TYPE_SS:
return new SmoothStreamingSampleSource(uri, dataSourceFactory, player.getBandwidthMeter(), return new SmoothStreamingSampleSource(uri, dataSourceFactory, bandwidthMeter, handler,
handler, eventLogger);
case Util.TYPE_DASH:
return new DashSampleSource(uri, dataSourceFactory, player.getBandwidthMeter(), handler,
eventLogger); eventLogger);
case Util.TYPE_DASH:
return new DashSampleSource(uri, dataSourceFactory, bandwidthMeter, handler, eventLogger);
case Util.TYPE_HLS: case Util.TYPE_HLS:
return new HlsSampleSource(uri, dataSourceFactory, player.getBandwidthMeter(), handler, return new HlsSampleSource(uri, dataSourceFactory, bandwidthMeter, handler, eventLogger);
eventLogger);
case Util.TYPE_OTHER: case Util.TYPE_OTHER:
return new ExtractorSampleSource(uri, dataSourceFactory, player.getBandwidthMeter(), return new ExtractorSampleSource(uri, dataSourceFactory, bandwidthMeter,
ExtractorSampleSource.newDefaultExtractors(), handler, eventLogger); ExtractorSampleSource.newDefaultExtractors(), handler, eventLogger);
default: default:
throw new IllegalStateException("Unsupported type: " + type); throw new IllegalStateException("Unsupported type: " + type);
......
library/src/main/java/com/google/android/exoplayer/ConcatenatingSampleSourceProvider.java 0 → 100644
/*
* Copyright (C) 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.android.exoplayer;
/**
* A {@link SampleSourceProvider} that concatenates multiple {@link SampleSourceProvider}s.
*/
public final class ConcatenatingSampleSourceProvider implements SampleSourceProvider {
private final SampleSourceProvider[] sampleSourceProviders;
/**
* @param sampleSourcePoviders The {@link SampleSourceProvider}s to concatenate.
*/
public ConcatenatingSampleSourceProvider(SampleSourceProvider... sampleSourcePoviders) {
this.sampleSourceProviders = sampleSourcePoviders;
}
@Override
public int getSourceCount() {
int sourceCount = 0;
for (SampleSourceProvider sampleSourceProvider : sampleSourceProviders) {
int count = sampleSourceProvider.getSourceCount();
if (count == SampleSourceProvider.UNKNOWN_SOURCE_COUNT) {
return UNKNOWN_SOURCE_COUNT;
}
sourceCount += count;
}
return sourceCount;
}
@Override
public SampleSource createSource(int index) {
int sourceCount = 0;
for (SampleSourceProvider sampleSourceProvider : sampleSourceProviders) {
int count = sampleSourceProvider.getSourceCount();
if (count == SampleSourceProvider.UNKNOWN_SOURCE_COUNT || index < sourceCount + count) {
return sampleSourceProvider.createSource(index - sourceCount);
}
sourceCount += count;
}
throw new IndexOutOfBoundsException();
}
}
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