Skip to content

SDK / exoplayer

Go to a project
Commit 860c6588 by eguven Committed by Oliver Woodman
Options

created DefaultHttpDataSourceFactory 

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=131931668
parent ceebb4c5
Inline Side-by-side
Showing with 122 additions and 92 deletions
demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
...@@ -74,7 +74,7 @@ import com.google.android.exoplayer2.ui.SubtitleView; ...@@ -74,7 +74,7 @@ import com.google.android.exoplayer2.ui.SubtitleView;
import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter; import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
import com.google.android.exoplayer2.upstream.DefaultHttpDataSource; import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
import com.google.android.exoplayer2.upstream.HttpDataSource; import com.google.android.exoplayer2.upstream.HttpDataSource;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.net.CookieHandler; import java.net.CookieHandler;
...@@ -363,12 +363,7 @@ public class PlayerActivity extends Activity implements OnKeyListener, OnTouchLi ...@@ -363,12 +363,7 @@ public class PlayerActivity extends Activity implements OnKeyListener, OnTouchLi
return null; return null;
} }
HttpMediaDrmCallback drmCallback = new HttpMediaDrmCallback(licenseUrl, HttpMediaDrmCallback drmCallback = new HttpMediaDrmCallback(licenseUrl,
new HttpDataSource.Factory() { buildHttpDataSourceFactory(false));
@Override
public HttpDataSource createDataSource() {
return new DefaultHttpDataSource(userAgent, null);
}
});
return new StreamingDrmSessionManager<FrameworkMediaCrypto>(uuid, return new StreamingDrmSessionManager<FrameworkMediaCrypto>(uuid,
FrameworkMediaDrm.newInstance(uuid), drmCallback, null, mainHandler, eventLogger); FrameworkMediaDrm.newInstance(uuid), drmCallback, null, mainHandler, eventLogger);
} }
...@@ -403,8 +398,16 @@ public class PlayerActivity extends Activity implements OnKeyListener, OnTouchLi ...@@ -403,8 +398,16 @@ public class PlayerActivity extends Activity implements OnKeyListener, OnTouchLi
* DataSource factory. * DataSource factory.
*/ */
private DataSource.Factory buildDataSourceFactory(boolean useBandwidthMeter) { private DataSource.Factory buildDataSourceFactory(boolean useBandwidthMeter) {
return new DefaultDataSourceFactory(this, userAgent, return new DefaultDataSourceFactory(this, useBandwidthMeter ? BANDWIDTH_METER : null,
useBandwidthMeter ? BANDWIDTH_METER : null); buildHttpDataSourceFactory(useBandwidthMeter));
}
/**
* Build a HttpDataSource factory.
* @param useBandwidthMeter
*/
private HttpDataSource.Factory buildHttpDataSourceFactory(boolean useBandwidthMeter) {
return new DefaultHttpDataSourceFactory(userAgent, useBandwidthMeter ? BANDWIDTH_METER : null);
} }
// ExoPlayer.EventListener implementation // ExoPlayer.EventListener implementation
......
extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/DefaultCronetDataSourceFactory.java → extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java
...@@ -15,20 +15,17 @@ ...@@ -15,20 +15,17 @@
*/ */
package com.google.android.exoplayer2.ext.cronet; package com.google.android.exoplayer2.ext.cronet;
import android.content.Context;
import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DataSource.Factory; import com.google.android.exoplayer2.upstream.HttpDataSource.Factory;
import com.google.android.exoplayer2.upstream.DefaultDataSource;
import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.upstream.TransferListener;
import com.google.android.exoplayer2.util.Predicate; import com.google.android.exoplayer2.util.Predicate;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import org.chromium.net.CronetEngine; import org.chromium.net.CronetEngine;
/** /**
* A {@link Factory} that produces {@link DefaultDataSource} instances that delegate to * A {@link Factory} that produces {@link CronetDataSource}.
* {@link CronetDataSource}s for non-file/asset/content URIs.
*/ */
public final class DefaultCronetDataSourceFactory implements Factory { public final class CronetDataSourceFactory implements Factory {
/** /**
* The default connection timeout, in milliseconds. * The default connection timeout, in milliseconds.
...@@ -41,7 +38,6 @@ public final class DefaultCronetDataSourceFactory implements Factory { ...@@ -41,7 +38,6 @@ public final class DefaultCronetDataSourceFactory implements Factory {
public static final int DEFAULT_READ_TIMEOUT_MILLIS = public static final int DEFAULT_READ_TIMEOUT_MILLIS =
CronetDataSource.DEFAULT_READ_TIMEOUT_MILLIS; CronetDataSource.DEFAULT_READ_TIMEOUT_MILLIS;
private final Context context;
private final CronetEngine cronetEngine; private final CronetEngine cronetEngine;
private final Executor executor; private final Executor executor;
private final Predicate<String> contentTypePredicate; private final Predicate<String> contentTypePredicate;
...@@ -50,18 +46,17 @@ public final class DefaultCronetDataSourceFactory implements Factory { ...@@ -50,18 +46,17 @@ public final class DefaultCronetDataSourceFactory implements Factory {
private final int readTimeoutMs; private final int readTimeoutMs;
private final boolean resetTimeoutOnRedirects; private final boolean resetTimeoutOnRedirects;
public DefaultCronetDataSourceFactory(Context context, CronetEngine cronetEngine, public CronetDataSourceFactory(CronetEngine cronetEngine,
Executor executor, Predicate<String> contentTypePredicate, Executor executor, Predicate<String> contentTypePredicate,
TransferListener<? super DataSource> transferListener) { TransferListener<? super DataSource> transferListener) {
this(context, cronetEngine, executor, contentTypePredicate, transferListener, this(cronetEngine, executor, contentTypePredicate, transferListener,
DEFAULT_CONNECT_TIMEOUT_MILLIS, DEFAULT_READ_TIMEOUT_MILLIS, false); DEFAULT_CONNECT_TIMEOUT_MILLIS, DEFAULT_READ_TIMEOUT_MILLIS, false);
} }
public DefaultCronetDataSourceFactory(Context context, CronetEngine cronetEngine, public CronetDataSourceFactory(CronetEngine cronetEngine,
Executor executor, Predicate<String> contentTypePredicate, Executor executor, Predicate<String> contentTypePredicate,
TransferListener<? super DataSource> transferListener, int connectTimeoutMs, TransferListener<? super DataSource> transferListener, int connectTimeoutMs,
int readTimeoutMs, boolean resetTimeoutOnRedirects) { int readTimeoutMs, boolean resetTimeoutOnRedirects) {
this.context = context;
this.cronetEngine = cronetEngine; this.cronetEngine = cronetEngine;
this.executor = executor; this.executor = executor;
this.contentTypePredicate = contentTypePredicate; this.contentTypePredicate = contentTypePredicate;
...@@ -72,10 +67,9 @@ public final class DefaultCronetDataSourceFactory implements Factory { ...@@ -72,10 +67,9 @@ public final class DefaultCronetDataSourceFactory implements Factory {
} }
@Override @Override
public DefaultDataSource createDataSource() { public CronetDataSource createDataSource() {
DataSource cronetDataSource = new CronetDataSource(cronetEngine, executor, contentTypePredicate, return new CronetDataSource(cronetEngine, executor, contentTypePredicate, transferListener,
transferListener, connectTimeoutMs, readTimeoutMs, resetTimeoutOnRedirects); connectTimeoutMs, readTimeoutMs, resetTimeoutOnRedirects);
return new DefaultDataSource(context, transferListener, cronetDataSource);
} }
} }
extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/DefaultOkHttpDataSourceFactory.java → extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceFactory.java
...@@ -15,34 +15,29 @@ ...@@ -15,34 +15,29 @@
*/ */
package com.google.android.exoplayer2.ext.okhttp; package com.google.android.exoplayer2.ext.okhttp;
import android.content.Context;
import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DataSource.Factory; import com.google.android.exoplayer2.upstream.HttpDataSource.Factory;
import com.google.android.exoplayer2.upstream.DefaultDataSource;
import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.upstream.TransferListener;
import okhttp3.CacheControl; import okhttp3.CacheControl;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
/** /**
* A {@link Factory} that produces {@link DefaultDataSource} instances that delegate to * A {@link Factory} that produces {@link OkHttpDataSource}.
* {@link OkHttpDataSource}s for non-file/asset/content URIs.
*/ */
public final class DefaultOkHttpDataSourceFactory implements Factory { public final class OkHttpDataSourceFactory implements Factory {
private final Context context;
private final OkHttpClient client; private final OkHttpClient client;
private final String userAgent; private final String userAgent;
private final TransferListener<? super DataSource> transferListener; private final TransferListener<? super DataSource> transferListener;
private final CacheControl cacheControl; private final CacheControl cacheControl;
public DefaultOkHttpDataSourceFactory(Context context, OkHttpClient client, String userAgent, public OkHttpDataSourceFactory(OkHttpClient client, String userAgent,
TransferListener<? super DataSource> transferListener) { TransferListener<? super DataSource> transferListener) {
this(context, client, userAgent, transferListener, null); this(client, userAgent, transferListener, null);
} }
public DefaultOkHttpDataSourceFactory(Context context, OkHttpClient client, String userAgent, public OkHttpDataSourceFactory(OkHttpClient client, String userAgent,
TransferListener<? super DataSource> transferListener, CacheControl cacheControl) { TransferListener<? super DataSource> transferListener, CacheControl cacheControl) {
this.context = context.getApplicationContext();
this.client = client; this.client = client;
this.userAgent = userAgent; this.userAgent = userAgent;
this.transferListener = transferListener; this.transferListener = transferListener;
...@@ -50,10 +45,8 @@ public final class DefaultOkHttpDataSourceFactory implements Factory { ...@@ -50,10 +45,8 @@ public final class DefaultOkHttpDataSourceFactory implements Factory {
} }
@Override @Override
public DefaultDataSource createDataSource() { public OkHttpDataSource createDataSource() {
DataSource httpDataSource = new OkHttpDataSource(client, userAgent, null, transferListener, return new OkHttpDataSource(client, userAgent, null, transferListener, cacheControl);
cacheControl);
return new DefaultDataSource(context, transferListener, httpDataSource);
} }
} }
library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java
...@@ -24,23 +24,9 @@ import com.google.android.exoplayer2.upstream.DataSource.Factory; ...@@ -24,23 +24,9 @@ import com.google.android.exoplayer2.upstream.DataSource.Factory;
*/ */
public final class DefaultDataSourceFactory implements Factory { public final class DefaultDataSourceFactory implements Factory {
/**
* The default connection timeout, in milliseconds.
*/
public static final int DEFAULT_CONNECT_TIMEOUT_MILLIS =
DefaultHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS;
/**
* The default read timeout, in milliseconds.
*/
public static final int DEFAULT_READ_TIMEOUT_MILLIS =
DefaultHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS;
private final Context context; private final Context context;
private final String userAgent;
private final TransferListener<? super DataSource> listener; private final TransferListener<? super DataSource> listener;
private final int connectTimeoutMillis; private final DataSource.Factory baseDataSourceFactory;
private final int readTimeoutMillis;
private final boolean allowCrossProtocolRedirects;
/** /**
* @param context A context. * @param context A context.
...@@ -57,48 +43,26 @@ public final class DefaultDataSourceFactory implements Factory { ...@@ -57,48 +43,26 @@ public final class DefaultDataSourceFactory implements Factory {
*/ */
public DefaultDataSourceFactory(Context context, String userAgent, public DefaultDataSourceFactory(Context context, String userAgent,
TransferListener<? super DataSource> listener) { TransferListener<? super DataSource> listener) {
this(context, userAgent, listener, false); this(context, listener, new DefaultHttpDataSourceFactory(userAgent, listener));
} }
/** /**
* @param context A context. * @param context A context.
* @param userAgent The User-Agent string that should be used.
* @param listener An optional listener. * @param listener An optional listener.
* @param allowCrossProtocolRedirects Whether cross-protocol redirects (i.e. redirects from HTTP * @param baseDataSourceFactory A {@link Factory} to be used to create a base {@link DataSource}
* to HTTPS and vice versa) are enabled. * for {@link DefaultDataSource}.
* @see DefaultDataSource#DefaultDataSource(Context, TransferListener, DataSource)
*/ */
public DefaultDataSourceFactory(Context context, String userAgent, public DefaultDataSourceFactory(Context context, TransferListener<? super DataSource> listener,
TransferListener<? super DataSource> listener, boolean allowCrossProtocolRedirects) { DataSource.Factory baseDataSourceFactory) {
this(context, userAgent, listener, DEFAULT_CONNECT_TIMEOUT_MILLIS, DEFAULT_READ_TIMEOUT_MILLIS,
allowCrossProtocolRedirects);
}
/**
* @param context A context.
* @param userAgent The User-Agent string that should be used.
* @param listener An optional listener.
* @param connectTimeoutMillis The connection timeout that should be used when requesting remote
* data, in milliseconds. A timeout of zero is interpreted as an infinite timeout.
* @param readTimeoutMillis The read timeout that should be used when requesting remote data,
* in milliseconds. A timeout of zero is interpreted as an infinite timeout.
* @param allowCrossProtocolRedirects Whether cross-protocol redirects (i.e. redirects from HTTP
* to HTTPS and vice versa) are enabled.
*/
public DefaultDataSourceFactory(Context context, String userAgent,
TransferListener<? super DataSource> listener, int connectTimeoutMillis,
int readTimeoutMillis, boolean allowCrossProtocolRedirects) {
this.context = context.getApplicationContext(); this.context = context.getApplicationContext();
this.userAgent = userAgent;
this.listener = listener; this.listener = listener;
this.connectTimeoutMillis = connectTimeoutMillis; this.baseDataSourceFactory = baseDataSourceFactory;
this.readTimeoutMillis = readTimeoutMillis;
this.allowCrossProtocolRedirects = allowCrossProtocolRedirects;
} }
@Override @Override
public DefaultDataSource createDataSource() { public DefaultDataSource createDataSource() {
return new DefaultDataSource(context, listener, userAgent, connectTimeoutMillis, return new DefaultDataSource(context, listener, baseDataSourceFactory.createDataSource());
readTimeoutMillis, allowCrossProtocolRedirects);
} }
} }
library/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java 0 → 100644
/*
* Copyright (C) 2016 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.exoplayer2.upstream;
import com.google.android.exoplayer2.upstream.HttpDataSource.Factory;
/** A {@link Factory} that produces {@link DefaultHttpDataSource} instances. */
public final class DefaultHttpDataSourceFactory implements Factory {
private final String userAgent;
private final TransferListener<? super DataSource> listener;
private final int connectTimeoutMillis;
private final int readTimeoutMillis;
private final boolean allowCrossProtocolRedirects;
/**
* Constructs a DefaultHttpDataSourceFactory. Sets {@link
* DefaultHttpDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout, {@link
* DefaultHttpDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout and disables
* cross-protocol redirects.
*
* @param userAgent The User-Agent string that should be used.
*/
public DefaultHttpDataSourceFactory(String userAgent) {
this(userAgent, null);
}
/**
* Constructs a DefaultHttpDataSourceFactory. Sets {@link
* DefaultHttpDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout, {@link
* DefaultHttpDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout and disables
* cross-protocol redirects.
*
* @param userAgent The User-Agent string that should be used.
* @param listener An optional listener.
* @see #DefaultHttpDataSourceFactory(String, TransferListener, int, int, boolean)
*/
public DefaultHttpDataSourceFactory(
String userAgent, TransferListener<? super DataSource> listener) {
this(userAgent, listener, DefaultHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS,
DefaultHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS, false);
}
/**
* @param userAgent The User-Agent string that should be used.
* @param listener An optional listener.
* @param connectTimeoutMillis The connection timeout that should be used when requesting remote
* data, in milliseconds. A timeout of zero is interpreted as an infinite timeout.
* @param readTimeoutMillis The read timeout that should be used when requesting remote data, in
* milliseconds. A timeout of zero is interpreted as an infinite timeout.
* @param allowCrossProtocolRedirects Whether cross-protocol redirects (i.e. redirects from HTTP
* to HTTPS and vice versa) are enabled.
*/
public DefaultHttpDataSourceFactory(String userAgent,
TransferListener<? super DataSource> listener, int connectTimeoutMillis,
int readTimeoutMillis, boolean allowCrossProtocolRedirects) {
this.userAgent = userAgent;
this.listener = listener;
this.connectTimeoutMillis = connectTimeoutMillis;
this.readTimeoutMillis = readTimeoutMillis;
this.allowCrossProtocolRedirects = allowCrossProtocolRedirects;
}
@Override
public DefaultHttpDataSource createDataSource() {
return new DefaultHttpDataSource(userAgent, null, listener, connectTimeoutMillis,
readTimeoutMillis, allowCrossProtocolRedirects);
}
}
playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/gts/DashTest.java
...@@ -49,8 +49,7 @@ import com.google.android.exoplayer2.trackselection.TrackSelection; ...@@ -49,8 +49,7 @@ import com.google.android.exoplayer2.trackselection.TrackSelection;
import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.BandwidthMeter;
import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
import com.google.android.exoplayer2.upstream.DefaultHttpDataSource; import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
import com.google.android.exoplayer2.upstream.HttpDataSource;
import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.upstream.TransferListener;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
...@@ -708,12 +707,7 @@ public final class DashTest extends ActivityInstrumentationTestCase2<HostActivit ...@@ -708,12 +707,7 @@ public final class DashTest extends ActivityInstrumentationTestCase2<HostActivit
? WIDEVINE_HW_SECURE_DECODE_CONTENT_ID : WIDEVINE_SW_CRYPTO_CONTENT_ID; ? WIDEVINE_HW_SECURE_DECODE_CONTENT_ID : WIDEVINE_SW_CRYPTO_CONTENT_ID;
HttpMediaDrmCallback drmCallback = new HttpMediaDrmCallback( HttpMediaDrmCallback drmCallback = new HttpMediaDrmCallback(
WIDEVINE_LICENSE_URL + widevineContentId, WIDEVINE_LICENSE_URL + widevineContentId,
new HttpDataSource.Factory() { new DefaultHttpDataSourceFactory(userAgent));
@Override
public HttpDataSource createDataSource() {
return new DefaultHttpDataSource(userAgent, null);
}
});
drmSessionManager = StreamingDrmSessionManager.newWidevineInstance(drmCallback, null, drmSessionManager = StreamingDrmSessionManager.newWidevineInstance(drmCallback, null,
null, null); null, null);
if (forceL3Widevine && !WIDEVINE_SECURITY_LEVEL_3.equals(securityProperty)) { if (forceL3Widevine && !WIDEVINE_SECURITY_LEVEL_3.equals(securityProperty)) {
......
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