Skip to content

Fixes issue #9347 - jump to live on seek to 0 #753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 2 commits into from
Dec 14, 2023
Merged

Fixes issue #9347 - jump to live on seek to 0 #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6484015
Fixes issue #9347 - jump to live on seek to 0
stevemayhew Oct 20, 2023
7a70287
Add test and release notes
tonihei Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions RELEASENOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
* Fix issue that OPUS and VORBIS channel layouts are wrong for 3, 5, 6, 7
and 8 channels
([#8396](https://github.com/google/ExoPlayer/issues/8396)).
* Fix issue where track selections after seek to zero in a live stream
incorrectly let the stream start at its default position
([#9347](https://github.com/google/ExoPlayer/issues/9347)).
* Transformer:
* Add support for flattening H.265/HEVC SEF slow motion videos.
* Increase transmuxing speed, especially for 'remove video' edits.
Expand Down
2 changes: 1 addition & 1 deletion libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/MaskingMediaPeriod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ public long selectTracks(
long positionUs) {
if (preparePositionOverrideUs != C.TIME_UNSET && positionUs == preparePositionUs) {
positionUs = preparePositionOverrideUs;
preparePositionOverrideUs = C.TIME_UNSET;
}
preparePositionOverrideUs = C.TIME_UNSET;
return castNonNull(mediaPeriod)
.selectTracks(selections, mayRetainStreamFlags, streams, streamResetFlags, positionUs);
}
Expand Down
48 changes: 48 additions & 0 deletions libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
import androidx.media3.common.Timeline;
import androidx.media3.common.Timeline.Window;
import androidx.media3.common.TrackGroup;
import androidx.media3.common.TrackSelectionParameters;
import androidx.media3.common.TrackSelectionParameters.AudioOffloadPreferences;
import androidx.media3.common.Tracks;
import androidx.media3.common.VideoSize;
Expand Down Expand Up @@ -14179,6 +14180,53 @@ public PlaybackParameters getPlaybackParameters() {
player.release();
}

@Test
public void seekToZeroAndTrackSelection_withNonZeroDefaultPosition_startsPlaybackAtZero()
throws Exception {
// Create a timeline with a non-zero default position. It's important to use a
// windowOffsetInFirstPeriodUs of zero to ensure that our later manual seek to zero could be
// mistaken for the initial placeholder start position of zero
// (see https://github.com/google/ExoPlayer/issues/9347).
Timeline timeline =
new FakeTimeline(
new TimelineWindowDefinition(
/* periodCount= */ 1,
/* id= */ new Object(),
/* isSeekable= */ true,
/* isDynamic= */ true,
/* isLive= */ true,
/* isPlaceholder= */ false,
/* durationUs= */ 10_000_000,
/* defaultPositionUs= */ 9_000_000,
/* windowOffsetInFirstPeriodUs= */ 0,
/* adPlaybackState= */ AdPlaybackState.NONE));
FakeMediaSource mediaSource =
new FakeMediaSource(
timeline, ExoPlayerTestRunner.VIDEO_FORMAT, ExoPlayerTestRunner.AUDIO_FORMAT);
// Make sure the player has to use its placeholder values initially.
mediaSource.setAllowPreparation(false);
ExoPlayer player = new TestExoPlayerBuilder(context).build();
player.setMediaSource(mediaSource);
player.prepare();
runUntilPendingCommandsAreFullyHandled(player);
mediaSource.setAllowPreparation(true);
runUntilPlaybackState(player, Player.STATE_READY);
long positionAfterPrepare = player.getCurrentPosition();

// Manually seek back to zero and force to reselect tracks.
player.seekTo(0);
player.setTrackSelectionParameters(
new TrackSelectionParameters.Builder(context)
.setTrackTypeDisabled(C.TRACK_TYPE_AUDIO, /* disabled= */ true)
.build());
runUntilPendingCommandsAreFullyHandled(player);
long positionAfterSeek = player.getContentPosition();
player.release();

assertThat(positionAfterPrepare).isEqualTo(9000);
assertThat(positionAfterSeek).isEqualTo(0);
}

// Internal methods.

private void addWatchAsSystemFeature() {
Expand Down