sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate CronetDataSourceFactory to DefaultHttpDataSource.Factory

Browse source 
We normally wouldn't do this kind of thing, given CronetDataSourceFactory is
deprecated, but it's needed to change the cronet --> core dependency to a
cronet --> common dependency.

PiperOrigin-RevId: 353609198
This commit is contained in:
olly 2021-01-25 10:55:51 +00:00 committed by Ian Baker
parent c37f757854
commit bfc736986e
1 changed files with 24 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java
View file

@ -17,7 +17,7 @@ package com.google.android.exoplayer2.ext.cronet;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory; import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
import com.google.android.exoplayer2.upstream.HttpDataSource; import com.google.android.exoplayer2.upstream.HttpDataSource;
import com.google.android.exoplayer2.upstream.HttpDataSource.BaseFactory; import com.google.android.exoplayer2.upstream.HttpDataSource.BaseFactory;
import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.upstream.TransferListener;
@ -25,8 +25,6 @@ import java.util.concurrent.Executor;
import org.chromium.net.CronetEngine; import org.chromium.net.CronetEngine;
/** @deprecated Use {@link CronetDataSource.Factory} instead. */ /** @deprecated Use {@link CronetDataSource.Factory} instead. */
// Uses deprecated DefaultHttpDataSourceFactory
@SuppressWarnings("deprecation")
@Deprecated @Deprecated
public final class CronetDataSourceFactory extends BaseFactory { public final class CronetDataSourceFactory extends BaseFactory {
@ -82,7 +80,7 @@ public final class CronetDataSourceFactory extends BaseFactory {
* Creates an instance. * Creates an instance.
* *
* <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link
* DefaultHttpDataSourceFactory} will be used instead. * DefaultHttpDataSource.Factory} will be used instead.
* *
* <p>Sets {@link CronetDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout, * <p>Sets {@link CronetDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout,
* {@link CronetDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout. * {@link CronetDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout.
@ -98,7 +96,7 @@ public final class CronetDataSourceFactory extends BaseFactory {
* Creates an instance. * Creates an instance.
* *
* <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link
* DefaultHttpDataSourceFactory} will be used instead. * DefaultHttpDataSource.Factory} will be used instead.
* *
* <p>Sets {@link CronetDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout, * <p>Sets {@link CronetDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout,
* {@link CronetDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout. * {@link CronetDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout.
@ -118,19 +116,14 @@ public final class CronetDataSourceFactory extends BaseFactory {
DEFAULT_CONNECT_TIMEOUT_MILLIS, DEFAULT_CONNECT_TIMEOUT_MILLIS,
DEFAULT_READ_TIMEOUT_MILLIS, DEFAULT_READ_TIMEOUT_MILLIS,
false, false,
new DefaultHttpDataSourceFactory( new DefaultHttpDataSource.Factory().setUserAgent(userAgent));
userAgent,
/* listener= */ null,
DEFAULT_CONNECT_TIMEOUT_MILLIS,
DEFAULT_READ_TIMEOUT_MILLIS,
false));
} }
/** /**
* Creates an instance. * Creates an instance.
* *
* <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link
* DefaultHttpDataSourceFactory} will be used instead. * DefaultHttpDataSource.Factory} will be used instead.
* *
* @param cronetEngineWrapper A {@link CronetEngineWrapper}. * @param cronetEngineWrapper A {@link CronetEngineWrapper}.
* @param executor The {@link java.util.concurrent.Executor} that will perform the requests. * @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
@ -152,15 +145,13 @@ public final class CronetDataSourceFactory extends BaseFactory {
cronetEngineWrapper, cronetEngineWrapper,
executor, executor,
/* transferListener= */ null, /* transferListener= */ null,
DEFAULT_CONNECT_TIMEOUT_MILLIS,
DEFAULT_READ_TIMEOUT_MILLIS,
resetTimeoutOnRedirects,
new DefaultHttpDataSourceFactory(
userAgent,
/* listener= */ null,
connectTimeoutMs, connectTimeoutMs,
readTimeoutMs, readTimeoutMs,
resetTimeoutOnRedirects)); resetTimeoutOnRedirects,
new DefaultHttpDataSource.Factory()
.setUserAgent(userAgent)
.setConnectTimeoutMs(connectTimeoutMs)
.setReadTimeoutMs(readTimeoutMs));
} }
/** /**
@ -228,7 +219,7 @@ public final class CronetDataSourceFactory extends BaseFactory {
* Creates an instance. * Creates an instance.
* *
* <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link
* DefaultHttpDataSourceFactory} will be used instead. * DefaultHttpDataSource.Factory} will be used instead.
* *
* <p>Sets {@link CronetDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout, * <p>Sets {@link CronetDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout,
* {@link CronetDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout. * {@link CronetDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout.
@ -248,7 +239,7 @@ public final class CronetDataSourceFactory extends BaseFactory {
* Creates an instance. * Creates an instance.
* *
* <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link
* DefaultHttpDataSourceFactory} will be used instead. * DefaultHttpDataSource.Factory} will be used instead.
* *
* <p>Sets {@link CronetDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout, * <p>Sets {@link CronetDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS} as the connection timeout,
* {@link CronetDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout. * {@link CronetDataSource#DEFAULT_READ_TIMEOUT_MILLIS} as the read timeout.
@ -272,19 +263,16 @@ public final class CronetDataSourceFactory extends BaseFactory {
DEFAULT_CONNECT_TIMEOUT_MILLIS, DEFAULT_CONNECT_TIMEOUT_MILLIS,
DEFAULT_READ_TIMEOUT_MILLIS, DEFAULT_READ_TIMEOUT_MILLIS,
false, false,
new DefaultHttpDataSourceFactory( new DefaultHttpDataSource.Factory()
userAgent, .setUserAgent(userAgent)
transferListener, .setTransferListener(transferListener));
DEFAULT_CONNECT_TIMEOUT_MILLIS,
DEFAULT_READ_TIMEOUT_MILLIS,
false));
} }
/** /**
* Creates an instance. * Creates an instance.
* *
* <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link * <p>If the {@link CronetEngineWrapper} fails to provide a {@link CronetEngine}, a {@link
* DefaultHttpDataSourceFactory} will be used instead. * DefaultHttpDataSource.Factory} will be used instead.
* *
* @param cronetEngineWrapper A {@link CronetEngineWrapper}. * @param cronetEngineWrapper A {@link CronetEngineWrapper}.
* @param executor The {@link java.util.concurrent.Executor} that will perform the requests. * @param executor The {@link java.util.concurrent.Executor} that will perform the requests.
@ -308,11 +296,14 @@ public final class CronetDataSourceFactory extends BaseFactory {
cronetEngineWrapper, cronetEngineWrapper,
executor, executor,
transferListener, transferListener,
DEFAULT_CONNECT_TIMEOUT_MILLIS, connectTimeoutMs,
DEFAULT_READ_TIMEOUT_MILLIS, readTimeoutMs,
resetTimeoutOnRedirects, resetTimeoutOnRedirects,
new DefaultHttpDataSourceFactory( new DefaultHttpDataSource.Factory()
userAgent, transferListener, connectTimeoutMs, readTimeoutMs, resetTimeoutOnRedirects)); .setUserAgent(userAgent)
.setTransferListener(transferListener)
.setConnectTimeoutMs(connectTimeoutMs)
.setReadTimeoutMs(readTimeoutMs));
} }
/** /**