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

Fix setMediaBitrateKbps naming from consistency point of view

Browse source
This commit is contained in:
ogaclejapan 2018-10-23 11:24:41 +09:00
parent cfcbd2114b
commit 090a992332
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
View file

@ -96,7 +96,7 @@ public final class ImaAdsLoader
private @Nullable Set<UiElement> adUiElements; private @Nullable Set<UiElement> adUiElements;
private int vastLoadTimeoutMs; private int vastLoadTimeoutMs;
private int mediaLoadTimeoutMs; private int mediaLoadTimeoutMs;
private int mediaBitrateKbps; private int mediaBitrate;
private ImaFactory imaFactory; private ImaFactory imaFactory;
/** /**
@ -108,7 +108,7 @@ public final class ImaAdsLoader
this.context = Assertions.checkNotNull(context); this.context = Assertions.checkNotNull(context);
vastLoadTimeoutMs = TIMEOUT_UNSET; vastLoadTimeoutMs = TIMEOUT_UNSET;
mediaLoadTimeoutMs = TIMEOUT_UNSET; mediaLoadTimeoutMs = TIMEOUT_UNSET;
mediaBitrateKbps = BITRATE_UNSET; mediaBitrate = BITRATE_UNSET;
imaFactory = new DefaultImaFactory(); imaFactory = new DefaultImaFactory();
} }
@ -177,15 +177,15 @@ public final class ImaAdsLoader
} }
/** /**
* Sets the ad media maximum recommended bitrate, in Kbps. * Sets the ad media maximum recommended bitrate, in bps.
* *
* @param mediaBitrateKbps The ad media maximum recommended bitrate, in Kbps. * @param bitrate The ad media maximum recommended bitrate, in bps.
* @return This builder, for convenience. * @return This builder, for convenience.
* @see AdsRenderingSettings#setBitrateKbps(int) * @see AdsRenderingSettings#setBitrateKbps(int)
*/ */
public Builder setMediaBitrateKbps(int mediaBitrateKbps) { public Builder setMaxMediaBitrate(int bitrate) {
Assertions.checkArgument(mediaBitrateKbps > 0); Assertions.checkArgument(bitrate > 0);
this.mediaBitrateKbps = mediaBitrateKbps; this.mediaBitrate = bitrate;
return this; return this;
} }
@ -211,7 +211,7 @@ public final class ImaAdsLoader
null, null,
vastLoadTimeoutMs, vastLoadTimeoutMs,
mediaLoadTimeoutMs, mediaLoadTimeoutMs,
mediaBitrateKbps, mediaBitrate,
adUiElements, adUiElements,
adEventListener, adEventListener,
imaFactory); imaFactory);
@ -232,7 +232,7 @@ public final class ImaAdsLoader
adsResponse, adsResponse,
vastLoadTimeoutMs, vastLoadTimeoutMs,
mediaLoadTimeoutMs, mediaLoadTimeoutMs,
mediaBitrateKbps, mediaBitrate,
adUiElements, adUiElements,
adEventListener, adEventListener,
imaFactory); imaFactory);
@ -287,7 +287,7 @@ public final class ImaAdsLoader
private final @Nullable String adsResponse; private final @Nullable String adsResponse;
private final int vastLoadTimeoutMs; private final int vastLoadTimeoutMs;
private final int mediaLoadTimeoutMs; private final int mediaLoadTimeoutMs;
private final int mediaBitrateKbps; private final int mediaBitrate;
private final @Nullable Set<UiElement> adUiElements; private final @Nullable Set<UiElement> adUiElements;
private final @Nullable AdEventListener adEventListener; private final @Nullable AdEventListener adEventListener;
private final ImaFactory imaFactory; private final ImaFactory imaFactory;
@ -375,7 +375,7 @@ public final class ImaAdsLoader
/* adsResponse= */ null, /* adsResponse= */ null,
/* vastLoadTimeoutMs= */ TIMEOUT_UNSET, /* vastLoadTimeoutMs= */ TIMEOUT_UNSET,
/* mediaLoadTimeoutMs= */ TIMEOUT_UNSET, /* mediaLoadTimeoutMs= */ TIMEOUT_UNSET,
/* mediaBitrateKpbs= */ BITRATE_UNSET, /* mediaBitrate= */ BITRATE_UNSET,
/* adUiElements= */ null, /* adUiElements= */ null,
/* adEventListener= */ null, /* adEventListener= */ null,
/* imaFactory= */ new DefaultImaFactory()); /* imaFactory= */ new DefaultImaFactory());
@ -401,7 +401,7 @@ public final class ImaAdsLoader
/* adsResponse= */ null, /* adsResponse= */ null,
/* vastLoadTimeoutMs= */ TIMEOUT_UNSET, /* vastLoadTimeoutMs= */ TIMEOUT_UNSET,
/* mediaLoadTimeoutMs= */ TIMEOUT_UNSET, /* mediaLoadTimeoutMs= */ TIMEOUT_UNSET,
/* mediaBitrateKbps= */ BITRATE_UNSET, /* mediaBitrate= */ BITRATE_UNSET,
/* adUiElements= */ null, /* adUiElements= */ null,
/* adEventListener= */ null, /* adEventListener= */ null,
/* imaFactory= */ new DefaultImaFactory()); /* imaFactory= */ new DefaultImaFactory());
@ -414,7 +414,7 @@ public final class ImaAdsLoader
@Nullable String adsResponse, @Nullable String adsResponse,
int vastLoadTimeoutMs, int vastLoadTimeoutMs,
int mediaLoadTimeoutMs, int mediaLoadTimeoutMs,
int mediaBitrateKbps, int mediaBitrate,
@Nullable Set<UiElement> adUiElements, @Nullable Set<UiElement> adUiElements,
@Nullable AdEventListener adEventListener, @Nullable AdEventListener adEventListener,
ImaFactory imaFactory) { ImaFactory imaFactory) {
@ -423,7 +423,7 @@ public final class ImaAdsLoader
this.adsResponse = adsResponse; this.adsResponse = adsResponse;
this.vastLoadTimeoutMs = vastLoadTimeoutMs; this.vastLoadTimeoutMs = vastLoadTimeoutMs;
this.mediaLoadTimeoutMs = mediaLoadTimeoutMs; this.mediaLoadTimeoutMs = mediaLoadTimeoutMs;
this.mediaBitrateKbps = mediaBitrateKbps; this.mediaBitrate = mediaBitrate;
this.adUiElements = adUiElements; this.adUiElements = adUiElements;
this.adEventListener = adEventListener; this.adEventListener = adEventListener;
this.imaFactory = imaFactory; this.imaFactory = imaFactory;
@ -971,8 +971,8 @@ public final class ImaAdsLoader
if (mediaLoadTimeoutMs != TIMEOUT_UNSET) { if (mediaLoadTimeoutMs != TIMEOUT_UNSET) {
adsRenderingSettings.setLoadVideoTimeout(mediaLoadTimeoutMs); adsRenderingSettings.setLoadVideoTimeout(mediaLoadTimeoutMs);
} }
if (mediaBitrateKbps != BITRATE_UNSET) { if (mediaBitrate != BITRATE_UNSET) {
adsRenderingSettings.setBitrateKbps(mediaBitrateKbps); adsRenderingSettings.setBitrateKbps(mediaBitrate / 1000);
} }
if (adUiElements != null) { if (adUiElements != null) {
adsRenderingSettings.setUiElements(adUiElements); adsRenderingSettings.setUiElements(adUiElements);