loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-06 15:10:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Show ad markers after the window duration

Browse Source 
Issue: #6552
PiperOrigin-RevId: 287964221
This commit is contained in:
andrewlewis 2020-01-03 10:22:27 +00:00 committed by Oliver Woodman
parent 90a67b59c5
commit 1f505fa9fd
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASENOTES.md
View File

@ -17,6 +17,9 @@
* Support "twos" codec (big endian PCM) in MP4 * Support "twos" codec (big endian PCM) in MP4
([#5789](https://github.com/google/ExoPlayer/issues/5789)). ([#5789](https://github.com/google/ExoPlayer/issues/5789)).
* WAV: Support IMA ADPCM encoded data. * WAV: Support IMA ADPCM encoded data.
* Show ad group markers in `DefaultTimeBar` even if they are after the end of
the current window
([#6552](https://github.com/google/ExoPlayer/issues/6552)).
### 2.11.1 (2019-12-20) ### ### 2.11.1 (2019-12-20) ###

2
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
View File

@ -943,7 +943,7 @@ public class PlayerControlView extends FrameLayout {
adGroupTimeInPeriodUs = period.durationUs; adGroupTimeInPeriodUs = period.durationUs;
} }
long adGroupTimeInWindowUs = adGroupTimeInPeriodUs + period.getPositionInWindowUs(); long adGroupTimeInWindowUs = adGroupTimeInPeriodUs + period.getPositionInWindowUs();
if (adGroupTimeInWindowUs >= 0 && adGroupTimeInWindowUs <= window.durationUs) { if (adGroupTimeInWindowUs >= 0) {
if (adGroupCount == adGroupTimesMs.length) { if (adGroupCount == adGroupTimesMs.length) {
int newLength = adGroupTimesMs.length == 0 ? 1 : adGroupTimesMs.length * 2; int newLength = adGroupTimesMs.length == 0 ? 1 : adGroupTimesMs.length * 2;
adGroupTimesMs = Arrays.copyOf(adGroupTimesMs, newLength); adGroupTimesMs = Arrays.copyOf(adGroupTimesMs, newLength);