sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use MediaPeriodId for ad preparation errors

Browse source 
PiperOrigin-RevId: 320565543
This commit is contained in:
andrewlewis 2020-07-10 09:42:53 +01:00 committed by kim-vde
parent 1e2ed51f25
commit bcbe310681
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
View file

@ -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> {
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> {
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);