loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix method ordering in ImaAdsLoader

Browse Source 
Put static methods at the end.

Also add a couple of missing parameter name comments.

PiperOrigin-RevId: 311077684
This commit is contained in:
andrewlewis 2020-05-12 08:55:27 +01:00 committed by Andrew Lewis
parent 929b60e209
commit e482aa2be8
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
View File

@ -237,7 +237,7 @@ public final class ImaAdsLoader
context, context,
adTagUri, adTagUri,
imaSdkSettings, imaSdkSettings,
null, /* adsResponse= */ null,
vastLoadTimeoutMs, vastLoadTimeoutMs,
mediaLoadTimeoutMs, mediaLoadTimeoutMs,
mediaBitrate, mediaBitrate,
@ -257,7 +257,7 @@ public final class ImaAdsLoader
public ImaAdsLoader buildForAdsResponse(String adsResponse) { public ImaAdsLoader buildForAdsResponse(String adsResponse) {
return new ImaAdsLoader( return new ImaAdsLoader(
context, context,
null, /* adTagUri= */ null,
imaSdkSettings, imaSdkSettings,
adsResponse, adsResponse,
vastLoadTimeoutMs, vastLoadTimeoutMs,
@ -1350,17 +1350,6 @@ public final class ImaAdsLoader
} }
} }
private static DataSpec getAdsDataSpec(@Nullable Uri adTagUri) {
return new DataSpec(adTagUri != null ? adTagUri : Uri.EMPTY);
}
private static long getContentPeriodPositionMs(
Player player, Timeline timeline, Timeline.Period period) {
long contentWindowPositionMs = player.getContentPosition();
return contentWindowPositionMs
- timeline.getPeriod(/* periodIndex= */ 0, period).getPositionInWindowMs();
}
private int getAdGroupIndex(AdPodInfo adPodInfo) { private int getAdGroupIndex(AdPodInfo adPodInfo) {
if (adPodInfo.getPodIndex() == -1) { if (adPodInfo.getPodIndex() == -1) {
// This is a postroll ad. // This is a postroll ad.
@ -1377,6 +1366,22 @@ public final class ImaAdsLoader
throw new IllegalStateException("Failed to find cue point"); throw new IllegalStateException("Failed to find cue point");
} }
private String getAdMediaInfoString(AdMediaInfo adMediaInfo) {
@Nullable AdInfo adInfo = adInfoByAdMediaInfo.get(adMediaInfo);
return "AdMediaInfo[" + adMediaInfo.getUrl() + (adInfo != null ? ", " + adInfo : "") + "]";
}
private static DataSpec getAdsDataSpec(@Nullable Uri adTagUri) {
return new DataSpec(adTagUri != null ? adTagUri : Uri.EMPTY);
}
private static long getContentPeriodPositionMs(
Player player, Timeline timeline, Timeline.Period period) {
long contentWindowPositionMs = player.getContentPosition();
return contentWindowPositionMs
- timeline.getPeriod(/* periodIndex= */ 0, period).getPositionInWindowMs();
}
private static long[] getAdGroupTimesUs(List<Float> cuePoints) { private static long[] getAdGroupTimesUs(List<Float> cuePoints) {
if (cuePoints.isEmpty()) { if (cuePoints.isEmpty()) {
// If no cue points are specified, there is a preroll ad. // If no cue points are specified, there is a preroll ad.
@ -1440,11 +1445,6 @@ public final class ImaAdsLoader
Context context, ImaSdkSettings imaSdkSettings, AdDisplayContainer adDisplayContainer); Context context, ImaSdkSettings imaSdkSettings, AdDisplayContainer adDisplayContainer);
} }
private String getAdMediaInfoString(AdMediaInfo adMediaInfo) {
@Nullable AdInfo adInfo = adInfoByAdMediaInfo.get(adMediaInfo);
return "AdMediaInfo[" + adMediaInfo.getUrl() + (adInfo != null ? ", " + adInfo : "") + "]";
}
// TODO: Consider moving this into AdPlaybackState. // TODO: Consider moving this into AdPlaybackState.
private static final class AdInfo { private static final class AdInfo {
public final int adGroupIndex; public final int adGroupIndex;