Commit 02298fa
Fix issue where previous PositionInfo uses unset window index
When receiving a PlaybackInfo update from the internal player
with a discontinuity, while ExoPlayerImpl has an empty timeline,
we currently use C.INDEX_UNSET as the placeholder window index,
which is not valid.
In addition, receiving these stale discontinuities while both
the current and new timelines are empty are misleading anyway, so
added a new check to avoid sending out these specifcally. The
fix to pass in the current masking window index is still needed
to be absolutely sure it's set in case there is a discontinuity
at the same time as a change from an empty Timeline to a
non-empty one (wasn't able to craft a test for this case).
PiperOrigin-RevId: 831406115
(cherry picked from commit 9be90e0)1 parent 2a020c5 commit 02298fa
File tree
2 files changed
+54
-5
lines changed- libraries/exoplayer/src
- main/java/androidx/media3/exoplayer
- test/java/androidx/media3/exoplayer
2 files changed
+54
-5
lines changedLines changed: 10 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2158 | 2158 | | |
2159 | 2159 | | |
2160 | 2160 | | |
| 2161 | + | |
2161 | 2162 | | |
2162 | | - | |
2163 | | - | |
2164 | | - | |
2165 | | - | |
| 2163 | + | |
| 2164 | + | |
| 2165 | + | |
| 2166 | + | |
| 2167 | + | |
| 2168 | + | |
| 2169 | + | |
2166 | 2170 | | |
| 2171 | + | |
2167 | 2172 | | |
2168 | 2173 | | |
2169 | 2174 | | |
| |||
2180 | 2185 | | |
2181 | 2186 | | |
2182 | 2187 | | |
2183 | | - | |
| 2188 | + | |
2184 | 2189 | | |
2185 | 2190 | | |
2186 | 2191 | | |
| |||
Lines changed: 44 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16535 | 16535 | | |
16536 | 16536 | | |
16537 | 16537 | | |
| 16538 | + | |
| 16539 | + | |
| 16540 | + | |
| 16541 | + | |
| 16542 | + | |
| 16543 | + | |
| 16544 | + | |
| 16545 | + | |
| 16546 | + | |
| 16547 | + | |
| 16548 | + | |
| 16549 | + | |
| 16550 | + | |
| 16551 | + | |
| 16552 | + | |
| 16553 | + | |
| 16554 | + | |
| 16555 | + | |
| 16556 | + | |
| 16557 | + | |
| 16558 | + | |
| 16559 | + | |
| 16560 | + | |
| 16561 | + | |
| 16562 | + | |
| 16563 | + | |
| 16564 | + | |
| 16565 | + | |
| 16566 | + | |
| 16567 | + | |
| 16568 | + | |
| 16569 | + | |
| 16570 | + | |
| 16571 | + | |
| 16572 | + | |
| 16573 | + | |
| 16574 | + | |
| 16575 | + | |
| 16576 | + | |
| 16577 | + | |
| 16578 | + | |
| 16579 | + | |
| 16580 | + | |
| 16581 | + | |
16538 | 16582 | | |
16539 | 16583 | | |
16540 | 16584 | | |
| |||
0 commit comments