loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reformat with google-java-format

Browse Source
This commit is contained in:
Ian Baker 2024-10-23 14:11:13 +01:00
parent e7f5d4d441
commit b565f47d18
10 changed files with 67 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/MediaSourceList.java
View File

@ -573,8 +573,11 @@ import java.util.Set;
eventHandler.post( eventHandler.post(
() -> () ->
eventListener.onLoadStarted( eventListener.onLoadStarted(
eventParameters.first, eventParameters.second, eventParameters.first,
loadEventData, mediaLoadData, retryCount)); eventParameters.second,
loadEventData,
mediaLoadData,
retryCount));
} }
} }

17
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/MediaSourceEventListener.java
View File

@ -46,8 +46,8 @@ public interface MediaSourceEventListener {
* LoadEventInfo#uri} won't reflect potential redirection yet and {@link * LoadEventInfo#uri} won't reflect potential redirection yet and {@link
* LoadEventInfo#responseHeaders} will be empty. * 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.
* @param retryCount The number of failed attempts since this method was first called (this * @param retryCount The number of failed attempts since this method was first called (this is
* is zero for the first load attempt). * zero for the first load attempt).
*/ */
default void onLoadStarted( default void onLoadStarted(
int windowIndex, int windowIndex,
@ -64,8 +64,7 @@ public interface MediaSourceEventListener {
* belong to a specific media period. * belong to a specific media period.
* @param loadEventInfo The {@link LoadEventInfo} corresponding to the event. The values of {@link * @param loadEventInfo The {@link LoadEventInfo} corresponding to the event. The values of {@link
* LoadEventInfo#elapsedRealtimeMs} and {@link LoadEventInfo#bytesLoaded} are relative to the * LoadEventInfo#elapsedRealtimeMs} and {@link LoadEventInfo#bytesLoaded} are relative to the
* corresponding {@link #onLoadStarted} * corresponding {@link #onLoadStarted} event.
* event.
* @param mediaLoadData The {@link MediaLoadData} defining the data being loaded. * @param mediaLoadData The {@link MediaLoadData} defining the data being loaded.
*/ */
default void onLoadCompleted( default void onLoadCompleted(
@ -82,8 +81,7 @@ public interface MediaSourceEventListener {
* belong to a specific media period. * belong to a specific media period.
* @param loadEventInfo The {@link LoadEventInfo} corresponding to the event. The values of {@link * @param loadEventInfo The {@link LoadEventInfo} corresponding to the event. The values of {@link
* LoadEventInfo#elapsedRealtimeMs} and {@link LoadEventInfo#bytesLoaded} are relative to the * LoadEventInfo#elapsedRealtimeMs} and {@link LoadEventInfo#bytesLoaded} are relative to the
* corresponding {@link #onLoadStarted} * corresponding {@link #onLoadStarted} event.
* event.
* @param mediaLoadData The {@link MediaLoadData} defining the data being loaded. * @param mediaLoadData The {@link MediaLoadData} defining the data being loaded.
*/ */
default void onLoadCanceled( default void onLoadCanceled(
@ -111,8 +109,7 @@ public interface MediaSourceEventListener {
* belong to a specific media period. * belong to a specific media period.
* @param loadEventInfo The {@link LoadEventInfo} corresponding to the event. The values of {@link * @param loadEventInfo The {@link LoadEventInfo} corresponding to the event. The values of {@link
* LoadEventInfo#elapsedRealtimeMs} and {@link LoadEventInfo#bytesLoaded} are relative to the * LoadEventInfo#elapsedRealtimeMs} and {@link LoadEventInfo#bytesLoaded} are relative to the
* corresponding {@link #onLoadStarted} * corresponding {@link #onLoadStarted} event.
* event.
* @param mediaLoadData The {@link MediaLoadData} defining the data being loaded. * @param mediaLoadData The {@link MediaLoadData} defining the data being loaded.
* @param error The load error. * @param error The load error.
* @param wasCanceled Whether the load was canceled as a result of the error. * @param wasCanceled Whether the load was canceled as a result of the error.
@ -266,9 +263,7 @@ public interface MediaSourceEventListener {
/** Dispatches {@link #onLoadStarted(int, MediaPeriodId, LoadEventInfo, MediaLoadData, int)}. */ /** Dispatches {@link #onLoadStarted(int, MediaPeriodId, LoadEventInfo, MediaLoadData, int)}. */
public void loadStarted( public void loadStarted(
LoadEventInfo loadEventInfo, LoadEventInfo loadEventInfo, MediaLoadData mediaLoadData, int retryCount) {
MediaLoadData mediaLoadData,
int retryCount) {
dispatchEvent( dispatchEvent(
(listener) -> (listener) ->
listener.onLoadStarted( listener.onLoadStarted(

3
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaPeriod.java
View File

@ -920,7 +920,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
C.SELECTION_REASON_UNKNOWN, C.SELECTION_REASON_UNKNOWN,
/* trackSelectionData= */ null, /* trackSelectionData= */ null,
/* mediaStartTimeUs= */ loadable.seekTimeUs, /* mediaStartTimeUs= */ loadable.seekTimeUs,
durationUs, /* retryCount= */ 0); durationUs,
/* retryCount= */ 0);
} }
/** /**

7
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaPeriod.java
View File

@ -168,7 +168,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
C.SELECTION_REASON_UNKNOWN, C.SELECTION_REASON_UNKNOWN,
/* trackSelectionData= */ null, /* trackSelectionData= */ null,
/* mediaStartTimeUs= */ 0, /* mediaStartTimeUs= */ 0,
durationUs, /* retryCount= */ 0); durationUs,
/* retryCount= */ 0);
return true; return true;
} }
@ -208,8 +209,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
// Loader.Callback implementation. // Loader.Callback implementation.
@Override @Override
public void onLoadStarted(SourceLoadable loadable, long elapsedRealtimeMs, long loadDurationMs, public void onLoadStarted(
int retryCount) { SourceLoadable loadable, long elapsedRealtimeMs, long loadDurationMs, int retryCount) {
StatsDataSource dataSource = loadable.dataSource; StatsDataSource dataSource = loadable.dataSource;
LoadEventInfo loadEventInfo = LoadEventInfo loadEventInfo =
new LoadEventInfo( new LoadEventInfo(

26
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSource.java
View File

@ -427,24 +427,26 @@ public final class ServerSideAdInsertionMediaSource extends BaseMediaSource
int windowIndex, int windowIndex,
@Nullable MediaPeriodId mediaPeriodId, @Nullable MediaPeriodId mediaPeriodId,
LoadEventInfo loadEventInfo, LoadEventInfo loadEventInfo,
MediaLoadData mediaLoadData, int retryCount) { MediaLoadData mediaLoadData,
int retryCount) {
// TODO file a bug to track updating this. // TODO file a bug to track updating this.
if (retryCount == 0) { if (retryCount == 0) {
@Nullable @Nullable
MediaPeriodImpl mediaPeriod = MediaPeriodImpl mediaPeriod =
getMediaPeriodForEvent(mediaPeriodId, mediaLoadData, /* useLoadingPeriod= */ true); getMediaPeriodForEvent(mediaPeriodId, mediaLoadData, /* useLoadingPeriod= */ true);
if (mediaPeriod == null) { if (mediaPeriod == null) {
mediaSourceEventDispatcherWithoutId.loadStarted(loadEventInfo, mediaLoadData, /* retryCount= */ 0); mediaSourceEventDispatcherWithoutId.loadStarted(
loadEventInfo, mediaLoadData, /* retryCount= */ 0);
} else { } else {
mediaPeriod.sharedPeriod.onLoadStarted(loadEventInfo, mediaLoadData); mediaPeriod.sharedPeriod.onLoadStarted(loadEventInfo, mediaLoadData);
mediaPeriod.mediaSourceEventDispatcher.loadStarted( mediaPeriod.mediaSourceEventDispatcher.loadStarted(
loadEventInfo, loadEventInfo,
correctMediaLoadData( correctMediaLoadData(
mediaPeriod, mediaPeriod,
mediaLoadData, mediaLoadData,
checkNotNull(adPlaybackStates.get(mediaPeriod.mediaPeriodId.periodUid))), /* retryCount= */ 0); checkNotNull(adPlaybackStates.get(mediaPeriod.mediaPeriodId.periodUid))),
/* retryCount= */ 0);
} }
} }
} }
@ -754,7 +756,9 @@ public final class ServerSideAdInsertionMediaSource extends BaseMediaSource
loadData.first, loadData.first,
correctMediaLoadData(loadingPeriod, loadData.second, adPlaybackState)); correctMediaLoadData(loadingPeriod, loadData.second, adPlaybackState));
mediaPeriod.mediaSourceEventDispatcher.loadStarted( mediaPeriod.mediaSourceEventDispatcher.loadStarted(
loadData.first, correctMediaLoadData(mediaPeriod, loadData.second, adPlaybackState), /* retryCount= */ 0); loadData.first,
correctMediaLoadData(mediaPeriod, loadData.second, adPlaybackState),
/* retryCount= */ 0);
} }
} }
this.loadingPeriod = mediaPeriod; this.loadingPeriod = mediaPeriod;

8
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/chunk/ChunkSampleStream.java
View File

@ -429,10 +429,9 @@ public class ChunkSampleStream<T extends ChunkSource>
// Loader.Callback implementation. // Loader.Callback implementation.
@Override @Override
public void onLoadStarted(Chunk loadable, long elapsedRealtimeMs, long loadDurationMs, public void onLoadStarted(
int retryCount) { Chunk loadable, long elapsedRealtimeMs, long loadDurationMs, int retryCount) {
mediaSourceEventDispatcher.loadStarted( mediaSourceEventDispatcher.loadStarted(
new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs), new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs),
loadable.type, loadable.type,
@ -663,7 +662,8 @@ public class ChunkSampleStream<T extends ChunkSource>
loadable.trackSelectionReason, loadable.trackSelectionReason,
loadable.trackSelectionData, loadable.trackSelectionData,
loadable.startTimeUs, loadable.startTimeUs,
loadable.endTimeUs, /* retryCount= */ 0); loadable.endTimeUs,
/* retryCount= */ 0);
return true; return true;
} }

20
libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java
View File

@ -630,12 +630,14 @@ public final class DashMediaSource extends BaseMediaSource {
// Loadable callbacks. // Loadable callbacks.
/* package */ void onManifestLoadStarted( /* package */ void onManifestLoadStarted(
ParsingLoadable<DashManifest> loadable, long elapsedRealtimeMs, ParsingLoadable<DashManifest> loadable,
long loadDurationMs, int retryCount) { long elapsedRealtimeMs,
manifestEventDispatcher.loadStarted( long loadDurationMs,
int retryCount) {
manifestEventDispatcher.loadStarted(
new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs), new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs),
loadable.type, loadable.type,
retryCount); retryCount);
} }
/* package */ void onManifestLoadCompleted( /* package */ void onManifestLoadCompleted(
@ -1106,7 +1108,8 @@ public final class DashMediaSource extends BaseMediaSource {
long elapsedRealtimeMs = loader.startLoading(loadable, callback, minRetryCount); long elapsedRealtimeMs = loader.startLoading(loadable, callback, minRetryCount);
manifestEventDispatcher.loadStarted( manifestEventDispatcher.loadStarted(
new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs), new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs),
loadable.type, /* retryCount= */ 0); loadable.type,
/* retryCount= */ 0);
} }
private static long getIntervalUntilNextManifestRefreshMs( private static long getIntervalUntilNextManifestRefreshMs(
@ -1399,8 +1402,11 @@ public final class DashMediaSource extends BaseMediaSource {
private final class ManifestCallback implements Loader.Callback<ParsingLoadable<DashManifest>> { private final class ManifestCallback implements Loader.Callback<ParsingLoadable<DashManifest>> {
@Override @Override
public void onLoadStarted(ParsingLoadable<DashManifest> loadable, long elapsedRealtimeMs, public void onLoadStarted(
long loadDurationMs, int retryCount) { ParsingLoadable<DashManifest> loadable,
long elapsedRealtimeMs,
long loadDurationMs,
int retryCount) {
onManifestLoadStarted(loadable, elapsedRealtimeMs, loadDurationMs, retryCount); onManifestLoadStarted(loadable, elapsedRealtimeMs, loadDurationMs, retryCount);
} }

11
libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java
View File

@ -820,7 +820,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
loadable.trackSelectionReason, loadable.trackSelectionReason,
loadable.trackSelectionData, loadable.trackSelectionData,
loadable.startTimeUs, loadable.startTimeUs,
loadable.endTimeUs, /* retryCount= */ 0); loadable.endTimeUs,
/* retryCount= */ 0);
return true; return true;
} }
@ -861,10 +862,9 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
// Loader.Callback implementation. // Loader.Callback implementation.
@Override @Override
public void onLoadStarted(Chunk loadable, long elapsedRealtimeMs, long loadDurationMs, public void onLoadStarted(
int retryCount) { Chunk loadable, long elapsedRealtimeMs, long loadDurationMs, int retryCount) {
mediaSourceEventDispatcher.loadStarted( mediaSourceEventDispatcher.loadStarted(
new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs), new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs),
loadable.type, loadable.type,
@ -873,7 +873,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
loadable.trackSelectionReason, loadable.trackSelectionReason,
loadable.trackSelectionData, loadable.trackSelectionData,
loadable.startTimeUs, loadable.startTimeUs,
loadable.endTimeUs, retryCount); loadable.endTimeUs,
retryCount);
} }
@Override @Override

11
libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/DefaultHlsPlaylistTracker.java
View File

@ -152,7 +152,8 @@ public final class DefaultHlsPlaylistTracker
multivariantPlaylistLoadable.loadTaskId, multivariantPlaylistLoadable.loadTaskId,
multivariantPlaylistLoadable.dataSpec, multivariantPlaylistLoadable.dataSpec,
elapsedRealtime), elapsedRealtime),
multivariantPlaylistLoadable.type, /* retryCount= */ 0); multivariantPlaylistLoadable.type,
/* retryCount= */ 0);
} }
@Override @Override
@ -261,10 +262,7 @@ public final class DefaultHlsPlaylistTracker
long loadDurationMs, long loadDurationMs,
int retryCount) { int retryCount) {
eventDispatcher.loadStarted( eventDispatcher.loadStarted(
new LoadEventInfo( new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs),
loadable.loadTaskId,
loadable.dataSpec,
elapsedRealtimeMs),
loadable.type, loadable.type,
retryCount); retryCount);
} }
@ -759,7 +757,8 @@ public final class DefaultHlsPlaylistTracker
eventDispatcher.loadStarted( eventDispatcher.loadStarted(
new LoadEventInfo( new LoadEventInfo(
mediaPlaylistLoadable.loadTaskId, mediaPlaylistLoadable.dataSpec, elapsedRealtime), mediaPlaylistLoadable.loadTaskId, mediaPlaylistLoadable.dataSpec, elapsedRealtime),
mediaPlaylistLoadable.type, /* retryCount= */ 0); mediaPlaylistLoadable.type,
/* retryCount= */ 0);
} }
private void processLoadedPlaylist( private void processLoadedPlaylist(

10
libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java
View File

@ -498,8 +498,11 @@ public final class SsMediaSource extends BaseMediaSource
// Loader.Callback implementation // Loader.Callback implementation
@Override @Override
public void onLoadStarted(ParsingLoadable<SsManifest> loadable, long elapsedRealtimeMs, public void onLoadStarted(
long loadDurationMs, int retryCount) { ParsingLoadable<SsManifest> loadable,
long elapsedRealtimeMs,
long loadDurationMs,
int retryCount) {
manifestEventDispatcher.loadStarted( manifestEventDispatcher.loadStarted(
new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs), new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs),
loadable.type, loadable.type,
@ -673,6 +676,7 @@ public final class SsMediaSource extends BaseMediaSource
loadable, this, loadErrorHandlingPolicy.getMinimumLoadableRetryCount(loadable.type)); loadable, this, loadErrorHandlingPolicy.getMinimumLoadableRetryCount(loadable.type));
manifestEventDispatcher.loadStarted( manifestEventDispatcher.loadStarted(
new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs), new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs),
loadable.type, /* retryCount= */ 0); loadable.type,
/* retryCount= */ 0);
} }
} }