From b565f47d183ed52007fd88894a8da3d73cd7bdc2 Mon Sep 17 00:00:00 2001 From: Ian Baker Date: Wed, 23 Oct 2024 14:11:13 +0100 Subject: [PATCH] Reformat with google-java-format --- .../media3/exoplayer/MediaSourceList.java | 7 +++-- .../source/MediaSourceEventListener.java | 17 +++++------- .../source/ProgressiveMediaPeriod.java | 3 ++- .../source/SingleSampleMediaPeriod.java | 7 ++--- .../ads/ServerSideAdInsertionMediaSource.java | 26 +++++++++++-------- .../source/chunk/ChunkSampleStream.java | 8 +++--- .../exoplayer/dash/DashMediaSource.java | 20 +++++++++----- .../exoplayer/hls/HlsSampleStreamWrapper.java | 11 ++++---- .../playlist/DefaultHlsPlaylistTracker.java | 11 ++++---- .../smoothstreaming/SsMediaSource.java | 10 ++++--- 10 files changed, 67 insertions(+), 53 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/MediaSourceList.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/MediaSourceList.java index 87d11a580c..0d534b1fe7 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/MediaSourceList.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/MediaSourceList.java @@ -573,8 +573,11 @@ import java.util.Set; eventHandler.post( () -> eventListener.onLoadStarted( - eventParameters.first, eventParameters.second, - loadEventData, mediaLoadData, retryCount)); + eventParameters.first, + eventParameters.second, + loadEventData, + mediaLoadData, + retryCount)); } } diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/MediaSourceEventListener.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/MediaSourceEventListener.java index 1baa2a6432..3a427f98f8 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/MediaSourceEventListener.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/MediaSourceEventListener.java @@ -46,8 +46,8 @@ public interface MediaSourceEventListener { * 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 retryCount The number of failed attempts since this method was first called (this - * is zero for the first load attempt). + * @param retryCount The number of failed attempts since this method was first called (this is + * zero for the first load attempt). */ default void onLoadStarted( int windowIndex, @@ -64,8 +64,7 @@ public interface MediaSourceEventListener { * belong to a specific media period. * @param loadEventInfo The {@link LoadEventInfo} corresponding to the event. The values of {@link * LoadEventInfo#elapsedRealtimeMs} and {@link LoadEventInfo#bytesLoaded} are relative to the - * corresponding {@link #onLoadStarted} - * event. + * corresponding {@link #onLoadStarted} event. * @param mediaLoadData The {@link MediaLoadData} defining the data being loaded. */ default void onLoadCompleted( @@ -82,8 +81,7 @@ public interface MediaSourceEventListener { * belong to a specific media period. * @param loadEventInfo The {@link LoadEventInfo} corresponding to the event. The values of {@link * LoadEventInfo#elapsedRealtimeMs} and {@link LoadEventInfo#bytesLoaded} are relative to the - * corresponding {@link #onLoadStarted} - * event. + * corresponding {@link #onLoadStarted} event. * @param mediaLoadData The {@link MediaLoadData} defining the data being loaded. */ default void onLoadCanceled( @@ -111,8 +109,7 @@ public interface MediaSourceEventListener { * belong to a specific media period. * @param loadEventInfo The {@link LoadEventInfo} corresponding to the event. The values of {@link * LoadEventInfo#elapsedRealtimeMs} and {@link LoadEventInfo#bytesLoaded} are relative to the - * corresponding {@link #onLoadStarted} - * event. + * corresponding {@link #onLoadStarted} event. * @param mediaLoadData The {@link MediaLoadData} defining the data being loaded. * @param error The load 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)}. */ public void loadStarted( - LoadEventInfo loadEventInfo, - MediaLoadData mediaLoadData, - int retryCount) { + LoadEventInfo loadEventInfo, MediaLoadData mediaLoadData, int retryCount) { dispatchEvent( (listener) -> listener.onLoadStarted( diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaPeriod.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaPeriod.java index 4af2980841..b523d2f4f0 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaPeriod.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaPeriod.java @@ -920,7 +920,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; C.SELECTION_REASON_UNKNOWN, /* trackSelectionData= */ null, /* mediaStartTimeUs= */ loadable.seekTimeUs, - durationUs, /* retryCount= */ 0); + durationUs, + /* retryCount= */ 0); } /** diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaPeriod.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaPeriod.java index e24ad31bea..c7da1aadfd 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaPeriod.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaPeriod.java @@ -168,7 +168,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; C.SELECTION_REASON_UNKNOWN, /* trackSelectionData= */ null, /* mediaStartTimeUs= */ 0, - durationUs, /* retryCount= */ 0); + durationUs, + /* retryCount= */ 0); return true; } @@ -208,8 +209,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; // Loader.Callback implementation. @Override - public void onLoadStarted(SourceLoadable loadable, long elapsedRealtimeMs, long loadDurationMs, - int retryCount) { + public void onLoadStarted( + SourceLoadable loadable, long elapsedRealtimeMs, long loadDurationMs, int retryCount) { StatsDataSource dataSource = loadable.dataSource; LoadEventInfo loadEventInfo = new LoadEventInfo( diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSource.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSource.java index 3fa5f0da5b..2b1c569ec1 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSource.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSource.java @@ -427,24 +427,26 @@ public final class ServerSideAdInsertionMediaSource extends BaseMediaSource int windowIndex, @Nullable MediaPeriodId mediaPeriodId, LoadEventInfo loadEventInfo, - MediaLoadData mediaLoadData, int retryCount) { + MediaLoadData mediaLoadData, + int retryCount) { // TODO file a bug to track updating this. if (retryCount == 0) { @Nullable MediaPeriodImpl mediaPeriod = getMediaPeriodForEvent(mediaPeriodId, mediaLoadData, /* useLoadingPeriod= */ true); if (mediaPeriod == null) { - mediaSourceEventDispatcherWithoutId.loadStarted(loadEventInfo, mediaLoadData, /* retryCount= */ 0); + mediaSourceEventDispatcherWithoutId.loadStarted( + loadEventInfo, mediaLoadData, /* retryCount= */ 0); } else { mediaPeriod.sharedPeriod.onLoadStarted(loadEventInfo, mediaLoadData); - mediaPeriod.mediaSourceEventDispatcher.loadStarted( - loadEventInfo, - correctMediaLoadData( - mediaPeriod, - mediaLoadData, - checkNotNull(adPlaybackStates.get(mediaPeriod.mediaPeriodId.periodUid))), /* retryCount= */ 0); - - } + mediaPeriod.mediaSourceEventDispatcher.loadStarted( + loadEventInfo, + correctMediaLoadData( + mediaPeriod, + mediaLoadData, + checkNotNull(adPlaybackStates.get(mediaPeriod.mediaPeriodId.periodUid))), + /* retryCount= */ 0); + } } } @@ -754,7 +756,9 @@ public final class ServerSideAdInsertionMediaSource extends BaseMediaSource loadData.first, correctMediaLoadData(loadingPeriod, loadData.second, adPlaybackState)); mediaPeriod.mediaSourceEventDispatcher.loadStarted( - loadData.first, correctMediaLoadData(mediaPeriod, loadData.second, adPlaybackState), /* retryCount= */ 0); + loadData.first, + correctMediaLoadData(mediaPeriod, loadData.second, adPlaybackState), + /* retryCount= */ 0); } } this.loadingPeriod = mediaPeriod; diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/chunk/ChunkSampleStream.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/chunk/ChunkSampleStream.java index 87db87e608..0ba48bce0e 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/chunk/ChunkSampleStream.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/chunk/ChunkSampleStream.java @@ -429,10 +429,9 @@ public class ChunkSampleStream // Loader.Callback implementation. - @Override - public void onLoadStarted(Chunk loadable, long elapsedRealtimeMs, long loadDurationMs, - int retryCount) { + public void onLoadStarted( + Chunk loadable, long elapsedRealtimeMs, long loadDurationMs, int retryCount) { mediaSourceEventDispatcher.loadStarted( new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs), loadable.type, @@ -663,7 +662,8 @@ public class ChunkSampleStream loadable.trackSelectionReason, loadable.trackSelectionData, loadable.startTimeUs, - loadable.endTimeUs, /* retryCount= */ 0); + loadable.endTimeUs, + /* retryCount= */ 0); return true; } diff --git a/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java b/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java index 07c0f37ef2..701c96dd0c 100644 --- a/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java +++ b/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java @@ -630,12 +630,14 @@ public final class DashMediaSource extends BaseMediaSource { // Loadable callbacks. /* package */ void onManifestLoadStarted( - ParsingLoadable loadable, long elapsedRealtimeMs, - long loadDurationMs, int retryCount) { - manifestEventDispatcher.loadStarted( + ParsingLoadable loadable, + long elapsedRealtimeMs, + long loadDurationMs, + int retryCount) { + manifestEventDispatcher.loadStarted( new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs), loadable.type, - retryCount); + retryCount); } /* package */ void onManifestLoadCompleted( @@ -1106,7 +1108,8 @@ public final class DashMediaSource extends BaseMediaSource { long elapsedRealtimeMs = loader.startLoading(loadable, callback, minRetryCount); manifestEventDispatcher.loadStarted( new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs), - loadable.type, /* retryCount= */ 0); + loadable.type, + /* retryCount= */ 0); } private static long getIntervalUntilNextManifestRefreshMs( @@ -1399,8 +1402,11 @@ public final class DashMediaSource extends BaseMediaSource { private final class ManifestCallback implements Loader.Callback> { @Override - public void onLoadStarted(ParsingLoadable loadable, long elapsedRealtimeMs, - long loadDurationMs, int retryCount) { + public void onLoadStarted( + ParsingLoadable loadable, + long elapsedRealtimeMs, + long loadDurationMs, + int retryCount) { onManifestLoadStarted(loadable, elapsedRealtimeMs, loadDurationMs, retryCount); } diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java index 7297ce5561..dca0e341ee 100644 --- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java +++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java @@ -820,7 +820,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; loadable.trackSelectionReason, loadable.trackSelectionData, loadable.startTimeUs, - loadable.endTimeUs, /* retryCount= */ 0); + loadable.endTimeUs, + /* retryCount= */ 0); return true; } @@ -861,10 +862,9 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; // Loader.Callback implementation. - @Override - public void onLoadStarted(Chunk loadable, long elapsedRealtimeMs, long loadDurationMs, - int retryCount) { + public void onLoadStarted( + Chunk loadable, long elapsedRealtimeMs, long loadDurationMs, int retryCount) { mediaSourceEventDispatcher.loadStarted( new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs), loadable.type, @@ -873,7 +873,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; loadable.trackSelectionReason, loadable.trackSelectionData, loadable.startTimeUs, - loadable.endTimeUs, retryCount); + loadable.endTimeUs, + retryCount); } @Override diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/DefaultHlsPlaylistTracker.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/DefaultHlsPlaylistTracker.java index e603f9b473..93942d73df 100644 --- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/DefaultHlsPlaylistTracker.java +++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/DefaultHlsPlaylistTracker.java @@ -152,7 +152,8 @@ public final class DefaultHlsPlaylistTracker multivariantPlaylistLoadable.loadTaskId, multivariantPlaylistLoadable.dataSpec, elapsedRealtime), - multivariantPlaylistLoadable.type, /* retryCount= */ 0); + multivariantPlaylistLoadable.type, + /* retryCount= */ 0); } @Override @@ -261,10 +262,7 @@ public final class DefaultHlsPlaylistTracker long loadDurationMs, int retryCount) { eventDispatcher.loadStarted( - new LoadEventInfo( - loadable.loadTaskId, - loadable.dataSpec, - elapsedRealtimeMs), + new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs), loadable.type, retryCount); } @@ -759,7 +757,8 @@ public final class DefaultHlsPlaylistTracker eventDispatcher.loadStarted( new LoadEventInfo( mediaPlaylistLoadable.loadTaskId, mediaPlaylistLoadable.dataSpec, elapsedRealtime), - mediaPlaylistLoadable.type, /* retryCount= */ 0); + mediaPlaylistLoadable.type, + /* retryCount= */ 0); } private void processLoadedPlaylist( diff --git a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java index 98d17a2c74..8f5f12bbbd 100644 --- a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java +++ b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java @@ -498,8 +498,11 @@ public final class SsMediaSource extends BaseMediaSource // Loader.Callback implementation @Override - public void onLoadStarted(ParsingLoadable loadable, long elapsedRealtimeMs, - long loadDurationMs, int retryCount) { + public void onLoadStarted( + ParsingLoadable loadable, + long elapsedRealtimeMs, + long loadDurationMs, + int retryCount) { manifestEventDispatcher.loadStarted( new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs), loadable.type, @@ -673,6 +676,7 @@ public final class SsMediaSource extends BaseMediaSource loadable, this, loadErrorHandlingPolicy.getMinimumLoadableRetryCount(loadable.type)); manifestEventDispatcher.loadStarted( new LoadEventInfo(loadable.loadTaskId, loadable.dataSpec, elapsedRealtimeMs), - loadable.type, /* retryCount= */ 0); + loadable.type, + /* retryCount= */ 0); } }