Skip to content

SDK / exoplayer

Go to a project
Commit 1cbe3f72 by olly Committed by Oliver Woodman
Options

DataSpec: Deprecate most constructors 

Keeping (Uri) and (Uri, position, length) to avoid needing
Builder for the trivial case.

PiperOrigin-RevId: 294530226
parent c7b6a2e0
Inline Side-by-side
Showing with 237 additions and 206 deletions
RELEASENOTES.md
...@@ -9,8 +9,9 @@ ...@@ -9,8 +9,9 @@
* Add `Player.onPlayWhenReadyChanged` with reasons. * Add `Player.onPlayWhenReadyChanged` with reasons.
* Add `Player.onPlaybackStateChanged` and deprecate * Add `Player.onPlaybackStateChanged` and deprecate
`Player.onPlayerStateChanged`. `Player.onPlayerStateChanged`.
* Deprecate and rename getPlaybackError to getPlayerError for consistency. * Deprecate and rename `getPlaybackError` to `getPlayerError` for consistency.
* Deprecate and rename onLoadingChanged to onIsLoadingChanged for consistency. * Deprecate and rename `onLoadingChanged` to `onIsLoadingChanged` for
consistency.
* Make `MediaSourceEventListener.LoadEventInfo` and * Make `MediaSourceEventListener.LoadEventInfo` and
`MediaSourceEventListener.MediaLoadData` top-level classes. `MediaSourceEventListener.MediaLoadData` top-level classes.
* Rename `MediaCodecRenderer.onOutputFormatChanged` to * Rename `MediaCodecRenderer.onOutputFormatChanged` to
...@@ -19,7 +20,9 @@ ...@@ -19,7 +20,9 @@
* Move player message-related constants from `C` to `Renderer`, to avoid * Move player message-related constants from `C` to `Renderer`, to avoid
having the constants class depend on player/renderer classes. having the constants class depend on player/renderer classes.
* Split out `common` and `extractor` submodules. * Split out `common` and `extractor` submodules.
* Add `DataSpec.Builder` and `DataSpec.customData`. * Add `DataSpec.Builder` and deprecate most `DataSpec` constructors.
* Add `DataSpec.customData` to allow applications to pass custom data through
`DataSource` chains.
* Text: * Text:
* Parse `<ruby>` and `<rt>` tags in WebVTT subtitles (rendering is coming * Parse `<ruby>` and `<rt>` tags in WebVTT subtitles (rendering is coming
later). later).
......
extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
...@@ -926,7 +926,7 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource { ...@@ -926,7 +926,7 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
redirectUrlDataSpec = redirectUrlDataSpec =
dataSpec dataSpec
.buildUpon() .buildUpon()
.setUri(Uri.parse(newLocationUrl)) .setUri(newLocationUrl)
.setHttpMethod(DataSpec.HTTP_METHOD_GET) .setHttpMethod(DataSpec.HTTP_METHOD_GET)
.setHttpBody(null) .setHttpBody(null)
.build(); .build();
......
extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
...@@ -120,12 +120,15 @@ public final class CronetDataSourceTest { ...@@ -120,12 +120,15 @@ public final class CronetDataSourceTest {
when(mockUrlRequestBuilder.build()).thenReturn(mockUrlRequest); when(mockUrlRequestBuilder.build()).thenReturn(mockUrlRequest);
mockStatusResponse(); mockStatusResponse();
testDataSpec = new DataSpec(Uri.parse(TEST_URL), 0, C.LENGTH_UNSET, null); testDataSpec = new DataSpec(Uri.parse(TEST_URL));
testPostDataSpec = testPostDataSpec =
new DataSpec(Uri.parse(TEST_URL), TEST_POST_BODY, 0, 0, C.LENGTH_UNSET, null, 0); new DataSpec.Builder()
.setUri(TEST_URL)
.setHttpMethod(DataSpec.HTTP_METHOD_POST)
.setHttpBody(TEST_POST_BODY)
.build();
testHeadDataSpec = testHeadDataSpec =
new DataSpec( new DataSpec.Builder().setUri(TEST_URL).setHttpMethod(DataSpec.HTTP_METHOD_HEAD).build();
Uri.parse(TEST_URL), DataSpec.HTTP_METHOD_HEAD, null, 0, 0, C.LENGTH_UNSET, null, 0);
testResponseHeader = new HashMap<>(); testResponseHeader = new HashMap<>();
testResponseHeader.put("Content-Type", TEST_CONTENT_TYPE); testResponseHeader.put("Content-Type", TEST_CONTENT_TYPE);
// This value can be anything since the DataSpec is unset. // This value can be anything since the DataSpec is unset.
...@@ -197,7 +200,7 @@ public final class CronetDataSourceTest { ...@@ -197,7 +200,7 @@ public final class CronetDataSourceTest {
@Test @Test
public void testRequestSetsRangeHeader() throws HttpDataSourceException { public void testRequestSetsRangeHeader() throws HttpDataSourceException {
testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000, null); testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000);
mockResponseStartSuccess(); mockResponseStartSuccess();
dataSourceUnderTest.open(testDataSpec); dataSourceUnderTest.open(testDataSpec);
...@@ -207,7 +210,6 @@ public final class CronetDataSourceTest { ...@@ -207,7 +210,6 @@ public final class CronetDataSourceTest {
@Test @Test
public void testRequestHeadersSet() throws HttpDataSourceException { public void testRequestHeadersSet() throws HttpDataSourceException {
Map<String, String> headersSet = new HashMap<>(); Map<String, String> headersSet = new HashMap<>();
doAnswer( doAnswer(
(invocation) -> { (invocation) -> {
...@@ -227,17 +229,14 @@ public final class CronetDataSourceTest { ...@@ -227,17 +229,14 @@ public final class CronetDataSourceTest {
dataSpecRequestProperties.put("defaultHeader3", "dataSpecOverridesAll"); dataSpecRequestProperties.put("defaultHeader3", "dataSpecOverridesAll");
dataSpecRequestProperties.put("dataSourceHeader2", "dataSpecOverridesDataSource"); dataSpecRequestProperties.put("dataSourceHeader2", "dataSpecOverridesDataSource");
dataSpecRequestProperties.put("dataSpecHeader1", "dataSpecValue1"); dataSpecRequestProperties.put("dataSpecHeader1", "dataSpecValue1");
testDataSpec = testDataSpec =
new DataSpec( new DataSpec.Builder()
/* uri= */ Uri.parse(TEST_URL), .setUri(TEST_URL)
/* httpMethod= */ DataSpec.HTTP_METHOD_GET, .setPosition(1000)
/* httpBody= */ null, .setLength(5000)
/* absoluteStreamPosition= */ 1000, .setHttpRequestHeaders(dataSpecRequestProperties)
/* position= */ 1000, .build();
/* length= */ 5000,
/* key= */ null,
/* flags= */ 0,
dataSpecRequestProperties);
mockResponseStartSuccess(); mockResponseStartSuccess();
dataSourceUnderTest.open(testDataSpec); dataSourceUnderTest.open(testDataSpec);
...@@ -263,7 +262,7 @@ public final class CronetDataSourceTest { ...@@ -263,7 +262,7 @@ public final class CronetDataSourceTest {
@Test @Test
public void testRequestOpenGzippedCompressedReturnsDataSpecLength() public void testRequestOpenGzippedCompressedReturnsDataSpecLength()
throws HttpDataSourceException { throws HttpDataSourceException {
testDataSpec = new DataSpec(Uri.parse(TEST_URL), 0, 5000, null); testDataSpec = new DataSpec(Uri.parse(TEST_URL), 0, 5000);
testResponseHeader.put("Content-Encoding", "gzip"); testResponseHeader.put("Content-Encoding", "gzip");
testResponseHeader.put("Content-Length", Long.toString(50L)); testResponseHeader.put("Content-Length", Long.toString(50L));
mockResponseStartSuccess(); mockResponseStartSuccess();
...@@ -292,14 +291,14 @@ public final class CronetDataSourceTest { ...@@ -292,14 +291,14 @@ public final class CronetDataSourceTest {
@Test @Test
public void open_ifBodyIsSetWithoutContentTypeHeader_fails() { public void open_ifBodyIsSetWithoutContentTypeHeader_fails() {
testDataSpec = testDataSpec =
new DataSpec( new DataSpec.Builder()
/* uri= */ Uri.parse(TEST_URL), .setUri(TEST_URL)
/* postBody= */ new byte[1024], .setHttpMethod(DataSpec.HTTP_METHOD_POST)
/* absoluteStreamPosition= */ 200, .setHttpBody(new byte[1024])
/* position= */ 200, .setPosition(200)
/* length= */ 1024, .setLength(1024)
/* key= */ "key", .setKey("key")
/* flags= */ 0); .build();
try { try {
dataSourceUnderTest.open(testDataSpec); dataSourceUnderTest.open(testDataSpec);
...@@ -481,7 +480,7 @@ public final class CronetDataSourceTest { ...@@ -481,7 +480,7 @@ public final class CronetDataSourceTest {
mockResponseStartSuccess(); mockResponseStartSuccess();
mockReadSuccess(1000, 5000); mockReadSuccess(1000, 5000);
testUrlResponseInfo = createUrlResponseInfo(206); // Server supports range requests. testUrlResponseInfo = createUrlResponseInfo(206); // Server supports range requests.
testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000, null); testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000);
dataSourceUnderTest.open(testDataSpec); dataSourceUnderTest.open(testDataSpec);
...@@ -498,7 +497,7 @@ public final class CronetDataSourceTest { ...@@ -498,7 +497,7 @@ public final class CronetDataSourceTest {
mockResponseStartSuccess(); mockResponseStartSuccess();
mockReadSuccess(0, 7000); mockReadSuccess(0, 7000);
testUrlResponseInfo = createUrlResponseInfo(200); // Server does not support range requests. testUrlResponseInfo = createUrlResponseInfo(200); // Server does not support range requests.
testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000, null); testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000);
dataSourceUnderTest.open(testDataSpec); dataSourceUnderTest.open(testDataSpec);
...@@ -571,7 +570,7 @@ public final class CronetDataSourceTest { ...@@ -571,7 +570,7 @@ public final class CronetDataSourceTest {
@Test @Test
public void testOverread() throws HttpDataSourceException { public void testOverread() throws HttpDataSourceException {
testDataSpec = new DataSpec(Uri.parse(TEST_URL), 0, 16, null); testDataSpec = new DataSpec(Uri.parse(TEST_URL), 0, 16);
testResponseHeader.put("Content-Length", Long.toString(16L)); testResponseHeader.put("Content-Length", Long.toString(16L));
mockResponseStartSuccess(); mockResponseStartSuccess();
mockReadSuccess(0, 16); mockReadSuccess(0, 16);
...@@ -724,7 +723,7 @@ public final class CronetDataSourceTest { ...@@ -724,7 +723,7 @@ public final class CronetDataSourceTest {
mockResponseStartSuccess(); mockResponseStartSuccess();
mockReadSuccess(1000, 5000); mockReadSuccess(1000, 5000);
testUrlResponseInfo = createUrlResponseInfo(206); // Server supports range requests. testUrlResponseInfo = createUrlResponseInfo(206); // Server supports range requests.
testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000, null); testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000);
dataSourceUnderTest.open(testDataSpec); dataSourceUnderTest.open(testDataSpec);
...@@ -743,7 +742,7 @@ public final class CronetDataSourceTest { ...@@ -743,7 +742,7 @@ public final class CronetDataSourceTest {
mockResponseStartSuccess(); mockResponseStartSuccess();
mockReadSuccess(0, 7000); mockReadSuccess(0, 7000);
testUrlResponseInfo = createUrlResponseInfo(200); // Server does not support range requests. testUrlResponseInfo = createUrlResponseInfo(200); // Server does not support range requests.
testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000, null); testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000);
dataSourceUnderTest.open(testDataSpec); dataSourceUnderTest.open(testDataSpec);
...@@ -792,7 +791,7 @@ public final class CronetDataSourceTest { ...@@ -792,7 +791,7 @@ public final class CronetDataSourceTest {
@Test @Test
public void testOverreadByteBuffer() throws HttpDataSourceException { public void testOverreadByteBuffer() throws HttpDataSourceException {
testDataSpec = new DataSpec(Uri.parse(TEST_URL), 0, 16, null); testDataSpec = new DataSpec(Uri.parse(TEST_URL), 0, 16);
testResponseHeader.put("Content-Length", Long.toString(16L)); testResponseHeader.put("Content-Length", Long.toString(16L));
mockResponseStartSuccess(); mockResponseStartSuccess();
mockReadSuccess(0, 16); mockReadSuccess(0, 16);
...@@ -1084,7 +1083,7 @@ public final class CronetDataSourceTest { ...@@ -1084,7 +1083,7 @@ public final class CronetDataSourceTest {
public void public void
testRedirectParseAndAttachCookie_dataSourceHandlesSetCookie_andPreservesOriginalRequestHeadersIncludingByteRangeHeader() testRedirectParseAndAttachCookie_dataSourceHandlesSetCookie_andPreservesOriginalRequestHeadersIncludingByteRangeHeader()
throws HttpDataSourceException { throws HttpDataSourceException {
testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000, null); testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000);
dataSourceUnderTest = dataSourceUnderTest =
new CronetDataSource( new CronetDataSource(
mockCronetEngine, mockCronetEngine,
...@@ -1271,7 +1270,7 @@ public final class CronetDataSourceTest { ...@@ -1271,7 +1270,7 @@ public final class CronetDataSourceTest {
@Test @Test
public void testAllowDirectExecutor() throws HttpDataSourceException { public void testAllowDirectExecutor() throws HttpDataSourceException {
testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000, null); testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000);
mockResponseStartSuccess(); mockResponseStartSuccess();
dataSourceUnderTest.open(testDataSpec); dataSourceUnderTest.open(testDataSpec);
......
extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java
...@@ -187,7 +187,7 @@ public final class FlacExtractorSeekTest { ...@@ -187,7 +187,7 @@ public final class FlacExtractorSeekTest {
// Internal methods // Internal methods
private long readInputLength() throws IOException { private long readInputLength() throws IOException {
DataSpec dataSpec = new DataSpec(FILE_URI, 0, C.LENGTH_UNSET, null); DataSpec dataSpec = new DataSpec(FILE_URI, /* position= */ 0, C.LENGTH_UNSET);
long totalInputLength = dataSource.open(dataSpec); long totalInputLength = dataSource.open(dataSpec);
Util.closeQuietly(dataSource); Util.closeQuietly(dataSource);
return totalInputLength; return totalInputLength;
...@@ -276,7 +276,7 @@ public final class FlacExtractorSeekTest { ...@@ -276,7 +276,7 @@ public final class FlacExtractorSeekTest {
} }
private ExtractorInput getExtractorInputFromPosition(long position) throws IOException { private ExtractorInput getExtractorInputFromPosition(long position) throws IOException {
DataSpec dataSpec = new DataSpec(FILE_URI, position, totalInputLength, /* key= */ null); DataSpec dataSpec = new DataSpec(FILE_URI, position, totalInputLength);
dataSource.open(dataSpec); dataSource.open(dataSpec);
return new DefaultExtractorInput(dataSource, position, totalInputLength); return new DefaultExtractorInput(dataSource, position, totalInputLength);
} }
......
extensions/okhttp/src/test/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceTest.java
...@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.ext.okhttp; ...@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.ext.okhttp;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.net.Uri;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.DataSpec;
import com.google.android.exoplayer2.upstream.HttpDataSource; import com.google.android.exoplayer2.upstream.HttpDataSource;
...@@ -86,16 +85,12 @@ public class OkHttpDataSourceTest { ...@@ -86,16 +85,12 @@ public class OkHttpDataSourceTest {
dataSpecRequestProperties.put("5", dataSpecValue); dataSpecRequestProperties.put("5", dataSpecValue);
DataSpec dataSpec = DataSpec dataSpec =
new DataSpec( new DataSpec.Builder()
/* uri= */ Uri.parse("http://www.google.com"), .setUri("http://www.google.com")
/* httpMethod= */ 1, .setPosition(1000)
/* httpBody= */ null, .setLength(5000)
/* absoluteStreamPosition= */ 1000, .setHttpRequestHeaders(dataSpecRequestProperties)
/* position= */ 1000, .build();
/* length= */ 5000,
/* key= */ null,
/* flags= */ 0,
dataSpecRequestProperties);
Mockito.doAnswer( Mockito.doAnswer(
invocation -> { invocation -> {
......
library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
...@@ -72,7 +72,18 @@ public final class DataSpec { ...@@ -72,7 +72,18 @@ public final class DataSpec {
} }
/** /**
* Sets {@link DataSpec#uri}. Must be called before {@link #build()}. * Sets {@link DataSpec#uri}.
*
* @param uriString The {@link DataSpec#uri}.
* @return The builder.
*/
public Builder setUri(String uriString) {
this.uri = Uri.parse(uriString);
return this;
}
/**
* Sets {@link DataSpec#uri}.
* *
* @param uri The {@link DataSpec#uri}. * @param uri The {@link DataSpec#uri}.
* @return The builder. * @return The builder.
...@@ -185,7 +196,7 @@ public final class DataSpec { ...@@ -185,7 +196,7 @@ public final class DataSpec {
* Builds a {@link DataSpec} with the builder's current values. * Builds a {@link DataSpec} with the builder's current values.
* *
* @return The build {@link DataSpec}. * @return The build {@link DataSpec}.
* @throws IllegalStateException If {@link #setUri(Uri)} has not been called. * @throws IllegalStateException If {@link #setUri} has not been called.
*/ */
public DataSpec build() { public DataSpec build() {
Assertions.checkStateNotNull(uri, "The uri must be set."); Assertions.checkStateNotNull(uri, "The uri must be set.");
...@@ -353,15 +364,39 @@ public final class DataSpec { ...@@ -353,15 +364,39 @@ public final class DataSpec {
* @param uri {@link #uri}. * @param uri {@link #uri}.
*/ */
public DataSpec(Uri uri) { public DataSpec(Uri uri) {
this(uri, /* flags= */ 0); this(uri, /* position= */ 0, /* length= */ C.LENGTH_UNSET);
}
/**
* Constructs an instance.
*
* @param uri {@link #uri}.
* @param position {@link #position}.
* @param length {@link #length}.
*/
public DataSpec(Uri uri, long position, long length) {
this(
uri,
/* uriPositionOffset= */ 0,
HTTP_METHOD_GET,
/* httpBody= */ null,
/* httpRequestHeaders= */ Collections.emptyMap(),
position,
length,
/* key= */ null,
/* flags= */ 0,
/* customData= */ null);
} }
/** /**
* Constructs an instance. * Constructs an instance.
* *
* @deprecated Use {@link Builder}.
* @param uri {@link #uri}. * @param uri {@link #uri}.
* @param flags {@link #flags}. * @param flags {@link #flags}.
*/ */
@SuppressWarnings("deprecation")
@Deprecated
public DataSpec(Uri uri, @Flags int flags) { public DataSpec(Uri uri, @Flags int flags) {
this(uri, /* position= */ 0, C.LENGTH_UNSET, /* key= */ null, flags); this(uri, /* position= */ 0, C.LENGTH_UNSET, /* key= */ null, flags);
} }
...@@ -369,11 +404,14 @@ public final class DataSpec { ...@@ -369,11 +404,14 @@ public final class DataSpec {
/** /**
* Constructs an instance. * Constructs an instance.
* *
* @deprecated Use {@link Builder}.
* @param uri {@link #uri}. * @param uri {@link #uri}.
* @param position {@link #position}. * @param position {@link #position}.
* @param length {@link #length}. * @param length {@link #length}.
* @param key {@link #key}. * @param key {@link #key}.
*/ */
@SuppressWarnings("deprecation")
@Deprecated
public DataSpec(Uri uri, long position, long length, @Nullable String key) { public DataSpec(Uri uri, long position, long length, @Nullable String key) {
this(uri, position, position, length, key, /* flags= */ 0); this(uri, position, position, length, key, /* flags= */ 0);
} }
...@@ -381,12 +419,15 @@ public final class DataSpec { ...@@ -381,12 +419,15 @@ public final class DataSpec {
/** /**
* Constructs an instance. * Constructs an instance.
* *
* @deprecated Use {@link Builder}.
* @param uri {@link #uri}. * @param uri {@link #uri}.
* @param position {@link #position}. * @param position {@link #position}.
* @param length {@link #length}. * @param length {@link #length}.
* @param key {@link #key}. * @param key {@link #key}.
* @param flags {@link #flags}. * @param flags {@link #flags}.
*/ */
@SuppressWarnings("deprecation")
@Deprecated
public DataSpec(Uri uri, long position, long length, @Nullable String key, @Flags int flags) { public DataSpec(Uri uri, long position, long length, @Nullable String key, @Flags int flags) {
this(uri, position, position, length, key, flags); this(uri, position, position, length, key, flags);
} }
...@@ -394,6 +435,7 @@ public final class DataSpec { ...@@ -394,6 +435,7 @@ public final class DataSpec {
/** /**
* Constructs an instance. * Constructs an instance.
* *
* @deprecated Use {@link Builder}.
* @param uri {@link #uri}. * @param uri {@link #uri}.
* @param position {@link #position}, equal to {@link #position}. * @param position {@link #position}, equal to {@link #position}.
* @param length {@link #length}. * @param length {@link #length}.
...@@ -401,6 +443,8 @@ public final class DataSpec { ...@@ -401,6 +443,8 @@ public final class DataSpec {
* @param flags {@link #flags}. * @param flags {@link #flags}.
* @param httpRequestHeaders {@link #httpRequestHeaders} * @param httpRequestHeaders {@link #httpRequestHeaders}
*/ */
@SuppressWarnings("deprecation")
@Deprecated
public DataSpec( public DataSpec(
Uri uri, Uri uri,
long position, long position,
...@@ -423,6 +467,7 @@ public final class DataSpec { ...@@ -423,6 +467,7 @@ public final class DataSpec {
/** /**
* Constructs an instance where {@link #uriPositionOffset} may be non-zero. * Constructs an instance where {@link #uriPositionOffset} may be non-zero.
* *
* @deprecated Use {@link Builder}.
* @param uri {@link #uri}. * @param uri {@link #uri}.
* @param absoluteStreamPosition The sum of {@link #uriPositionOffset} and {@link #position}. * @param absoluteStreamPosition The sum of {@link #uriPositionOffset} and {@link #position}.
* @param position {@link #position}. * @param position {@link #position}.
...@@ -430,6 +475,8 @@ public final class DataSpec { ...@@ -430,6 +475,8 @@ public final class DataSpec {
* @param key {@link #key}. * @param key {@link #key}.
* @param flags {@link #flags}. * @param flags {@link #flags}.
*/ */
@SuppressWarnings("deprecation")
@Deprecated
public DataSpec( public DataSpec(
Uri uri, Uri uri,
long absoluteStreamPosition, long absoluteStreamPosition,
...@@ -446,6 +493,7 @@ public final class DataSpec { ...@@ -446,6 +493,7 @@ public final class DataSpec {
* set to {@link #HTTP_METHOD_POST}. If {@code postBody} is null then {@link #httpMethod} is set * set to {@link #HTTP_METHOD_POST}. If {@code postBody} is null then {@link #httpMethod} is set
* to {@link #HTTP_METHOD_GET}. * to {@link #HTTP_METHOD_GET}.
* *
* @deprecated Use {@link Builder}.
* @param uri {@link #uri}. * @param uri {@link #uri}.
* @param postBody {@link #httpBody} The body of the HTTP request, which is also used to infer the * @param postBody {@link #httpBody} The body of the HTTP request, which is also used to infer the
* {@link #httpMethod}. * {@link #httpMethod}.
...@@ -455,6 +503,8 @@ public final class DataSpec { ...@@ -455,6 +503,8 @@ public final class DataSpec {
* @param key {@link #key}. * @param key {@link #key}.
* @param flags {@link #flags}. * @param flags {@link #flags}.
*/ */
@SuppressWarnings("deprecation")
@Deprecated
public DataSpec( public DataSpec(
Uri uri, Uri uri,
@Nullable byte[] postBody, @Nullable byte[] postBody,
...@@ -477,6 +527,7 @@ public final class DataSpec { ...@@ -477,6 +527,7 @@ public final class DataSpec {
/** /**
* Construct a instance where {@link #uriPositionOffset} may be non-zero. * Construct a instance where {@link #uriPositionOffset} may be non-zero.
* *
* @deprecated Use {@link Builder}.
* @param uri {@link #uri}. * @param uri {@link #uri}.
* @param httpMethod {@link #httpMethod}. * @param httpMethod {@link #httpMethod}.
* @param httpBody {@link #httpBody}. * @param httpBody {@link #httpBody}.
...@@ -486,6 +537,8 @@ public final class DataSpec { ...@@ -486,6 +537,8 @@ public final class DataSpec {
* @param key {@link #key}. * @param key {@link #key}.
* @param flags {@link #flags}. * @param flags {@link #flags}.
*/ */
@SuppressWarnings("deprecation")
@Deprecated
public DataSpec( public DataSpec(
Uri uri, Uri uri,
@HttpMethod int httpMethod, @HttpMethod int httpMethod,
...@@ -510,6 +563,7 @@ public final class DataSpec { ...@@ -510,6 +563,7 @@ public final class DataSpec {
/** /**
* Construct a instance where {@link #uriPositionOffset} may be non-zero. * Construct a instance where {@link #uriPositionOffset} may be non-zero.
* *
* @deprecated Use {@link Builder}.
* @param uri {@link #uri}. * @param uri {@link #uri}.
* @param httpMethod {@link #httpMethod}. * @param httpMethod {@link #httpMethod}.
* @param httpBody {@link #httpBody}. * @param httpBody {@link #httpBody}.
...@@ -520,6 +574,7 @@ public final class DataSpec { ...@@ -520,6 +574,7 @@ public final class DataSpec {
* @param flags {@link #flags}. * @param flags {@link #flags}.
* @param httpRequestHeaders {@link #httpRequestHeaders}. * @param httpRequestHeaders {@link #httpRequestHeaders}.
*/ */
@Deprecated
public DataSpec( public DataSpec(
Uri uri, Uri uri,
@HttpMethod int httpMethod, @HttpMethod int httpMethod,
......
library/common/src/test/java/com/google/android/exoplayer2/upstream/DataSpecTest.java
...@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; ...@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;
import static junit.framework.TestCase.fail; import static junit.framework.TestCase.fail;
import android.net.Uri; import android.net.Uri;
import androidx.annotation.Nullable;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import java.util.HashMap; import java.util.HashMap;
...@@ -31,6 +32,7 @@ import org.junit.runner.RunWith; ...@@ -31,6 +32,7 @@ import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class DataSpecTest { public class DataSpecTest {
@SuppressWarnings("deprecation")
@Test @Test
public void createDataSpec_withDefaultValues() { public void createDataSpec_withDefaultValues() {
Uri uri = Uri.parse("www.google.com"); Uri uri = Uri.parse("www.google.com");
...@@ -212,11 +214,12 @@ public class DataSpecTest { ...@@ -212,11 +214,12 @@ public class DataSpecTest {
assertHttpRequestHeadersReadOnly(dataSpec); assertHttpRequestHeadersReadOnly(dataSpec);
} }
@SuppressWarnings("deprecation")
@Test @Test
public void createDataSpec_setsHttpMethodAndPostBody() { public void createDataSpec_setsHttpMethodAndPostBody() {
Uri uri = Uri.parse("www.google.com"); Uri uri = Uri.parse("www.google.com");
byte[] postBody = new byte[] {0, 1, 2, 3}; @Nullable byte[] postBody = new byte[] {0, 1, 2, 3};
DataSpec dataSpec = DataSpec dataSpec =
new DataSpec( new DataSpec(
uri, uri,
...@@ -259,7 +262,7 @@ public class DataSpecTest { ...@@ -259,7 +262,7 @@ public class DataSpecTest {
@Test @Test
public void withUri_copiesHttpRequestHeaders() { public void withUri_copiesHttpRequestHeaders() {
Map<String, String> httpRequestHeaders = createHttpRequestHeaders(5); Map<String, String> httpRequestHeaders = createHttpRequestHeaders(5);
DataSpec dataSpec = createDataSpecWithHeaders(httpRequestHeaders); DataSpec dataSpec = createDataSpecWithHttpRequestHeaders(httpRequestHeaders);
DataSpec dataSpecCopy = dataSpec.withUri(Uri.parse("www.new-uri.com")); DataSpec dataSpecCopy = dataSpec.withUri(Uri.parse("www.new-uri.com"));
...@@ -269,7 +272,7 @@ public class DataSpecTest { ...@@ -269,7 +272,7 @@ public class DataSpecTest {
@Test @Test
public void subrange_copiesHttpRequestHeaders() { public void subrange_copiesHttpRequestHeaders() {
Map<String, String> httpRequestHeaders = createHttpRequestHeaders(5); Map<String, String> httpRequestHeaders = createHttpRequestHeaders(5);
DataSpec dataSpec = createDataSpecWithHeaders(httpRequestHeaders); DataSpec dataSpec = createDataSpecWithHttpRequestHeaders(httpRequestHeaders);
DataSpec dataSpecCopy = dataSpec.subrange(2); DataSpec dataSpecCopy = dataSpec.subrange(2);
...@@ -279,7 +282,7 @@ public class DataSpecTest { ...@@ -279,7 +282,7 @@ public class DataSpecTest {
@Test @Test
public void subrange_withOffsetAndLength_copiesHttpRequestHeaders() { public void subrange_withOffsetAndLength_copiesHttpRequestHeaders() {
Map<String, String> httpRequestHeaders = createHttpRequestHeaders(5); Map<String, String> httpRequestHeaders = createHttpRequestHeaders(5);
DataSpec dataSpec = createDataSpecWithHeaders(httpRequestHeaders); DataSpec dataSpec = createDataSpecWithHttpRequestHeaders(httpRequestHeaders);
DataSpec dataSpecCopy = dataSpec.subrange(2, 2); DataSpec dataSpecCopy = dataSpec.subrange(2, 2);
...@@ -289,7 +292,7 @@ public class DataSpecTest { ...@@ -289,7 +292,7 @@ public class DataSpecTest {
@Test @Test
public void withRequestHeaders_setsCorrectHeaders() { public void withRequestHeaders_setsCorrectHeaders() {
Map<String, String> httpRequestHeaders = createHttpRequestHeaders(5); Map<String, String> httpRequestHeaders = createHttpRequestHeaders(5);
DataSpec dataSpec = createDataSpecWithHeaders(httpRequestHeaders); DataSpec dataSpec = createDataSpecWithHttpRequestHeaders(httpRequestHeaders);
Map<String, String> newRequestHeaders = createHttpRequestHeaders(5, 10); Map<String, String> newRequestHeaders = createHttpRequestHeaders(5, 10);
DataSpec dataSpecCopy = dataSpec.withRequestHeaders(newRequestHeaders); DataSpec dataSpecCopy = dataSpec.withRequestHeaders(newRequestHeaders);
...@@ -300,7 +303,7 @@ public class DataSpecTest { ...@@ -300,7 +303,7 @@ public class DataSpecTest {
@Test @Test
public void withAdditionalHeaders_setsCorrectHeaders() { public void withAdditionalHeaders_setsCorrectHeaders() {
Map<String, String> httpRequestHeaders = createHttpRequestHeaders(5); Map<String, String> httpRequestHeaders = createHttpRequestHeaders(5);
DataSpec dataSpec = createDataSpecWithHeaders(httpRequestHeaders); DataSpec dataSpec = createDataSpecWithHttpRequestHeaders(httpRequestHeaders);
Map<String, String> additionalHeaders = createHttpRequestHeaders(5, 10); Map<String, String> additionalHeaders = createHttpRequestHeaders(5, 10);
// additionalHeaders may overwrite a header key // additionalHeaders may overwrite a header key
String existingKey = httpRequestHeaders.keySet().iterator().next(); String existingKey = httpRequestHeaders.keySet().iterator().next();
...@@ -328,17 +331,12 @@ public class DataSpecTest { ...@@ -328,17 +331,12 @@ public class DataSpecTest {
return httpRequestParameters; return httpRequestParameters;
} }
private static DataSpec createDataSpecWithHeaders(Map<String, String> httpRequestHeaders) { private static DataSpec createDataSpecWithHttpRequestHeaders(
return new DataSpec( Map<String, String> httpRequestHeaders) {
Uri.parse("www.google.com"), return new DataSpec.Builder()
/* httpMethod= */ 0, .setUri("www.google.com")
/* httpBody= */ new byte[] {0, 0, 0, 0}, .setHttpRequestHeaders(httpRequestHeaders)
/* absoluteStreamPosition= */ 0, .build();
/* position= */ 0,
/* length= */ 1,
/* key= */ "key",
/* flags= */ 0,
httpRequestHeaders);
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
......
library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
...@@ -97,7 +97,7 @@ public final class ContentDataSourceTest { ...@@ -97,7 +97,7 @@ public final class ContentDataSourceTest {
ContentDataSource dataSource = ContentDataSource dataSource =
new ContentDataSource(InstrumentationRegistry.getTargetContext()); new ContentDataSource(InstrumentationRegistry.getTargetContext());
try { try {
DataSpec dataSpec = new DataSpec(contentUri, offset, length, null); DataSpec dataSpec = new DataSpec(contentUri, offset, length);
byte[] completeData = byte[] completeData =
TestUtil.getByteArray(InstrumentationRegistry.getTargetContext(), DATA_PATH); TestUtil.getByteArray(InstrumentationRegistry.getTargetContext(), DATA_PATH);
byte[] expectedData = Arrays.copyOfRange(completeData, offset, byte[] expectedData = Arrays.copyOfRange(completeData, offset,
......
library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
*/ */
package com.google.android.exoplayer2.drm; package com.google.android.exoplayer2.drm;
import android.net.Uri;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
...@@ -150,15 +149,12 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback { ...@@ -150,15 +149,12 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback {
int manualRedirectCount = 0; int manualRedirectCount = 0;
while (true) { while (true) {
DataSpec dataSpec = DataSpec dataSpec =
new DataSpec( new DataSpec.Builder()
Uri.parse(url), .setUri(url)
DataSpec.HTTP_METHOD_POST, .setHttpMethod(DataSpec.HTTP_METHOD_POST)
httpBody, .setHttpBody(httpBody)
/* absoluteStreamPosition= */ 0, .setFlags(DataSpec.FLAG_ALLOW_GZIP)
/* position= */ 0, .build();
/* length= */ C.LENGTH_UNSET,
/* key= */ null,
DataSpec.FLAG_ALLOW_GZIP);
DataSourceInputStream inputStream = new DataSourceInputStream(dataSource, dataSpec); DataSourceInputStream inputStream = new DataSourceInputStream(dataSource, dataSpec);
try { try {
return Util.toByteArray(inputStream); return Util.toByteArray(inputStream);
...@@ -168,7 +164,7 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback { ...@@ -168,7 +164,7 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback {
boolean manuallyRedirect = boolean manuallyRedirect =
(e.responseCode == 307 || e.responseCode == 308) (e.responseCode == 307 || e.responseCode == 308)
&& manualRedirectCount++ < MAX_MANUAL_REDIRECTS; && manualRedirectCount++ < MAX_MANUAL_REDIRECTS;
String redirectUrl = manuallyRedirect ? getRedirectUrl(e) : null; @Nullable String redirectUrl = manuallyRedirect ? getRedirectUrl(e) : null;
if (redirectUrl == null) { if (redirectUrl == null) {
throw e; throw e;
} }
...@@ -182,12 +178,11 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback { ...@@ -182,12 +178,11 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback {
private static @Nullable String getRedirectUrl(InvalidResponseCodeException exception) { private static @Nullable String getRedirectUrl(InvalidResponseCodeException exception) {
Map<String, List<String>> headerFields = exception.headerFields; Map<String, List<String>> headerFields = exception.headerFields;
if (headerFields != null) { if (headerFields != null) {
List<String> locationHeaders = headerFields.get("Location"); @Nullable List<String> locationHeaders = headerFields.get("Location");
if (locationHeaders != null && !locationHeaders.isEmpty()) { if (locationHeaders != null && !locationHeaders.isEmpty()) {
return locationHeaders.get(0); return locationHeaders.get(0);
} }
} }
return null; return null;
} }
} }
library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
...@@ -56,12 +56,11 @@ public final class ProgressiveDownloader implements Downloader { ...@@ -56,12 +56,11 @@ public final class ProgressiveDownloader implements Downloader {
public ProgressiveDownloader( public ProgressiveDownloader(
Uri uri, @Nullable String customCacheKey, DownloaderConstructorHelper constructorHelper) { Uri uri, @Nullable String customCacheKey, DownloaderConstructorHelper constructorHelper) {
this.dataSpec = this.dataSpec =
new DataSpec( new DataSpec.Builder()
uri, .setUri(uri)
/* absoluteStreamPosition= */ 0, .setKey(customCacheKey)
C.LENGTH_UNSET, .setFlags(DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION)
customCacheKey, .build();
/* flags= */ DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION);
this.cache = constructorHelper.getCache(); this.cache = constructorHelper.getCache();
this.dataSource = constructorHelper.createCacheDataSource(); this.dataSource = constructorHelper.createCacheDataSource();
this.cacheKeyFactory = constructorHelper.getCacheKeyFactory(); this.cacheKeyFactory = constructorHelper.getCacheKeyFactory();
......
library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
...@@ -228,12 +228,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme ...@@ -228,12 +228,7 @@ public abstract class SegmentDownloader<M extends FilterableManifest<M>> impleme
} }
protected static DataSpec getCompressibleDataSpec(Uri uri) { protected static DataSpec getCompressibleDataSpec(Uri uri) {
return new DataSpec( return new DataSpec.Builder().setUri(uri).setFlags(DataSpec.FLAG_ALLOW_GZIP).build();
uri,
/* absoluteStreamPosition= */ 0,
/* length= */ C.LENGTH_UNSET,
/* key= */ null,
/* flags= */ DataSpec.FLAG_ALLOW_GZIP);
} }
private static void mergeSegments(List<Segment> segments, CacheKeyFactory keyFactory) { private static void mergeSegments(List<Segment> segments, CacheKeyFactory keyFactory) {
......
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
...@@ -1022,13 +1022,14 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -1022,13 +1022,14 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private DataSpec buildDataSpec(long position) { private DataSpec buildDataSpec(long position) {
// Disable caching if the content length cannot be resolved, since this is indicative of a // Disable caching if the content length cannot be resolved, since this is indicative of a
// progressive live stream. // progressive live stream.
return new DataSpec( return new DataSpec.Builder()
uri, .setUri(uri)
position, .setPosition(position)
C.LENGTH_UNSET, .setKey(customCacheKey)
customCacheKey, .setFlags(
DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN | DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION, DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN | DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION)
ICY_METADATA_HEADERS); .setHttpRequestHeaders(ICY_METADATA_HEADERS)
.build();
} }
private void setLoadPosition(long position, long timeUs) { private void setLoadPosition(long position, long timeUs) {
......
library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
...@@ -287,7 +287,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource { ...@@ -287,7 +287,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
this.loadErrorHandlingPolicy = loadErrorHandlingPolicy; this.loadErrorHandlingPolicy = loadErrorHandlingPolicy;
this.treatLoadErrorsAsEndOfStream = treatLoadErrorsAsEndOfStream; this.treatLoadErrorsAsEndOfStream = treatLoadErrorsAsEndOfStream;
this.tag = tag; this.tag = tag;
dataSpec = new DataSpec(uri, DataSpec.FLAG_ALLOW_GZIP); dataSpec = new DataSpec.Builder().setUri(uri).setFlags(DataSpec.FLAG_ALLOW_GZIP).build();
timeline = timeline =
new SinglePeriodTimeline( new SinglePeriodTimeline(
durationUs, durationUs,
......
library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java
...@@ -109,7 +109,11 @@ public final class ParsingLoadable<T> implements Loadable { ...@@ -109,7 +109,11 @@ public final class ParsingLoadable<T> implements Loadable {
* @param parser Parses the object from the response. * @param parser Parses the object from the response.
*/ */
public ParsingLoadable(DataSource dataSource, Uri uri, int type, Parser<? extends T> parser) { public ParsingLoadable(DataSource dataSource, Uri uri, int type, Parser<? extends T> parser) {
this(dataSource, new DataSpec(uri, DataSpec.FLAG_ALLOW_GZIP), type, parser); this(
dataSource,
new DataSpec.Builder().setUri(uri).setFlags(DataSpec.FLAG_ALLOW_GZIP).build(),
type,
parser);
} }
/** /**
......
library/core/src/test/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.upstream; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.upstream;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import android.net.Uri;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import java.io.IOException; import java.io.IOException;
...@@ -112,7 +113,7 @@ public final class ByteArrayDataSourceTest { ...@@ -112,7 +113,7 @@ public final class ByteArrayDataSourceTest {
boolean opened = false; boolean opened = false;
try { try {
// Open the source. // Open the source.
long length = dataSource.open(new DataSpec(null, dataOffset, dataLength, null)); long length = dataSource.open(new DataSpec(Uri.EMPTY, dataOffset, dataLength));
opened = true; opened = true;
assertThat(expectFailOnOpen).isFalse(); assertThat(expectFailOnOpen).isFalse();
......
library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
...@@ -151,7 +151,7 @@ public final class DataSchemeDataSourceTest { ...@@ -151,7 +151,7 @@ public final class DataSchemeDataSourceTest {
} }
private static DataSpec buildDataSpec(String uriString, int position, int length) { private static DataSpec buildDataSpec(String uriString, int position, int length) {
return new DataSpec(Uri.parse(uriString), position, length, /* key= */ null); return new DataSpec(Uri.parse(uriString), position, length);
} }
/** /**
......
library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceTest.java
...@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.upstream; ...@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.upstream;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.net.Uri;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
...@@ -89,16 +88,13 @@ public class DefaultHttpDataSourceTest { ...@@ -89,16 +88,13 @@ public class DefaultHttpDataSourceTest {
dataSpecRequestProperties.put("5", dataSpecParameter); dataSpecRequestProperties.put("5", dataSpecParameter);
DataSpec dataSpec = DataSpec dataSpec =
new DataSpec( new DataSpec.Builder()
/* uri= */ Uri.parse("http://www.google.com"), .setUri("http://www.google.com")
/* httpMethod= */ 1, .setHttpBody(new byte[] {0, 0, 0, 0})
/* httpBody= */ new byte[] {0, 0, 0, 0}, .setLength(1)
/* absoluteStreamPosition= */ 0, .setKey("key")
/* position= */ 0, .setHttpRequestHeaders(dataSpecRequestProperties)
/* length= */ 1, .build();
/* key= */ "key",
/* flags= */ 0,
dataSpecRequestProperties);
defaultHttpDataSource.open(dataSpec); defaultHttpDataSource.open(dataSpec);
......
library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
...@@ -286,11 +286,7 @@ public final class CacheDataSourceTest { ...@@ -286,11 +286,7 @@ public final class CacheDataSourceTest {
// An unbounded request with offset for not cached content. // An unbounded request with offset for not cached content.
dataSpec = dataSpec =
new DataSpec( new DataSpec(Uri.parse("https://www.test.com/other"), TEST_DATA.length - 2, C.LENGTH_UNSET);
Uri.parse("https://www.test.com/other"),
TEST_DATA.length - 2,
C.LENGTH_UNSET,
/* key= */ null);
assertThat(cacheDataSource.open(dataSpec)).isEqualTo(C.LENGTH_UNSET); assertThat(cacheDataSource.open(dataSpec)).isEqualTo(C.LENGTH_UNSET);
} }
...@@ -624,12 +620,13 @@ public final class CacheDataSourceTest { ...@@ -624,12 +620,13 @@ public final class CacheDataSourceTest {
} }
private DataSpec buildDataSpec(long position, long length, @Nullable String key) { private DataSpec buildDataSpec(long position, long length, @Nullable String key) {
return new DataSpec( return new DataSpec.Builder()
testDataUri, .setUri(testDataUri)
position, .setPosition(position)
length, .setLength(length)
key, .setKey(key)
DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION, .setFlags(DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION)
httpRequestHeaders); .setHttpRequestHeaders(httpRequestHeaders)
.build();
} }
} }
library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java
...@@ -48,25 +48,24 @@ public final class CacheDataSourceTest2 { ...@@ -48,25 +48,24 @@ public final class CacheDataSourceTest2 {
private static final int EXO_CACHE_MAX_FILESIZE = 128; private static final int EXO_CACHE_MAX_FILESIZE = 128;
private static final Uri URI = Uri.parse("http://test.com/content"); private static final Uri URI = Uri.parse("http://test.com/content");
private static final String KEY = "key";
private static final byte[] DATA = TestUtil.buildTestData(8 * EXO_CACHE_MAX_FILESIZE + 1); private static final byte[] DATA = TestUtil.buildTestData(8 * EXO_CACHE_MAX_FILESIZE + 1);
// A DataSpec that covers the full file. // A DataSpec that covers the full file.
private static final DataSpec FULL = new DataSpec(URI, 0, DATA.length, KEY); private static final DataSpec FULL = new DataSpec(URI, 0, DATA.length);
private static final int OFFSET_ON_BOUNDARY = EXO_CACHE_MAX_FILESIZE; private static final int OFFSET_ON_BOUNDARY = EXO_CACHE_MAX_FILESIZE;
// A DataSpec that starts at 0 and extends to a cache file boundary. // A DataSpec that starts at 0 and extends to a cache file boundary.
private static final DataSpec END_ON_BOUNDARY = new DataSpec(URI, 0, OFFSET_ON_BOUNDARY, KEY); private static final DataSpec END_ON_BOUNDARY = new DataSpec(URI, 0, OFFSET_ON_BOUNDARY);
// A DataSpec that starts on the same boundary and extends to the end of the file. // A DataSpec that starts on the same boundary and extends to the end of the file.
private static final DataSpec START_ON_BOUNDARY = new DataSpec(URI, OFFSET_ON_BOUNDARY, private static final DataSpec START_ON_BOUNDARY =
DATA.length - OFFSET_ON_BOUNDARY, KEY); new DataSpec(URI, OFFSET_ON_BOUNDARY, DATA.length - OFFSET_ON_BOUNDARY);
private static final int OFFSET_OFF_BOUNDARY = EXO_CACHE_MAX_FILESIZE * 2 + 1; private static final int OFFSET_OFF_BOUNDARY = EXO_CACHE_MAX_FILESIZE * 2 + 1;
// A DataSpec that starts at 0 and extends to just past a cache file boundary. // A DataSpec that starts at 0 and extends to just past a cache file boundary.
private static final DataSpec END_OFF_BOUNDARY = new DataSpec(URI, 0, OFFSET_OFF_BOUNDARY, KEY); private static final DataSpec END_OFF_BOUNDARY = new DataSpec(URI, 0, OFFSET_OFF_BOUNDARY);
// A DataSpec that starts on the same boundary and extends to the end of the file. // A DataSpec that starts on the same boundary and extends to the end of the file.
private static final DataSpec START_OFF_BOUNDARY = new DataSpec(URI, OFFSET_OFF_BOUNDARY, private static final DataSpec START_OFF_BOUNDARY =
DATA.length - OFFSET_OFF_BOUNDARY, KEY); new DataSpec(URI, OFFSET_OFF_BOUNDARY, DATA.length - OFFSET_OFF_BOUNDARY);
@Test @Test
public void testWithoutEncryption() throws IOException { public void testWithoutEncryption() throws IOException {
......
library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
...@@ -126,12 +126,12 @@ public final class CacheUtilTest { ...@@ -126,12 +126,12 @@ public final class CacheUtilTest {
// If DataSpec.key is present, returns it. // If DataSpec.key is present, returns it.
assertThat( assertThat(
CacheUtil.DEFAULT_CACHE_KEY_FACTORY.buildCacheKey( CacheUtil.DEFAULT_CACHE_KEY_FACTORY.buildCacheKey(
new DataSpec(testUri, 0, LENGTH_UNSET, key))) new DataSpec.Builder().setUri(testUri).setKey(key).build()))
.isEqualTo(key); .isEqualTo(key);
// If not generates a new one using DataSpec.uri. // If not generates a new one using DataSpec.uri.
assertThat( assertThat(
CacheUtil.DEFAULT_CACHE_KEY_FACTORY.buildCacheKey( CacheUtil.DEFAULT_CACHE_KEY_FACTORY.buildCacheKey(
new DataSpec(testUri, 0, LENGTH_UNSET, null))) new DataSpec(testUri, /* position= */ 0, /* length= */ LENGTH_UNSET)))
.isEqualTo(testUri.toString()); .isEqualTo(testUri.toString());
} }
...@@ -186,11 +186,7 @@ public final class CacheUtilTest { ...@@ -186,11 +186,7 @@ public final class CacheUtilTest {
mockCache.spansAndGaps = new int[] {100, 100, 200}; mockCache.spansAndGaps = new int[] {100, 100, 200};
Pair<Long, Long> contentLengthAndBytesCached = Pair<Long, Long> contentLengthAndBytesCached =
CacheUtil.getCached( CacheUtil.getCached(
new DataSpec( new DataSpec(Uri.parse("test"), /* position= */ 100, /* length= */ C.LENGTH_UNSET),
Uri.parse("test"),
/* absoluteStreamPosition= */ 100,
/* length= */ C.LENGTH_UNSET,
/* key= */ null),
mockCache, mockCache,
/* cacheKeyFactory= */ null); /* cacheKeyFactory= */ null);
...@@ -222,7 +218,7 @@ public final class CacheUtilTest { ...@@ -222,7 +218,7 @@ public final class CacheUtilTest {
FakeDataSource dataSource = new FakeDataSource(fakeDataSet); FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
Uri testUri = Uri.parse("test_data"); Uri testUri = Uri.parse("test_data");
DataSpec dataSpec = new DataSpec(testUri, 10, 20, null); DataSpec dataSpec = new DataSpec(testUri, /* position= */ 10, /* length= */ 20);
CachingCounters counters = new CachingCounters(); CachingCounters counters = new CachingCounters();
CacheUtil.cache( CacheUtil.cache(
dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null); dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
...@@ -266,7 +262,7 @@ public final class CacheUtilTest { ...@@ -266,7 +262,7 @@ public final class CacheUtilTest {
FakeDataSource dataSource = new FakeDataSource(fakeDataSet); FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
Uri testUri = Uri.parse("test_data"); Uri testUri = Uri.parse("test_data");
DataSpec dataSpec = new DataSpec(testUri, 10, 20, null); DataSpec dataSpec = new DataSpec(testUri, /* position= */ 10, /* length= */ 20);
CachingCounters counters = new CachingCounters(); CachingCounters counters = new CachingCounters();
CacheUtil.cache( CacheUtil.cache(
dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null); dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
...@@ -292,7 +288,7 @@ public final class CacheUtilTest { ...@@ -292,7 +288,7 @@ public final class CacheUtilTest {
FakeDataSource dataSource = new FakeDataSource(fakeDataSet); FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
Uri testUri = Uri.parse("test_data"); Uri testUri = Uri.parse("test_data");
DataSpec dataSpec = new DataSpec(testUri, 0, 1000, null); DataSpec dataSpec = new DataSpec(testUri, /* position= */ 0, /* length= */ 1000);
CachingCounters counters = new CachingCounters(); CachingCounters counters = new CachingCounters();
CacheUtil.cache( CacheUtil.cache(
dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null); dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
...@@ -307,7 +303,7 @@ public final class CacheUtilTest { ...@@ -307,7 +303,7 @@ public final class CacheUtilTest {
FakeDataSource dataSource = new FakeDataSource(fakeDataSet); FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
Uri testUri = Uri.parse("test_data"); Uri testUri = Uri.parse("test_data");
DataSpec dataSpec = new DataSpec(testUri, 0, 1000, null); DataSpec dataSpec = new DataSpec(testUri, /* position= */ 0, /* length= */ 1000);
try { try {
CacheUtil.cache( CacheUtil.cache(
...@@ -358,8 +354,11 @@ public final class CacheUtilTest { ...@@ -358,8 +354,11 @@ public final class CacheUtilTest {
FakeDataSet fakeDataSet = new FakeDataSet().setRandomData("test_data", 100); FakeDataSet fakeDataSet = new FakeDataSet().setRandomData("test_data", 100);
FakeDataSource dataSource = new FakeDataSource(fakeDataSet); FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
Uri uri = Uri.parse("test_data"); DataSpec dataSpec =
DataSpec dataSpec = new DataSpec(uri, DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION); new DataSpec.Builder()
.setUri("test_data")
.setFlags(DataSpec.FLAG_ALLOW_CACHE_FRAGMENTATION)
.build();
CacheUtil.cache( CacheUtil.cache(
dataSpec, dataSpec,
cache, cache,
......
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java
...@@ -46,6 +46,22 @@ import java.util.List; ...@@ -46,6 +46,22 @@ import java.util.List;
public final class DashUtil { public final class DashUtil {
/** /**
* Builds a {@link DataSpec} for a given {@link RangedUri} belonging to {@link Representation}.
*
* @param representation The {@link Representation} to which the request belongs.
* @param requestUri The {@link RangedUri} of the data to request.
* @return The {@link DataSpec}.
*/
public static DataSpec buildDataSpec(Representation representation, RangedUri requestUri) {
return new DataSpec.Builder()
.setUri(requestUri.resolveUri(representation.baseUrl))
.setPosition(requestUri.start)
.setLength(requestUri.length)
.setKey(representation.getCacheKey())
.build();
}
/**
* Loads a DASH manifest. * Loads a DASH manifest.
* *
* @param dataSource The {@link HttpDataSource} from which the manifest should be read. * @param dataSource The {@link HttpDataSource} from which the manifest should be read.
...@@ -53,8 +69,7 @@ public final class DashUtil { ...@@ -53,8 +69,7 @@ public final class DashUtil {
* @return An instance of {@link DashManifest}. * @return An instance of {@link DashManifest}.
* @throws IOException Thrown when there is an error while loading. * @throws IOException Thrown when there is an error while loading.
*/ */
public static DashManifest loadManifest(DataSource dataSource, Uri uri) public static DashManifest loadManifest(DataSource dataSource, Uri uri) throws IOException {
throws IOException {
return ParsingLoadable.load(dataSource, new DashManifestParser(), uri, C.DATA_TYPE_MANIFEST); return ParsingLoadable.load(dataSource, new DashManifestParser(), uri, C.DATA_TYPE_MANIFEST);
} }
...@@ -176,8 +191,7 @@ public final class DashUtil { ...@@ -176,8 +191,7 @@ public final class DashUtil {
private static void loadInitializationData(DataSource dataSource, private static void loadInitializationData(DataSource dataSource,
Representation representation, ChunkExtractorWrapper extractorWrapper, RangedUri requestUri) Representation representation, ChunkExtractorWrapper extractorWrapper, RangedUri requestUri)
throws IOException, InterruptedException { throws IOException, InterruptedException {
DataSpec dataSpec = new DataSpec(requestUri.resolveUri(representation.baseUrl), DataSpec dataSpec = DashUtil.buildDataSpec(representation, requestUri);
requestUri.start, requestUri.length, representation.getCacheKey());
InitializationChunk initializationChunk = new InitializationChunk(dataSource, dataSpec, InitializationChunk initializationChunk = new InitializationChunk(dataSource, dataSpec,
representation.format, C.SELECTION_REASON_UNKNOWN, null /* trackSelectionData */, representation.format, C.SELECTION_REASON_UNKNOWN, null /* trackSelectionData */,
extractorWrapper); extractorWrapper);
......
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
...@@ -487,20 +487,19 @@ public class DefaultDashChunkSource implements DashChunkSource { ...@@ -487,20 +487,19 @@ public class DefaultDashChunkSource implements DashChunkSource {
Object trackSelectionData, Object trackSelectionData,
RangedUri initializationUri, RangedUri initializationUri,
RangedUri indexUri) { RangedUri indexUri) {
Representation representation = representationHolder.representation;
RangedUri requestUri; RangedUri requestUri;
String baseUrl = representationHolder.representation.baseUrl;
if (initializationUri != null) { if (initializationUri != null) {
// It's common for initialization and index data to be stored adjacently. Attempt to merge // It's common for initialization and index data to be stored adjacently. Attempt to merge
// the two requests together to request both at once. // the two requests together to request both at once.
requestUri = initializationUri.attemptMerge(indexUri, baseUrl); requestUri = initializationUri.attemptMerge(indexUri, representation.baseUrl);
if (requestUri == null) { if (requestUri == null) {
requestUri = initializationUri; requestUri = initializationUri;
} }
} else { } else {
requestUri = indexUri; requestUri = indexUri;
} }
DataSpec dataSpec = new DataSpec(requestUri.resolveUri(baseUrl), requestUri.start, DataSpec dataSpec = DashUtil.buildDataSpec(representation, requestUri);
requestUri.length, representationHolder.representation.getCacheKey());
return new InitializationChunk(dataSource, dataSpec, trackFormat, return new InitializationChunk(dataSource, dataSpec, trackFormat,
trackSelectionReason, trackSelectionData, representationHolder.extractorWrapper); trackSelectionReason, trackSelectionData, representationHolder.extractorWrapper);
} }
...@@ -521,15 +520,14 @@ public class DefaultDashChunkSource implements DashChunkSource { ...@@ -521,15 +520,14 @@ public class DefaultDashChunkSource implements DashChunkSource {
String baseUrl = representation.baseUrl; String baseUrl = representation.baseUrl;
if (representationHolder.extractorWrapper == null) { if (representationHolder.extractorWrapper == null) {
long endTimeUs = representationHolder.getSegmentEndTimeUs(firstSegmentNum); long endTimeUs = representationHolder.getSegmentEndTimeUs(firstSegmentNum);
DataSpec dataSpec = new DataSpec(segmentUri.resolveUri(baseUrl), DataSpec dataSpec = DashUtil.buildDataSpec(representation, segmentUri);
segmentUri.start, segmentUri.length, representation.getCacheKey());
return new SingleSampleMediaChunk(dataSource, dataSpec, trackFormat, trackSelectionReason, return new SingleSampleMediaChunk(dataSource, dataSpec, trackFormat, trackSelectionReason,
trackSelectionData, startTimeUs, endTimeUs, firstSegmentNum, trackType, trackFormat); trackSelectionData, startTimeUs, endTimeUs, firstSegmentNum, trackType, trackFormat);
} else { } else {
int segmentCount = 1; int segmentCount = 1;
for (int i = 1; i < maxSegmentCount; i++) { for (int i = 1; i < maxSegmentCount; i++) {
RangedUri nextSegmentUri = representationHolder.getSegmentUrl(firstSegmentNum + i); RangedUri nextSegmentUri = representationHolder.getSegmentUrl(firstSegmentNum + i);
RangedUri mergedSegmentUri = segmentUri.attemptMerge(nextSegmentUri, baseUrl); @Nullable RangedUri mergedSegmentUri = segmentUri.attemptMerge(nextSegmentUri, baseUrl);
if (mergedSegmentUri == null) { if (mergedSegmentUri == null) {
// Unable to merge segment fetches because the URIs do not merge. // Unable to merge segment fetches because the URIs do not merge.
break; break;
...@@ -543,8 +541,7 @@ public class DefaultDashChunkSource implements DashChunkSource { ...@@ -543,8 +541,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
periodDurationUs != C.TIME_UNSET && periodDurationUs <= endTimeUs periodDurationUs != C.TIME_UNSET && periodDurationUs <= endTimeUs
? periodDurationUs ? periodDurationUs
: C.TIME_UNSET; : C.TIME_UNSET;
DataSpec dataSpec = new DataSpec(segmentUri.resolveUri(baseUrl), DataSpec dataSpec = DashUtil.buildDataSpec(representation, segmentUri);
segmentUri.start, segmentUri.length, representation.getCacheKey());
long sampleOffsetUs = -representation.presentationTimeOffsetUs; long sampleOffsetUs = -representation.presentationTimeOffsetUs;
return new ContainerMediaChunk( return new ContainerMediaChunk(
dataSource, dataSource,
...@@ -588,11 +585,8 @@ public class DefaultDashChunkSource implements DashChunkSource { ...@@ -588,11 +585,8 @@ public class DefaultDashChunkSource implements DashChunkSource {
@Override @Override
public DataSpec getDataSpec() { public DataSpec getDataSpec() {
checkInBounds(); checkInBounds();
Representation representation = representationHolder.representation;
RangedUri segmentUri = representationHolder.getSegmentUrl(getCurrentIndex()); RangedUri segmentUri = representationHolder.getSegmentUrl(getCurrentIndex());
Uri resolvedUri = segmentUri.resolveUri(representation.baseUrl); return DashUtil.buildDataSpec(representationHolder.representation, segmentUri);
String cacheKey = representation.getCacheKey();
return new DataSpec(resolvedUri, segmentUri.start, segmentUri.length, cacheKey);
} }
@Override @Override
......
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
...@@ -153,7 +153,7 @@ public final class DashDownloader extends SegmentDownloader<DashManifest> { ...@@ -153,7 +153,7 @@ public final class DashDownloader extends SegmentDownloader<DashManifest> {
private static void addSegment( private static void addSegment(
long startTimeUs, String baseUrl, RangedUri rangedUri, ArrayList<Segment> out) { long startTimeUs, String baseUrl, RangedUri rangedUri, ArrayList<Segment> out) {
DataSpec dataSpec = DataSpec dataSpec =
new DataSpec(rangedUri.resolveUri(baseUrl), rangedUri.start, rangedUri.length, null); new DataSpec(rangedUri.resolveUri(baseUrl), rangedUri.start, rangedUri.length);
out.add(new Segment(startTimeUs, dataSpec)); out.add(new Segment(startTimeUs, dataSpec));
} }
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java
...@@ -201,8 +201,7 @@ public final class PsExtractorSeekTest { ...@@ -201,8 +201,7 @@ public final class PsExtractorSeekTest {
// Internal methods // Internal methods
private long readInputLength() throws IOException { private long readInputLength() throws IOException {
DataSpec dataSpec = DataSpec dataSpec = new DataSpec(Uri.parse("asset:///" + PS_FILE_PATH));
new DataSpec(Uri.parse("asset:///" + PS_FILE_PATH), 0, C.LENGTH_UNSET, null);
long totalInputLength = dataSource.open(dataSpec); long totalInputLength = dataSource.open(dataSpec);
Util.closeQuietly(dataSource); Util.closeQuietly(dataSource);
return totalInputLength; return totalInputLength;
...@@ -343,8 +342,7 @@ public final class PsExtractorSeekTest { ...@@ -343,8 +342,7 @@ public final class PsExtractorSeekTest {
private ExtractorInput getExtractorInputFromPosition(long position) throws IOException { private ExtractorInput getExtractorInputFromPosition(long position) throws IOException {
DataSpec dataSpec = DataSpec dataSpec =
new DataSpec( new DataSpec(Uri.parse("asset:///" + PS_FILE_PATH), position, C.LENGTH_UNSET);
Uri.parse("asset:///" + PS_FILE_PATH), position, C.LENGTH_UNSET, /* key= */ null);
dataSource.open(dataSpec); dataSource.open(dataSpec);
return new DefaultExtractorInput(dataSource, position, totalInputLength); return new DefaultExtractorInput(dataSource, position, totalInputLength);
} }
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
...@@ -512,7 +512,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -512,7 +512,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
return null; return null;
} }
byte[] encryptionKey = keyCache.remove(keyUri); @Nullable byte[] encryptionKey = keyCache.remove(keyUri);
if (encryptionKey != null) { if (encryptionKey != null) {
// The key was present in the key cache. We re-insert it to prevent it from being evicted by // The key was present in the key cache. We re-insert it to prevent it from being evicted by
// the following key addition. Note that removal of the key is necessary to affect the // the following key addition. Note that removal of the key is necessary to affect the
...@@ -520,7 +520,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -520,7 +520,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
keyCache.put(keyUri, encryptionKey); keyCache.put(keyUri, encryptionKey);
return null; return null;
} }
DataSpec dataSpec = new DataSpec(keyUri, 0, C.LENGTH_UNSET, null, DataSpec.FLAG_ALLOW_GZIP); DataSpec dataSpec =
new DataSpec.Builder().setUri(keyUri).setFlags(DataSpec.FLAG_ALLOW_GZIP).build();
return new EncryptionKeyChunk( return new EncryptionKeyChunk(
encryptionDataSource, encryptionDataSource,
dataSpec, dataSpec,
...@@ -646,8 +647,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -646,8 +647,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
checkInBounds(); checkInBounds();
Segment segment = playlist.segments.get((int) getCurrentIndex()); Segment segment = playlist.segments.get((int) getCurrentIndex());
Uri chunkUri = UriUtil.resolveToUri(playlist.baseUri, segment.url); Uri chunkUri = UriUtil.resolveToUri(playlist.baseUri, segment.url);
return new DataSpec( return new DataSpec(chunkUri, segment.byterangeOffset, segment.byterangeLength);
chunkUri, segment.byterangeOffset, segment.byterangeLength, /* key= */ null);
} }
@Override @Override
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
...@@ -94,9 +94,9 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -94,9 +94,9 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
new DataSpec( new DataSpec(
UriUtil.resolveToUri(mediaPlaylist.baseUri, mediaSegment.url), UriUtil.resolveToUri(mediaPlaylist.baseUri, mediaSegment.url),
mediaSegment.byterangeOffset, mediaSegment.byterangeOffset,
mediaSegment.byterangeLength, mediaSegment.byterangeLength);
/* key= */ null);
boolean mediaSegmentEncrypted = mediaSegmentKey != null; boolean mediaSegmentEncrypted = mediaSegmentKey != null;
@Nullable
byte[] mediaSegmentIv = byte[] mediaSegmentIv =
mediaSegmentEncrypted mediaSegmentEncrypted
? getEncryptionIvArray(Assertions.checkNotNull(mediaSegment.encryptionIV)) ? getEncryptionIvArray(Assertions.checkNotNull(mediaSegment.encryptionIV))
...@@ -107,20 +107,17 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -107,20 +107,17 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
HlsMediaPlaylist.Segment initSegment = mediaSegment.initializationSegment; HlsMediaPlaylist.Segment initSegment = mediaSegment.initializationSegment;
DataSpec initDataSpec = null; DataSpec initDataSpec = null;
boolean initSegmentEncrypted = false; boolean initSegmentEncrypted = false;
DataSource initDataSource = null; @Nullable DataSource initDataSource = null;
if (initSegment != null) { if (initSegment != null) {
initSegmentEncrypted = initSegmentKey != null; initSegmentEncrypted = initSegmentKey != null;
@Nullable
byte[] initSegmentIv = byte[] initSegmentIv =
initSegmentEncrypted initSegmentEncrypted
? getEncryptionIvArray(Assertions.checkNotNull(initSegment.encryptionIV)) ? getEncryptionIvArray(Assertions.checkNotNull(initSegment.encryptionIV))
: null; : null;
Uri initSegmentUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, initSegment.url); Uri initSegmentUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, initSegment.url);
initDataSpec = initDataSpec =
new DataSpec( new DataSpec(initSegmentUri, initSegment.byterangeOffset, initSegment.byterangeLength);
initSegmentUri,
initSegment.byterangeOffset,
initSegment.byterangeLength,
/* key= */ null);
initDataSource = buildDataSource(dataSource, initSegmentKey, initSegmentIv); initDataSource = buildDataSource(dataSource, initSegmentKey, initSegmentIv);
} }
...@@ -129,7 +126,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -129,7 +126,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
int discontinuitySequenceNumber = int discontinuitySequenceNumber =
mediaPlaylist.discontinuitySequence + mediaSegment.relativeDiscontinuitySequence; mediaPlaylist.discontinuitySequence + mediaSegment.relativeDiscontinuitySequence;
Extractor previousExtractor = null; @Nullable Extractor previousExtractor = null;
Id3Decoder id3Decoder; Id3Decoder id3Decoder;
ParsableByteArray scratchId3Data; ParsableByteArray scratchId3Data;
boolean shouldSpliceIn; boolean shouldSpliceIn;
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
...@@ -141,8 +141,7 @@ public final class HlsDownloader extends SegmentDownloader<HlsPlaylist> { ...@@ -141,8 +141,7 @@ public final class HlsDownloader extends SegmentDownloader<HlsPlaylist> {
} }
} }
Uri segmentUri = UriUtil.resolveToUri(baseUri, segment.url); Uri segmentUri = UriUtil.resolveToUri(baseUri, segment.url);
DataSpec dataSpec = DataSpec dataSpec = new DataSpec(segmentUri, segment.byterangeOffset, segment.byterangeLength);
new DataSpec(segmentUri, segment.byterangeOffset, segment.byterangeLength, /* key= */ null);
out.add(new Segment(startTimeUs, dataSpec)); out.add(new Segment(startTimeUs, dataSpec));
} }
} }
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java
...@@ -241,7 +241,6 @@ public class DefaultSsChunkSource implements SsChunkSource { ...@@ -241,7 +241,6 @@ public class DefaultSsChunkSource implements SsChunkSource {
trackSelection.getSelectedFormat(), trackSelection.getSelectedFormat(),
dataSource, dataSource,
uri, uri,
null,
currentAbsoluteChunkIndex, currentAbsoluteChunkIndex,
chunkStartTimeUs, chunkStartTimeUs,
chunkEndTimeUs, chunkEndTimeUs,
...@@ -270,7 +269,6 @@ public class DefaultSsChunkSource implements SsChunkSource { ...@@ -270,7 +269,6 @@ public class DefaultSsChunkSource implements SsChunkSource {
Format format, Format format,
DataSource dataSource, DataSource dataSource,
Uri uri, Uri uri,
String cacheKey,
int chunkIndex, int chunkIndex,
long chunkStartTimeUs, long chunkStartTimeUs,
long chunkEndTimeUs, long chunkEndTimeUs,
...@@ -278,7 +276,7 @@ public class DefaultSsChunkSource implements SsChunkSource { ...@@ -278,7 +276,7 @@ public class DefaultSsChunkSource implements SsChunkSource {
int trackSelectionReason, int trackSelectionReason,
Object trackSelectionData, Object trackSelectionData,
ChunkExtractorWrapper extractorWrapper) { ChunkExtractorWrapper extractorWrapper) {
DataSpec dataSpec = new DataSpec(uri, 0, C.LENGTH_UNSET, cacheKey); DataSpec dataSpec = new DataSpec(uri);
// In SmoothStreaming each chunk contains sample timestamps relative to the start of the chunk. // In SmoothStreaming each chunk contains sample timestamps relative to the start of the chunk.
// To convert them the absolute timestamps, we need to set sampleOffsetUs to chunkStartTimeUs. // To convert them the absolute timestamps, we need to set sampleOffsetUs to chunkStartTimeUs.
long sampleOffsetUs = chunkStartTimeUs; long sampleOffsetUs = chunkStartTimeUs;
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java
...@@ -94,8 +94,7 @@ public final class FakeAdaptiveDataSet extends FakeDataSet { ...@@ -94,8 +94,7 @@ public final class FakeAdaptiveDataSet extends FakeDataSet {
String uri = dataSet.getUri(trackGroupIndex); String uri = dataSet.getUri(trackGroupIndex);
int chunkIndex = (int) getCurrentIndex(); int chunkIndex = (int) getCurrentIndex();
Segment fakeDataChunk = Util.castNonNull(dataSet.getData(uri)).getSegments().get(chunkIndex); Segment fakeDataChunk = Util.castNonNull(dataSet.getData(uri)).getSegments().get(chunkIndex);
return new DataSpec( return new DataSpec(Uri.parse(uri), fakeDataChunk.byteOffset, fakeDataChunk.length);
Uri.parse(uri), fakeDataChunk.byteOffset, fakeDataChunk.length, /* key= */ null);
} }
@Override @Override
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeChunkSource.java
...@@ -130,8 +130,8 @@ public final class FakeChunkSource implements ChunkSource { ...@@ -130,8 +130,8 @@ public final class FakeChunkSource implements ChunkSource {
String uri = dataSet.getUri(trackGroupIndex); String uri = dataSet.getUri(trackGroupIndex);
Segment fakeDataChunk = Segment fakeDataChunk =
Assertions.checkStateNotNull(dataSet.getData(uri)).getSegments().get(chunkIndex); Assertions.checkStateNotNull(dataSet.getData(uri)).getSegments().get(chunkIndex);
DataSpec dataSpec = new DataSpec(Uri.parse(uri), fakeDataChunk.byteOffset, DataSpec dataSpec =
fakeDataChunk.length, null); new DataSpec(Uri.parse(uri), fakeDataChunk.byteOffset, fakeDataChunk.length);
int trackType = MimeTypes.getTrackType(selectedFormat.sampleMimeType); int trackType = MimeTypes.getTrackType(selectedFormat.sampleMimeType);
out.chunk = new SingleSampleMediaChunk(dataSource, dataSpec, selectedFormat, out.chunk = new SingleSampleMediaChunk(dataSource, dataSpec, selectedFormat,
trackSelection.getSelectionReason(), trackSelection.getSelectionData(), startTimeUs, trackSelection.getSelectionReason(), trackSelection.getSelectionData(), startTimeUs,
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunkIterator.java
...@@ -45,11 +45,7 @@ public final class FakeMediaChunkIterator extends BaseMediaChunkIterator { ...@@ -45,11 +45,7 @@ public final class FakeMediaChunkIterator extends BaseMediaChunkIterator {
@Override @Override
public DataSpec getDataSpec() { public DataSpec getDataSpec() {
checkInBounds(); checkInBounds();
return new DataSpec( return new DataSpec(Uri.EMPTY, /* position= */ 0, chunkLengths[(int) getCurrentIndex()]);
Uri.EMPTY,
/* absoluteStreamPosition= */ 0,
chunkLengths[(int) getCurrentIndex()],
/* key= */ null);
} }
@Override @Override
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java
...@@ -466,7 +466,7 @@ public class TestUtil { ...@@ -466,7 +466,7 @@ public class TestUtil {
/** Returns an {@link ExtractorInput} to read from the given input at given position. */ /** Returns an {@link ExtractorInput} to read from the given input at given position. */
public static ExtractorInput getExtractorInputFromPosition( public static ExtractorInput getExtractorInputFromPosition(
DataSource dataSource, long position, Uri uri) throws IOException { DataSource dataSource, long position, Uri uri) throws IOException {
DataSpec dataSpec = new DataSpec(uri, position, C.LENGTH_UNSET, /* key= */ null); DataSpec dataSpec = new DataSpec(uri, position, C.LENGTH_UNSET);
long length = dataSource.open(dataSpec); long length = dataSource.open(dataSpec);
if (length != C.LENGTH_UNSET) { if (length != C.LENGTH_UNSET) {
length += position; length += position;
......
testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceTest.java
...@@ -69,7 +69,7 @@ public final class FakeDataSourceTest { ...@@ -69,7 +69,7 @@ public final class FakeDataSourceTest {
@Test @Test
public void testReadPartialOpenEnded() throws IOException { public void testReadPartialOpenEnded() throws IOException {
FakeDataSource dataSource = new FakeDataSource(fakeDataSet); FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
assertThat(dataSource.open(new DataSpec(uri, 7, C.LENGTH_UNSET, null))).isEqualTo(8); assertThat(dataSource.open(new DataSpec(uri, 7, C.LENGTH_UNSET))).isEqualTo(8);
assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(3); assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(3);
assertBuffer(TEST_DATA_PART_1, 7, 3); assertBuffer(TEST_DATA_PART_1, 7, 3);
assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(5); assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(5);
...@@ -81,7 +81,7 @@ public final class FakeDataSourceTest { ...@@ -81,7 +81,7 @@ public final class FakeDataSourceTest {
@Test @Test
public void testReadPartialBounded() throws IOException { public void testReadPartialBounded() throws IOException {
FakeDataSource dataSource = new FakeDataSource(fakeDataSet); FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
assertThat(dataSource.open(new DataSpec(uri, 9, 3, null))).isEqualTo(3); assertThat(dataSource.open(new DataSpec(uri, 9, 3))).isEqualTo(3);
assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(1); assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(1);
assertBuffer(TEST_DATA_PART_1, 9, 1); assertBuffer(TEST_DATA_PART_1, 9, 1);
assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(2); assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(2);
...@@ -89,7 +89,7 @@ public final class FakeDataSourceTest { ...@@ -89,7 +89,7 @@ public final class FakeDataSourceTest {
assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(C.RESULT_END_OF_INPUT); assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(C.RESULT_END_OF_INPUT);
dataSource.close(); dataSource.close();
assertThat(dataSource.open(new DataSpec(uri, 11, 4, null))).isEqualTo(4); assertThat(dataSource.open(new DataSpec(uri, 11, 4))).isEqualTo(4);
assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(4); assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(4);
assertBuffer(TEST_DATA_PART_2, 1, 4); assertBuffer(TEST_DATA_PART_2, 1, 4);
assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(C.RESULT_END_OF_INPUT); assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(C.RESULT_END_OF_INPUT);
...@@ -143,7 +143,7 @@ public final class FakeDataSourceTest { ...@@ -143,7 +143,7 @@ public final class FakeDataSourceTest {
assertThat(e).hasMessageThat().isEqualTo(errorMessage); assertThat(e).hasMessageThat().isEqualTo(errorMessage);
} }
dataSource.close(); dataSource.close();
assertThat(dataSource.open(new DataSpec(uri, 15, 15, null))).isEqualTo(15); assertThat(dataSource.open(new DataSpec(uri, 15, 15))).isEqualTo(15);
assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(15); assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(15);
assertBuffer(TEST_DATA); assertBuffer(TEST_DATA);
assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(C.RESULT_END_OF_INPUT); assertThat(dataSource.read(BUFFER, 0, BUFFER.length)).isEqualTo(C.RESULT_END_OF_INPUT);
...@@ -220,7 +220,7 @@ public final class FakeDataSourceTest { ...@@ -220,7 +220,7 @@ public final class FakeDataSourceTest {
.appendReadData(TestUtil.buildTestData(10)) .appendReadData(TestUtil.buildTestData(10))
.endData()); .endData());
try { try {
dataSource.open(new DataSpec(uri, 5, 10, null)); dataSource.open(new DataSpec(uri, 5, 10));
fail("IOException expected."); fail("IOException expected.");
} catch (IOException e) { } catch (IOException e) {
// Expected. // Expected.
......
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