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
bcbe3106
authored
Jul 10, 2020
by
andrewlewis
Committed by
kim-vde
Jul 13, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Use MediaPeriodId for ad preparation errors
PiperOrigin-RevId: 320565543
parent
1e2ed51f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
8 deletions
library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
View file @
bcbe3106
...
@@ -379,13 +379,9 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
...
@@ -379,13 +379,9 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
private
final
class
AdPrepareErrorListener
implements
MaskingMediaPeriod
.
PrepareErrorListener
{
private
final
class
AdPrepareErrorListener
implements
MaskingMediaPeriod
.
PrepareErrorListener
{
private
final
Uri
adUri
;
private
final
Uri
adUri
;
private
final
int
adGroupIndex
;
private
final
int
adIndexInAdGroup
;
public
AdPrepareErrorListener
(
Uri
adUri
,
int
adGroupIndex
,
int
adIndexInAdGroup
)
{
public
AdPrepareErrorListener
(
Uri
adUri
)
{
this
.
adUri
=
adUri
;
this
.
adUri
=
adUri
;
this
.
adGroupIndex
=
adGroupIndex
;
this
.
adIndexInAdGroup
=
adIndexInAdGroup
;
}
}
@Override
@Override
...
@@ -400,7 +396,9 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
...
@@ -400,7 +396,9 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
AdLoadException
.
createForAd
(
exception
),
AdLoadException
.
createForAd
(
exception
),
/* wasCanceled= */
true
);
/* wasCanceled= */
true
);
mainHandler
.
post
(
mainHandler
.
post
(
()
->
adsLoader
.
handlePrepareError
(
adGroupIndex
,
adIndexInAdGroup
,
exception
));
()
->
adsLoader
.
handlePrepareError
(
mediaPeriodId
.
adGroupIndex
,
mediaPeriodId
.
adIndexInAdGroup
,
exception
));
}
}
}
}
...
@@ -420,8 +418,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
...
@@ -420,8 +418,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
Uri
adUri
,
MediaPeriodId
id
,
Allocator
allocator
,
long
startPositionUs
)
{
Uri
adUri
,
MediaPeriodId
id
,
Allocator
allocator
,
long
startPositionUs
)
{
MaskingMediaPeriod
maskingMediaPeriod
=
MaskingMediaPeriod
maskingMediaPeriod
=
new
MaskingMediaPeriod
(
adMediaSource
,
id
,
allocator
,
startPositionUs
);
new
MaskingMediaPeriod
(
adMediaSource
,
id
,
allocator
,
startPositionUs
);
maskingMediaPeriod
.
setPrepareErrorListener
(
maskingMediaPeriod
.
setPrepareErrorListener
(
new
AdPrepareErrorListener
(
adUri
));
new
AdPrepareErrorListener
(
adUri
,
id
.
adGroupIndex
,
id
.
adIndexInAdGroup
));
activeMediaPeriods
.
add
(
maskingMediaPeriod
);
activeMediaPeriods
.
add
(
maskingMediaPeriod
);
if
(
timeline
!=
null
)
{
if
(
timeline
!=
null
)
{
Object
periodUid
=
timeline
.
getUidOfPeriod
(
/* periodIndex= */
0
);
Object
periodUid
=
timeline
.
getUidOfPeriod
(
/* periodIndex= */
0
);
...
...
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