Commit 51476fa2 by tonihei Committed by Toni

Prevent NPE in ImaAdsLoader onPositionDiscontinuity.

Any seek before the first timeline becomes available will result in a NPE.
Change it to handle that case gracefully.

Issue:#5831
PiperOrigin-RevId: 264603061
parent 6a1331f1
......@@ -484,6 +484,7 @@ public final class ImaAdsLoader
pendingContentPositionMs = C.TIME_UNSET;
adGroupIndex = C.INDEX_UNSET;
contentDurationMs = C.TIME_UNSET;
timeline = Timeline.EMPTY;
}
/**
......@@ -966,7 +967,7 @@ public final class ImaAdsLoader
if (contentDurationUs != C.TIME_UNSET) {
adPlaybackState = adPlaybackState.withContentDurationUs(contentDurationUs);
}
updateImaStateForPlayerState();
onPositionDiscontinuity(Player.DISCONTINUITY_REASON_INTERNAL);
}
@Override
......@@ -1021,7 +1022,7 @@ public final class ImaAdsLoader
}
}
updateAdPlaybackState();
} else {
} else if (!timeline.isEmpty()) {
long positionMs = player.getCurrentPosition();
timeline.getPeriod(0, period);
int newAdGroupIndex = period.getAdGroupIndexForPositionUs(C.msToUs(positionMs));
......@@ -1033,9 +1034,8 @@ public final class ImaAdsLoader
}
}
}
} else {
updateImaStateForPlayerState();
}
updateImaStateForPlayerState();
}
// Internal methods.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment