Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c8879392
authored
Oct 07, 2020
by
bachinger
Committed by
Oliver Woodman
Oct 17, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Make resetPosition reset the position if true
Issue: #8024 PiperOrigin-RevId: 335846035
parent
5b0b4479
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
6 deletions
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
View file @
c8879392
...
...
@@ -308,6 +308,13 @@ public final class CastPlayer extends BasePlayer {
}
@Override
public
void
setMediaItems
(
List
<
MediaItem
>
mediaItems
,
boolean
resetPosition
)
{
int
windowIndex
=
resetPosition
?
0
:
getCurrentWindowIndex
();
long
startPositionMs
=
resetPosition
?
C
.
TIME_UNSET
:
getContentPosition
();
setMediaItems
(
mediaItems
,
windowIndex
,
startPositionMs
);
}
@Override
public
void
setMediaItems
(
List
<
MediaItem
>
mediaItems
,
int
startWindowIndex
,
long
startPositionMs
)
{
setMediaItemsInternal
(
...
...
library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
View file @
c8879392
...
...
@@ -45,12 +45,6 @@ public abstract class BasePlayer implements Player {
}
@Override
public
void
setMediaItems
(
List
<
MediaItem
>
mediaItems
,
boolean
resetPosition
)
{
setMediaItems
(
mediaItems
,
/* startWindowIndex= */
C
.
INDEX_UNSET
,
/* startPositionMs= */
C
.
TIME_UNSET
);
}
@Override
public
void
setMediaItems
(
List
<
MediaItem
>
mediaItems
)
{
setMediaItems
(
mediaItems
,
/* resetPosition= */
true
);
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
View file @
c8879392
...
...
@@ -348,6 +348,11 @@ import java.util.concurrent.TimeoutException;
}
@Override
public
void
setMediaItems
(
List
<
MediaItem
>
mediaItems
,
boolean
resetPosition
)
{
setMediaSources
(
createMediaSources
(
mediaItems
),
resetPosition
);
}
@Override
public
void
setMediaItems
(
List
<
MediaItem
>
mediaItems
,
int
startWindowIndex
,
long
startPositionMs
)
{
setMediaSources
(
createMediaSources
(
mediaItems
),
startWindowIndex
,
startPositionMs
);
...
...
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
View file @
c8879392
...
...
@@ -104,6 +104,7 @@ import com.google.android.exoplayer2.upstream.TransferListener;
import
com.google.android.exoplayer2.util.Assertions
;
import
com.google.android.exoplayer2.util.Clock
;
import
com.google.common.collect.ImmutableList
;
import
com.google.common.collect.Lists
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
...
...
@@ -5700,6 +5701,42 @@ public final class ExoPlayerTest {
}
@Test
public
void
setMediaItems_resetPosition_resetsPosition
()
throws
Exception
{
final
int
[]
currentWindowIndices
=
{
C
.
INDEX_UNSET
,
C
.
INDEX_UNSET
};
final
long
[]
currentPositions
=
{
C
.
INDEX_UNSET
,
C
.
INDEX_UNSET
};
ActionSchedule
actionSchedule
=
new
ActionSchedule
.
Builder
(
TAG
)
.
pause
()
.
executeRunnable
(
new
PlayerRunnable
()
{
@Override
public
void
run
(
SimpleExoPlayer
player
)
{
player
.
seekTo
(
/* windowIndex= */
1
,
/* positionMs= */
1000
);
currentWindowIndices
[
0
]
=
player
.
getCurrentWindowIndex
();
currentPositions
[
0
]
=
player
.
getCurrentPosition
();
List
<
MediaItem
>
listOfTwo
=
Lists
.
newArrayList
(
MediaItem
.
fromUri
(
Uri
.
EMPTY
),
MediaItem
.
fromUri
(
Uri
.
EMPTY
));
player
.
setMediaItems
(
listOfTwo
,
/* resetPosition= */
true
);
currentWindowIndices
[
1
]
=
player
.
getCurrentWindowIndex
();
currentPositions
[
1
]
=
player
.
getCurrentPosition
();
}
})
.
prepare
()
.
waitForTimelineChanged
()
.
play
()
.
build
();
new
ExoPlayerTestRunner
.
Builder
(
context
)
.
setActionSchedule
(
actionSchedule
)
.
build
()
.
start
(
/* doPrepare= */
false
)
.
blockUntilActionScheduleFinished
(
TIMEOUT_MS
)
.
blockUntilEnded
(
TIMEOUT_MS
);
assertArrayEquals
(
new
int
[]
{
1
,
0
},
currentWindowIndices
);
assertArrayEquals
(
new
long
[]
{
1000
,
0
},
currentPositions
);
}
@Test
public
void
setMediaSources_empty_whenEmpty_validInitialSeek_correctMaskingWindowIndex
()
throws
Exception
{
Timeline
secondTimeline
=
new
FakeTimeline
(
/* windowCount= */
1
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment