loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting and Javadoc updates

Browse Source
This commit is contained in:
tonihei 2023-06-05 16:04:13 +01:00
parent b417838209
commit e7c5b87e02
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,12 +202,16 @@ public final class DashMediaSource extends BaseMediaSource {
} }
/** /**
* Sets the minimum position to start playback from, in a live stream. * Sets the minimum position to start playback from in a live stream, in microseconds relative
* This value will override any suggested value from the manifest. * to the start of the live window.
*
* <p>This value will override any suggested value from the manifest and helps to prevent {@link
* androidx.media3.exoplayer.source.BehindLiveWindowException} issues.
* *
* <p>The default value is {@link #MIN_LIVE_DEFAULT_START_POSITION_US}. * <p>The default value is {@link #MIN_LIVE_DEFAULT_START_POSITION_US}.
* *
* @param minLiveStartPositionUs The minimum live start position in microseconds. * @param minLiveStartPositionUs The minimum live start position, in microseconds relative to
* the start of the live window.
* @return This factory, for convenience. * @return This factory, for convenience.
*/ */
@CanIgnoreReturnValue @CanIgnoreReturnValue
@ -350,8 +354,8 @@ public final class DashMediaSource extends BaseMediaSource {
public static final String DEFAULT_MEDIA_ID = "DashMediaSource"; public static final String DEFAULT_MEDIA_ID = "DashMediaSource";
/** /**
* The minimum default start position for live streams in micro seconds, relative to * The minimum default start position for live streams, in microseconds relative to the start of
* the start of the live window. * the live window.
*/ */
public static final long MIN_LIVE_DEFAULT_START_POSITION_US = 5_000_000; public static final long MIN_LIVE_DEFAULT_START_POSITION_US = 5_000_000;
@ -853,8 +857,7 @@ public final class DashMediaSource extends BaseMediaSource {
windowStartUnixTimeMs = windowStartUnixTimeMs =
manifest.availabilityStartTimeMs + Util.usToMs(windowStartTimeInManifestUs); manifest.availabilityStartTimeMs + Util.usToMs(windowStartTimeInManifestUs);
windowDefaultPositionUs = nowInWindowUs - Util.msToUs(liveConfiguration.targetOffsetMs); windowDefaultPositionUs = nowInWindowUs - Util.msToUs(liveConfiguration.targetOffsetMs);
long minimumWindowDefaultPositionUs = long minimumWindowDefaultPositionUs = min(minLiveStartPositionUs, windowDurationUs / 2);
min(minLiveStartPositionUs, windowDurationUs / 2);
if (windowDefaultPositionUs < minimumWindowDefaultPositionUs) { if (windowDefaultPositionUs < minimumWindowDefaultPositionUs) {
// The default position is too close to the start of the live window. Set it to the minimum // The default position is too close to the start of the live window. Set it to the minimum
// default position provided the window is at least twice as big. Else set it to the middle // default position provided the window is at least twice as big. Else set it to the middle
@ -963,8 +966,7 @@ public final class DashMediaSource extends BaseMediaSource {
targetOffsetMs = minLiveOffsetMs; targetOffsetMs = minLiveOffsetMs;
} }
if (targetOffsetMs > maxLiveOffsetMs) { if (targetOffsetMs > maxLiveOffsetMs) {
long safeDistanceFromWindowStartUs = long safeDistanceFromWindowStartUs = min(minLiveStartPositionUs, windowDurationUs / 2);
min(minLiveStartPositionUs, windowDurationUs / 2);
long maxTargetOffsetForSafeDistanceToWindowStartMs = long maxTargetOffsetForSafeDistanceToWindowStartMs =
usToMs(nowInWindowUs - safeDistanceFromWindowStartUs); usToMs(nowInWindowUs - safeDistanceFromWindowStartUs);
targetOffsetMs = targetOffsetMs =