Skip to content

SDK / exoplayer

Go to a project
Commit 74e2384f by tonihei Committed by Oliver Woodman
Options

Add response headers to LoadEventInfo. 

The response headers of the last load are available from the loading source
when creating media source events and can be easily forwarded.

Issue:#4361
Issue:#4615

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=209900693
parent 4bf5e499
Inline Side-by-side
Showing with 88 additions and 20 deletions
RELEASENOTES.md
...@@ -101,6 +101,10 @@ ...@@ -101,6 +101,10 @@
* Add uri field to `LoadEventInfo` in `MediaSourceEventListener` or * Add uri field to `LoadEventInfo` in `MediaSourceEventListener` or
`AnalyticsListener` callbacks. This uri is the redirected uri if redirection `AnalyticsListener` callbacks. This uri is the redirected uri if redirection
occurred ([#2054](https://github.com/google/ExoPlayer/issues/2054)). occurred ([#2054](https://github.com/google/ExoPlayer/issues/2054)).
* Add response headers field to `LoadEventInfo` in `MediaSourceEventListener` or
`AnalyticsListener` callbacks
([#4361](https://github.com/google/ExoPlayer/issues/4361) and
[#4615](https://github.com/google/ExoPlayer/issues/4615)).
* Allow `MediaCodecSelector`s to return multiple compatible decoders for * Allow `MediaCodecSelector`s to return multiple compatible decoders for
`MediaCodecRenderer`, and provide an (optional) `MediaCodecSelector` that `MediaCodecRenderer`, and provide an (optional) `MediaCodecSelector` that
falls back to less preferred decoders like `MediaCodec.createDecoderByType` falls back to less preferred decoders like `MediaCodec.createDecoderByType`
......
library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java
...@@ -503,6 +503,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -503,6 +503,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
eventDispatcher.loadCompleted( eventDispatcher.loadCompleted(
loadable.dataSpec, loadable.dataSpec,
loadable.dataSource.getLastOpenedUri(), loadable.dataSource.getLastOpenedUri(),
loadable.dataSource.getLastResponseHeaders(),
C.DATA_TYPE_MEDIA, C.DATA_TYPE_MEDIA,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
/* trackFormat= */ null, /* trackFormat= */ null,
...@@ -524,6 +525,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -524,6 +525,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
eventDispatcher.loadCanceled( eventDispatcher.loadCanceled(
loadable.dataSpec, loadable.dataSpec,
loadable.dataSource.getLastOpenedUri(), loadable.dataSource.getLastOpenedUri(),
loadable.dataSource.getLastResponseHeaders(),
C.DATA_TYPE_MEDIA, C.DATA_TYPE_MEDIA,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
/* trackFormat= */ null, /* trackFormat= */ null,
...@@ -570,6 +572,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -570,6 +572,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
eventDispatcher.loadError( eventDispatcher.loadError(
loadable.dataSpec, loadable.dataSpec,
loadable.dataSource.getLastOpenedUri(), loadable.dataSource.getLastOpenedUri(),
loadable.dataSource.getLastResponseHeaders(),
C.DATA_TYPE_MEDIA, C.DATA_TYPE_MEDIA,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
/* trackFormat= */ null, /* trackFormat= */ null,
...@@ -697,7 +700,6 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -697,7 +700,6 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
loadable, this, loadErrorHandlingPolicy.getMinimumLoadableRetryCount(dataType)); loadable, this, loadErrorHandlingPolicy.getMinimumLoadableRetryCount(dataType));
eventDispatcher.loadStarted( eventDispatcher.loadStarted(
loadable.dataSpec, loadable.dataSpec,
loadable.dataSpec.uri,
C.DATA_TYPE_MEDIA, C.DATA_TYPE_MEDIA,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
/* trackFormat= */ null, /* trackFormat= */ null,
......
library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceEventListener.java
...@@ -28,6 +28,9 @@ import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId; ...@@ -28,6 +28,9 @@ import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.DataSpec;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import java.io.IOException; import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
/** Interface for callbacks to be notified of {@link MediaSource} events. */ /** Interface for callbacks to be notified of {@link MediaSource} events. */
...@@ -44,6 +47,8 @@ public interface MediaSourceEventListener { ...@@ -44,6 +47,8 @@ public interface MediaSourceEventListener {
* after redirection. * after redirection.
*/ */
public final Uri uri; public final Uri uri;
/** The response headers associated with the load, or an empty map if unavailable. */
public final Map<String, List<String>> responseHeaders;
/** The value of {@link SystemClock#elapsedRealtime} at the time of the load event. */ /** The value of {@link SystemClock#elapsedRealtime} at the time of the load event. */
public final long elapsedRealtimeMs; public final long elapsedRealtimeMs;
/** The duration of the load up to the event time. */ /** The duration of the load up to the event time. */
...@@ -58,6 +63,8 @@ public interface MediaSourceEventListener { ...@@ -58,6 +63,8 @@ public interface MediaSourceEventListener {
* @param uri The {@link Uri} from which data is being read. The uri must be identical to the * @param uri The {@link Uri} from which data is being read. The uri must be identical to the
* one in {@code dataSpec.uri} unless redirection has occurred. If redirection has occurred, * one in {@code dataSpec.uri} unless redirection has occurred. If redirection has occurred,
* this is the uri after redirection. * this is the uri after redirection.
* @param responseHeaders The response headers associated with the load, or an empty map if
* unavailable.
* @param elapsedRealtimeMs The value of {@link SystemClock#elapsedRealtime} at the time of the * @param elapsedRealtimeMs The value of {@link SystemClock#elapsedRealtime} at the time of the
* load event. * load event.
* @param loadDurationMs The duration of the load up to the event time. * @param loadDurationMs The duration of the load up to the event time.
...@@ -65,9 +72,15 @@ public interface MediaSourceEventListener { ...@@ -65,9 +72,15 @@ public interface MediaSourceEventListener {
* network responses, this is the decompressed size. * network responses, this is the decompressed size.
*/ */
public LoadEventInfo( public LoadEventInfo(
DataSpec dataSpec, Uri uri, long elapsedRealtimeMs, long loadDurationMs, long bytesLoaded) { DataSpec dataSpec,
Uri uri,
Map<String, List<String>> responseHeaders,
long elapsedRealtimeMs,
long loadDurationMs,
long bytesLoaded) {
this.dataSpec = dataSpec; this.dataSpec = dataSpec;
this.uri = uri; this.uri = uri;
this.responseHeaders = responseHeaders;
this.elapsedRealtimeMs = elapsedRealtimeMs; this.elapsedRealtimeMs = elapsedRealtimeMs;
this.loadDurationMs = loadDurationMs; this.loadDurationMs = loadDurationMs;
this.bytesLoaded = bytesLoaded; this.bytesLoaded = bytesLoaded;
...@@ -168,7 +181,8 @@ public interface MediaSourceEventListener { ...@@ -168,7 +181,8 @@ public interface MediaSourceEventListener {
* @param mediaPeriodId The {@link MediaPeriodId} this load belongs to. Null if the load does not * @param mediaPeriodId The {@link MediaPeriodId} this load belongs to. Null if the load does not
* belong to a specific media period. * belong to a specific media period.
* @param loadEventInfo The {@link LoadEventInfo} corresponding to the event. The value of {@link * @param loadEventInfo The {@link LoadEventInfo} corresponding to the event. The value of {@link
* LoadEventInfo#uri} won't reflect potential redirection yet. * LoadEventInfo#uri} won't reflect potential redirection yet and {@link
* LoadEventInfo#responseHeaders} will be empty.
* @param mediaLoadData The {@link MediaLoadData} defining the data being loaded. * @param mediaLoadData The {@link MediaLoadData} defining the data being loaded.
*/ */
void onLoadStarted( void onLoadStarted(
...@@ -370,10 +384,9 @@ public interface MediaSourceEventListener { ...@@ -370,10 +384,9 @@ public interface MediaSourceEventListener {
} }
/** Dispatches {@link #onLoadStarted(int, MediaPeriodId, LoadEventInfo, MediaLoadData)}. */ /** Dispatches {@link #onLoadStarted(int, MediaPeriodId, LoadEventInfo, MediaLoadData)}. */
public void loadStarted(DataSpec dataSpec, Uri uri, int dataType, long elapsedRealtimeMs) { public void loadStarted(DataSpec dataSpec, int dataType, long elapsedRealtimeMs) {
loadStarted( loadStarted(
dataSpec, dataSpec,
uri,
dataType, dataType,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
null, null,
...@@ -387,7 +400,6 @@ public interface MediaSourceEventListener { ...@@ -387,7 +400,6 @@ public interface MediaSourceEventListener {
/** Dispatches {@link #onLoadStarted(int, MediaPeriodId, LoadEventInfo, MediaLoadData)}. */ /** Dispatches {@link #onLoadStarted(int, MediaPeriodId, LoadEventInfo, MediaLoadData)}. */
public void loadStarted( public void loadStarted(
DataSpec dataSpec, DataSpec dataSpec,
Uri uri,
int dataType, int dataType,
int trackType, int trackType,
@Nullable Format trackFormat, @Nullable Format trackFormat,
...@@ -398,7 +410,12 @@ public interface MediaSourceEventListener { ...@@ -398,7 +410,12 @@ public interface MediaSourceEventListener {
long elapsedRealtimeMs) { long elapsedRealtimeMs) {
loadStarted( loadStarted(
new LoadEventInfo( new LoadEventInfo(
dataSpec, uri, elapsedRealtimeMs, /* loadDurationMs= */ 0, /* bytesLoaded= */ 0), dataSpec,
dataSpec.uri,
/* responseHeaders= */ Collections.emptyMap(),
elapsedRealtimeMs,
/* loadDurationMs= */ 0,
/* bytesLoaded= */ 0),
new MediaLoadData( new MediaLoadData(
dataType, dataType,
trackType, trackType,
...@@ -423,6 +440,7 @@ public interface MediaSourceEventListener { ...@@ -423,6 +440,7 @@ public interface MediaSourceEventListener {
public void loadCompleted( public void loadCompleted(
DataSpec dataSpec, DataSpec dataSpec,
Uri uri, Uri uri,
Map<String, List<String>> responseHeaders,
int dataType, int dataType,
long elapsedRealtimeMs, long elapsedRealtimeMs,
long loadDurationMs, long loadDurationMs,
...@@ -430,6 +448,7 @@ public interface MediaSourceEventListener { ...@@ -430,6 +448,7 @@ public interface MediaSourceEventListener {
loadCompleted( loadCompleted(
dataSpec, dataSpec,
uri, uri,
responseHeaders,
dataType, dataType,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
null, null,
...@@ -446,6 +465,7 @@ public interface MediaSourceEventListener { ...@@ -446,6 +465,7 @@ public interface MediaSourceEventListener {
public void loadCompleted( public void loadCompleted(
DataSpec dataSpec, DataSpec dataSpec,
Uri uri, Uri uri,
Map<String, List<String>> responseHeaders,
int dataType, int dataType,
int trackType, int trackType,
@Nullable Format trackFormat, @Nullable Format trackFormat,
...@@ -457,7 +477,8 @@ public interface MediaSourceEventListener { ...@@ -457,7 +477,8 @@ public interface MediaSourceEventListener {
long loadDurationMs, long loadDurationMs,
long bytesLoaded) { long bytesLoaded) {
loadCompleted( loadCompleted(
new LoadEventInfo(dataSpec, uri, elapsedRealtimeMs, loadDurationMs, bytesLoaded), new LoadEventInfo(
dataSpec, uri, responseHeaders, elapsedRealtimeMs, loadDurationMs, bytesLoaded),
new MediaLoadData( new MediaLoadData(
dataType, dataType,
trackType, trackType,
...@@ -483,6 +504,7 @@ public interface MediaSourceEventListener { ...@@ -483,6 +504,7 @@ public interface MediaSourceEventListener {
public void loadCanceled( public void loadCanceled(
DataSpec dataSpec, DataSpec dataSpec,
Uri uri, Uri uri,
Map<String, List<String>> responseHeaders,
int dataType, int dataType,
long elapsedRealtimeMs, long elapsedRealtimeMs,
long loadDurationMs, long loadDurationMs,
...@@ -490,6 +512,7 @@ public interface MediaSourceEventListener { ...@@ -490,6 +512,7 @@ public interface MediaSourceEventListener {
loadCanceled( loadCanceled(
dataSpec, dataSpec,
uri, uri,
responseHeaders,
dataType, dataType,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
null, null,
...@@ -506,6 +529,7 @@ public interface MediaSourceEventListener { ...@@ -506,6 +529,7 @@ public interface MediaSourceEventListener {
public void loadCanceled( public void loadCanceled(
DataSpec dataSpec, DataSpec dataSpec,
Uri uri, Uri uri,
Map<String, List<String>> responseHeaders,
int dataType, int dataType,
int trackType, int trackType,
@Nullable Format trackFormat, @Nullable Format trackFormat,
...@@ -517,7 +541,8 @@ public interface MediaSourceEventListener { ...@@ -517,7 +541,8 @@ public interface MediaSourceEventListener {
long loadDurationMs, long loadDurationMs,
long bytesLoaded) { long bytesLoaded) {
loadCanceled( loadCanceled(
new LoadEventInfo(dataSpec, uri, elapsedRealtimeMs, loadDurationMs, bytesLoaded), new LoadEventInfo(
dataSpec, uri, responseHeaders, elapsedRealtimeMs, loadDurationMs, bytesLoaded),
new MediaLoadData( new MediaLoadData(
dataType, dataType,
trackType, trackType,
...@@ -546,6 +571,7 @@ public interface MediaSourceEventListener { ...@@ -546,6 +571,7 @@ public interface MediaSourceEventListener {
public void loadError( public void loadError(
DataSpec dataSpec, DataSpec dataSpec,
Uri uri, Uri uri,
Map<String, List<String>> responseHeaders,
int dataType, int dataType,
long elapsedRealtimeMs, long elapsedRealtimeMs,
long loadDurationMs, long loadDurationMs,
...@@ -555,6 +581,7 @@ public interface MediaSourceEventListener { ...@@ -555,6 +581,7 @@ public interface MediaSourceEventListener {
loadError( loadError(
dataSpec, dataSpec,
uri, uri,
responseHeaders,
dataType, dataType,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
null, null,
...@@ -576,6 +603,7 @@ public interface MediaSourceEventListener { ...@@ -576,6 +603,7 @@ public interface MediaSourceEventListener {
public void loadError( public void loadError(
DataSpec dataSpec, DataSpec dataSpec,
Uri uri, Uri uri,
Map<String, List<String>> responseHeaders,
int dataType, int dataType,
int trackType, int trackType,
@Nullable Format trackFormat, @Nullable Format trackFormat,
...@@ -589,7 +617,8 @@ public interface MediaSourceEventListener { ...@@ -589,7 +617,8 @@ public interface MediaSourceEventListener {
IOException error, IOException error,
boolean wasCanceled) { boolean wasCanceled) {
loadError( loadError(
new LoadEventInfo(dataSpec, uri, elapsedRealtimeMs, loadDurationMs, bytesLoaded), new LoadEventInfo(
dataSpec, uri, responseHeaders, elapsedRealtimeMs, loadDurationMs, bytesLoaded),
new MediaLoadData( new MediaLoadData(
dataType, dataType,
trackType, trackType,
......
library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java
...@@ -155,7 +155,6 @@ import java.util.Arrays; ...@@ -155,7 +155,6 @@ import java.util.Arrays;
loadErrorHandlingPolicy.getMinimumLoadableRetryCount(C.DATA_TYPE_MEDIA)); loadErrorHandlingPolicy.getMinimumLoadableRetryCount(C.DATA_TYPE_MEDIA));
eventDispatcher.loadStarted( eventDispatcher.loadStarted(
dataSpec, dataSpec,
dataSpec.uri,
C.DATA_TYPE_MEDIA, C.DATA_TYPE_MEDIA,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
format, format,
...@@ -211,6 +210,7 @@ import java.util.Arrays; ...@@ -211,6 +210,7 @@ import java.util.Arrays;
eventDispatcher.loadCompleted( eventDispatcher.loadCompleted(
loadable.dataSpec, loadable.dataSpec,
loadable.dataSource.getLastOpenedUri(), loadable.dataSource.getLastOpenedUri(),
loadable.dataSource.getLastResponseHeaders(),
C.DATA_TYPE_MEDIA, C.DATA_TYPE_MEDIA,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
format, format,
...@@ -229,6 +229,7 @@ import java.util.Arrays; ...@@ -229,6 +229,7 @@ import java.util.Arrays;
eventDispatcher.loadCanceled( eventDispatcher.loadCanceled(
loadable.dataSpec, loadable.dataSpec,
loadable.dataSource.getLastOpenedUri(), loadable.dataSource.getLastOpenedUri(),
loadable.dataSource.getLastResponseHeaders(),
C.DATA_TYPE_MEDIA, C.DATA_TYPE_MEDIA,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
/* trackFormat= */ null, /* trackFormat= */ null,
...@@ -269,6 +270,7 @@ import java.util.Arrays; ...@@ -269,6 +270,7 @@ import java.util.Arrays;
eventDispatcher.loadError( eventDispatcher.loadError(
loadable.dataSpec, loadable.dataSpec,
loadable.dataSource.getLastOpenedUri(), loadable.dataSource.getLastOpenedUri(),
loadable.dataSource.getLastResponseHeaders(),
C.DATA_TYPE_MEDIA, C.DATA_TYPE_MEDIA,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
format, format,
......
library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
...@@ -43,6 +43,7 @@ import java.lang.annotation.Retention; ...@@ -43,6 +43,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -556,6 +557,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> { ...@@ -556,6 +557,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
.loadError( .loadError(
dataSpec, dataSpec,
dataSpec.uri, dataSpec.uri,
/* responseHeaders= */ Collections.emptyMap(),
C.DATA_TYPE_AD, C.DATA_TYPE_AD,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
/* loadDurationMs= */ 0, /* loadDurationMs= */ 0,
...@@ -595,6 +597,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> { ...@@ -595,6 +597,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
.loadError( .loadError(
new DataSpec(adUri), new DataSpec(adUri),
adUri, adUri,
/* responseHeaders= */ Collections.emptyMap(),
C.DATA_TYPE_AD, C.DATA_TYPE_AD,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
/* loadDurationMs= */ 0, /* loadDurationMs= */ 0,
......
library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
...@@ -432,6 +432,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S ...@@ -432,6 +432,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
eventDispatcher.loadCompleted( eventDispatcher.loadCompleted(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
loadable.type, loadable.type,
primaryTrackType, primaryTrackType,
loadable.trackFormat, loadable.trackFormat,
...@@ -451,6 +452,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S ...@@ -451,6 +452,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
eventDispatcher.loadCanceled( eventDispatcher.loadCanceled(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
loadable.type, loadable.type,
primaryTrackType, primaryTrackType,
loadable.trackFormat, loadable.trackFormat,
...@@ -518,6 +520,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S ...@@ -518,6 +520,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
eventDispatcher.loadError( eventDispatcher.loadError(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
loadable.type, loadable.type,
primaryTrackType, primaryTrackType,
loadable.trackFormat, loadable.trackFormat,
...@@ -585,7 +588,6 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S ...@@ -585,7 +588,6 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
loadable, this, loadErrorHandlingPolicy.getMinimumLoadableRetryCount(loadable.type)); loadable, this, loadErrorHandlingPolicy.getMinimumLoadableRetryCount(loadable.type));
eventDispatcher.loadStarted( eventDispatcher.loadStarted(
loadable.dataSpec, loadable.dataSpec,
loadable.dataSpec.uri,
loadable.type, loadable.type,
primaryTrackType, primaryTrackType,
loadable.trackFormat, loadable.trackFormat,
......
library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java
...@@ -24,6 +24,8 @@ import com.google.android.exoplayer2.util.Assertions; ...@@ -24,6 +24,8 @@ import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.List;
import java.util.Map;
/** /**
* A {@link Loadable} for objects that can be parsed from binary data using a {@link Parser}. * A {@link Loadable} for objects that can be parsed from binary data using a {@link Parser}.
...@@ -132,6 +134,14 @@ public final class ParsingLoadable<T> implements Loadable { ...@@ -132,6 +134,14 @@ public final class ParsingLoadable<T> implements Loadable {
return dataSource.getLastOpenedUri(); return dataSource.getLastOpenedUri();
} }
/**
* Returns the response headers associated with the load. Must only be called after the load
* completed, failed, or was canceled.
*/
public Map<String, List<String>> getResponseHeaders() {
return dataSource.getLastResponseHeaders();
}
@Override @Override
public final void cancelLoad() { public final void cancelLoad() {
// Do nothing. // Do nothing.
......
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
...@@ -709,6 +709,7 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -709,6 +709,7 @@ public final class DashMediaSource extends BaseMediaSource {
manifestEventDispatcher.loadCompleted( manifestEventDispatcher.loadCompleted(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
loadable.type, loadable.type,
elapsedRealtimeMs, elapsedRealtimeMs,
loadDurationMs, loadDurationMs,
...@@ -800,6 +801,7 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -800,6 +801,7 @@ public final class DashMediaSource extends BaseMediaSource {
manifestEventDispatcher.loadError( manifestEventDispatcher.loadError(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
loadable.type, loadable.type,
elapsedRealtimeMs, elapsedRealtimeMs,
loadDurationMs, loadDurationMs,
...@@ -814,6 +816,7 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -814,6 +816,7 @@ public final class DashMediaSource extends BaseMediaSource {
manifestEventDispatcher.loadCompleted( manifestEventDispatcher.loadCompleted(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
loadable.type, loadable.type,
elapsedRealtimeMs, elapsedRealtimeMs,
loadDurationMs, loadDurationMs,
...@@ -829,6 +832,7 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -829,6 +832,7 @@ public final class DashMediaSource extends BaseMediaSource {
manifestEventDispatcher.loadError( manifestEventDispatcher.loadError(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
loadable.type, loadable.type,
elapsedRealtimeMs, elapsedRealtimeMs,
loadDurationMs, loadDurationMs,
...@@ -844,6 +848,7 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -844,6 +848,7 @@ public final class DashMediaSource extends BaseMediaSource {
manifestEventDispatcher.loadCanceled( manifestEventDispatcher.loadCanceled(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
loadable.type, loadable.type,
elapsedRealtimeMs, elapsedRealtimeMs,
loadDurationMs, loadDurationMs,
...@@ -1031,8 +1036,7 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -1031,8 +1036,7 @@ public final class DashMediaSource extends BaseMediaSource {
private <T> void startLoading(ParsingLoadable<T> loadable, private <T> void startLoading(ParsingLoadable<T> loadable,
Loader.Callback<ParsingLoadable<T>> callback, int minRetryCount) { Loader.Callback<ParsingLoadable<T>> callback, int minRetryCount) {
long elapsedRealtimeMs = loader.startLoading(loadable, callback, minRetryCount); long elapsedRealtimeMs = loader.startLoading(loadable, callback, minRetryCount);
manifestEventDispatcher.loadStarted( manifestEventDispatcher.loadStarted(loadable.dataSpec, loadable.type, elapsedRealtimeMs);
loadable.dataSpec, loadable.dataSpec.uri, loadable.type, elapsedRealtimeMs);
} }
private long getNowUnixTimeUs() { private long getNowUnixTimeUs() {
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
...@@ -571,7 +571,6 @@ import java.util.List; ...@@ -571,7 +571,6 @@ import java.util.List;
loadable, this, loadErrorHandlingPolicy.getMinimumLoadableRetryCount(loadable.type)); loadable, this, loadErrorHandlingPolicy.getMinimumLoadableRetryCount(loadable.type));
eventDispatcher.loadStarted( eventDispatcher.loadStarted(
loadable.dataSpec, loadable.dataSpec,
loadable.dataSpec.uri,
loadable.type, loadable.type,
trackType, trackType,
loadable.trackFormat, loadable.trackFormat,
...@@ -596,6 +595,7 @@ import java.util.List; ...@@ -596,6 +595,7 @@ import java.util.List;
eventDispatcher.loadCompleted( eventDispatcher.loadCompleted(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
loadable.type, loadable.type,
trackType, trackType,
loadable.trackFormat, loadable.trackFormat,
...@@ -619,6 +619,7 @@ import java.util.List; ...@@ -619,6 +619,7 @@ import java.util.List;
eventDispatcher.loadCanceled( eventDispatcher.loadCanceled(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
loadable.type, loadable.type,
trackType, trackType,
loadable.trackFormat, loadable.trackFormat,
...@@ -680,6 +681,7 @@ import java.util.List; ...@@ -680,6 +681,7 @@ import java.util.List;
eventDispatcher.loadError( eventDispatcher.loadError(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
loadable.type, loadable.type,
trackType, trackType,
loadable.trackFormat, loadable.trackFormat,
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
...@@ -123,7 +123,6 @@ public final class DefaultHlsPlaylistTracker ...@@ -123,7 +123,6 @@ public final class DefaultHlsPlaylistTracker
loadErrorHandlingPolicy.getMinimumLoadableRetryCount(masterPlaylistLoadable.type)); loadErrorHandlingPolicy.getMinimumLoadableRetryCount(masterPlaylistLoadable.type));
eventDispatcher.loadStarted( eventDispatcher.loadStarted(
masterPlaylistLoadable.dataSpec, masterPlaylistLoadable.dataSpec,
masterPlaylistLoadable.dataSpec.uri,
masterPlaylistLoadable.type, masterPlaylistLoadable.type,
elapsedRealtime); elapsedRealtime);
} }
...@@ -234,6 +233,7 @@ public final class DefaultHlsPlaylistTracker ...@@ -234,6 +233,7 @@ public final class DefaultHlsPlaylistTracker
eventDispatcher.loadCompleted( eventDispatcher.loadCompleted(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
C.DATA_TYPE_MANIFEST, C.DATA_TYPE_MANIFEST,
elapsedRealtimeMs, elapsedRealtimeMs,
loadDurationMs, loadDurationMs,
...@@ -249,6 +249,7 @@ public final class DefaultHlsPlaylistTracker ...@@ -249,6 +249,7 @@ public final class DefaultHlsPlaylistTracker
eventDispatcher.loadCanceled( eventDispatcher.loadCanceled(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
C.DATA_TYPE_MANIFEST, C.DATA_TYPE_MANIFEST,
elapsedRealtimeMs, elapsedRealtimeMs,
loadDurationMs, loadDurationMs,
...@@ -269,6 +270,7 @@ public final class DefaultHlsPlaylistTracker ...@@ -269,6 +270,7 @@ public final class DefaultHlsPlaylistTracker
eventDispatcher.loadError( eventDispatcher.loadError(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
C.DATA_TYPE_MANIFEST, C.DATA_TYPE_MANIFEST,
elapsedRealtimeMs, elapsedRealtimeMs,
loadDurationMs, loadDurationMs,
...@@ -496,6 +498,7 @@ public final class DefaultHlsPlaylistTracker ...@@ -496,6 +498,7 @@ public final class DefaultHlsPlaylistTracker
eventDispatcher.loadCompleted( eventDispatcher.loadCompleted(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
C.DATA_TYPE_MANIFEST, C.DATA_TYPE_MANIFEST,
elapsedRealtimeMs, elapsedRealtimeMs,
loadDurationMs, loadDurationMs,
...@@ -514,6 +517,7 @@ public final class DefaultHlsPlaylistTracker ...@@ -514,6 +517,7 @@ public final class DefaultHlsPlaylistTracker
eventDispatcher.loadCanceled( eventDispatcher.loadCanceled(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
C.DATA_TYPE_MANIFEST, C.DATA_TYPE_MANIFEST,
elapsedRealtimeMs, elapsedRealtimeMs,
loadDurationMs, loadDurationMs,
...@@ -555,6 +559,7 @@ public final class DefaultHlsPlaylistTracker ...@@ -555,6 +559,7 @@ public final class DefaultHlsPlaylistTracker
eventDispatcher.loadError( eventDispatcher.loadError(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
C.DATA_TYPE_MANIFEST, C.DATA_TYPE_MANIFEST,
elapsedRealtimeMs, elapsedRealtimeMs,
loadDurationMs, loadDurationMs,
...@@ -583,7 +588,6 @@ public final class DefaultHlsPlaylistTracker ...@@ -583,7 +588,6 @@ public final class DefaultHlsPlaylistTracker
loadErrorHandlingPolicy.getMinimumLoadableRetryCount(mediaPlaylistLoadable.type)); loadErrorHandlingPolicy.getMinimumLoadableRetryCount(mediaPlaylistLoadable.type));
eventDispatcher.loadStarted( eventDispatcher.loadStarted(
mediaPlaylistLoadable.dataSpec, mediaPlaylistLoadable.dataSpec,
mediaPlaylistLoadable.dataSpec.uri,
mediaPlaylistLoadable.type, mediaPlaylistLoadable.type,
elapsedRealtime); elapsedRealtime);
} }
......
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
...@@ -569,6 +569,7 @@ public final class SsMediaSource extends BaseMediaSource ...@@ -569,6 +569,7 @@ public final class SsMediaSource extends BaseMediaSource
manifestEventDispatcher.loadCompleted( manifestEventDispatcher.loadCompleted(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
loadable.type, loadable.type,
elapsedRealtimeMs, elapsedRealtimeMs,
loadDurationMs, loadDurationMs,
...@@ -585,6 +586,7 @@ public final class SsMediaSource extends BaseMediaSource ...@@ -585,6 +586,7 @@ public final class SsMediaSource extends BaseMediaSource
manifestEventDispatcher.loadCanceled( manifestEventDispatcher.loadCanceled(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
loadable.type, loadable.type,
elapsedRealtimeMs, elapsedRealtimeMs,
loadDurationMs, loadDurationMs,
...@@ -602,6 +604,7 @@ public final class SsMediaSource extends BaseMediaSource ...@@ -602,6 +604,7 @@ public final class SsMediaSource extends BaseMediaSource
manifestEventDispatcher.loadError( manifestEventDispatcher.loadError(
loadable.dataSpec, loadable.dataSpec,
loadable.getUri(), loadable.getUri(),
loadable.getResponseHeaders(),
loadable.type, loadable.type,
elapsedRealtimeMs, elapsedRealtimeMs,
loadDurationMs, loadDurationMs,
...@@ -692,8 +695,7 @@ public final class SsMediaSource extends BaseMediaSource ...@@ -692,8 +695,7 @@ public final class SsMediaSource extends BaseMediaSource
long elapsedRealtimeMs = long elapsedRealtimeMs =
manifestLoader.startLoading( manifestLoader.startLoading(
loadable, this, loadErrorHandlingPolicy.getMinimumLoadableRetryCount(loadable.type)); loadable, this, loadErrorHandlingPolicy.getMinimumLoadableRetryCount(loadable.type));
manifestEventDispatcher.loadStarted( manifestEventDispatcher.loadStarted(loadable.dataSpec, loadable.type, elapsedRealtimeMs);
loadable.dataSpec, loadable.dataSpec.uri, loadable.type, elapsedRealtimeMs);
} }
} }
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java
...@@ -31,6 +31,7 @@ import com.google.android.exoplayer2.source.TrackGroupArray; ...@@ -31,6 +31,7 @@ import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.trackselection.TrackSelection; import com.google.android.exoplayer2.trackselection.TrackSelection;
import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.DataSpec;
import java.io.IOException; import java.io.IOException;
import java.util.Collections;
/** /**
* Fake {@link MediaPeriod} that provides tracks from the given {@link TrackGroupArray}. Selecting * Fake {@link MediaPeriod} that provides tracks from the given {@link TrackGroupArray}. Selecting
...@@ -115,7 +116,6 @@ public class FakeMediaPeriod implements MediaPeriod { ...@@ -115,7 +116,6 @@ public class FakeMediaPeriod implements MediaPeriod {
public synchronized void prepare(Callback callback, long positionUs) { public synchronized void prepare(Callback callback, long positionUs) {
eventDispatcher.loadStarted( eventDispatcher.loadStarted(
FAKE_DATA_SPEC, FAKE_DATA_SPEC,
FAKE_DATA_SPEC.uri,
C.DATA_TYPE_MEDIA, C.DATA_TYPE_MEDIA,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
/* trackFormat= */ null, /* trackFormat= */ null,
...@@ -228,6 +228,7 @@ public class FakeMediaPeriod implements MediaPeriod { ...@@ -228,6 +228,7 @@ public class FakeMediaPeriod implements MediaPeriod {
eventDispatcher.loadCompleted( eventDispatcher.loadCompleted(
FAKE_DATA_SPEC, FAKE_DATA_SPEC,
FAKE_DATA_SPEC.uri, FAKE_DATA_SPEC.uri,
/* responseHeaders= */ Collections.emptyMap(),
C.DATA_TYPE_MEDIA, C.DATA_TYPE_MEDIA,
C.TRACK_TYPE_UNKNOWN, C.TRACK_TYPE_UNKNOWN,
/* trackFormat= */ null, /* trackFormat= */ null,
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
...@@ -40,6 +40,7 @@ import com.google.android.exoplayer2.upstream.TransferListener; ...@@ -40,6 +40,7 @@ import com.google.android.exoplayer2.upstream.TransferListener;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
/** /**
...@@ -225,6 +226,7 @@ public class FakeMediaSource extends BaseMediaSource { ...@@ -225,6 +226,7 @@ public class FakeMediaSource extends BaseMediaSource {
new LoadEventInfo( new LoadEventInfo(
FAKE_DATA_SPEC, FAKE_DATA_SPEC,
FAKE_DATA_SPEC.uri, FAKE_DATA_SPEC.uri,
/* responseHeaders= */ Collections.emptyMap(),
elapsedRealTimeMs, elapsedRealTimeMs,
/* loadDurationMs= */ 0, /* loadDurationMs= */ 0,
/* bytesLoaded= */ 0), /* bytesLoaded= */ 0),
...@@ -233,6 +235,7 @@ public class FakeMediaSource extends BaseMediaSource { ...@@ -233,6 +235,7 @@ public class FakeMediaSource extends BaseMediaSource {
new LoadEventInfo( new LoadEventInfo(
FAKE_DATA_SPEC, FAKE_DATA_SPEC,
FAKE_DATA_SPEC.uri, FAKE_DATA_SPEC.uri,
/* responseHeaders= */ Collections.emptyMap(),
elapsedRealTimeMs, elapsedRealTimeMs,
/* loadDurationMs= */ 0, /* loadDurationMs= */ 0,
/* bytesLoaded= */ MANIFEST_LOAD_BYTES), /* bytesLoaded= */ MANIFEST_LOAD_BYTES),
......
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