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
1f505fa9
authored
Jan 03, 2020
by
andrewlewis
Committed by
Oliver Woodman
Jan 17, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Show ad markers after the window duration
Issue: #6552 PiperOrigin-RevId: 287964221
parent
90a67b59
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
RELEASENOTES.md
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
RELEASENOTES.md
View file @
1f505fa9
...
@@ -17,6 +17,9 @@
...
@@ -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) ###
...
...
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
View file @
1f505fa9
...
@@ -943,7 +943,7 @@ public class PlayerControlView extends FrameLayout {
...
@@ -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
);
...
...
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