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
090a9923
authored
Oct 23, 2018
by
ogaclejapan
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix setMediaBitrateKbps naming from consistency point of view
parent
cfcbd211
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
View file @
090a9923
...
...
@@ -96,7 +96,7 @@ public final class ImaAdsLoader
private
@Nullable
Set
<
UiElement
>
adUiElements
;
private
int
vastLoadTimeoutMs
;
private
int
mediaLoadTimeoutMs
;
private
int
mediaBitrate
Kbps
;
private
int
mediaBitrate
;
private
ImaFactory
imaFactory
;
/**
...
...
@@ -108,7 +108,7 @@ public final class ImaAdsLoader
this
.
context
=
Assertions
.
checkNotNull
(
context
);
vastLoadTimeoutMs
=
TIMEOUT_UNSET
;
mediaLoadTimeoutMs
=
TIMEOUT_UNSET
;
mediaBitrate
Kbps
=
BITRATE_UNSET
;
mediaBitrate
=
BITRATE_UNSET
;
imaFactory
=
new
DefaultImaFactory
();
}
...
...
@@ -177,15 +177,15 @@ public final class ImaAdsLoader
}
/**
* Sets the ad media maximum recommended bitrate, in
K
bps.
* Sets the ad media maximum recommended bitrate, in bps.
*
* @param
mediaBitrateKbps The ad media maximum recommended bitrate, in K
bps.
* @param
bitrate The ad media maximum recommended bitrate, in
bps.
* @return This builder, for convenience.
* @see AdsRenderingSettings#setBitrateKbps(int)
*/
public
Builder
setM
ediaBitrateKbps
(
int
mediaBitrateKbps
)
{
Assertions
.
checkArgument
(
mediaBitrateKbps
>
0
);
this
.
mediaBitrate
Kbps
=
mediaBitrateKbps
;
public
Builder
setM
axMediaBitrate
(
int
bitrate
)
{
Assertions
.
checkArgument
(
bitrate
>
0
);
this
.
mediaBitrate
=
bitrate
;
return
this
;
}
...
...
@@ -211,7 +211,7 @@ public final class ImaAdsLoader
null
,
vastLoadTimeoutMs
,
mediaLoadTimeoutMs
,
mediaBitrate
Kbps
,
mediaBitrate
,
adUiElements
,
adEventListener
,
imaFactory
);
...
...
@@ -232,7 +232,7 @@ public final class ImaAdsLoader
adsResponse
,
vastLoadTimeoutMs
,
mediaLoadTimeoutMs
,
mediaBitrate
Kbps
,
mediaBitrate
,
adUiElements
,
adEventListener
,
imaFactory
);
...
...
@@ -287,7 +287,7 @@ public final class ImaAdsLoader
private
final
@Nullable
String
adsResponse
;
private
final
int
vastLoadTimeoutMs
;
private
final
int
mediaLoadTimeoutMs
;
private
final
int
mediaBitrate
Kbps
;
private
final
int
mediaBitrate
;
private
final
@Nullable
Set
<
UiElement
>
adUiElements
;
private
final
@Nullable
AdEventListener
adEventListener
;
private
final
ImaFactory
imaFactory
;
...
...
@@ -375,7 +375,7 @@ public final class ImaAdsLoader
/* adsResponse= */
null
,
/* vastLoadTimeoutMs= */
TIMEOUT_UNSET
,
/* mediaLoadTimeoutMs= */
TIMEOUT_UNSET
,
/* mediaBitrate
Kpbs
= */
BITRATE_UNSET
,
/* mediaBitrate= */
BITRATE_UNSET
,
/* adUiElements= */
null
,
/* adEventListener= */
null
,
/* imaFactory= */
new
DefaultImaFactory
());
...
...
@@ -401,7 +401,7 @@ public final class ImaAdsLoader
/* adsResponse= */
null
,
/* vastLoadTimeoutMs= */
TIMEOUT_UNSET
,
/* mediaLoadTimeoutMs= */
TIMEOUT_UNSET
,
/* mediaBitrate
Kbps
= */
BITRATE_UNSET
,
/* mediaBitrate= */
BITRATE_UNSET
,
/* adUiElements= */
null
,
/* adEventListener= */
null
,
/* imaFactory= */
new
DefaultImaFactory
());
...
...
@@ -414,7 +414,7 @@ public final class ImaAdsLoader
@Nullable
String
adsResponse
,
int
vastLoadTimeoutMs
,
int
mediaLoadTimeoutMs
,
int
mediaBitrate
Kbps
,
int
mediaBitrate
,
@Nullable
Set
<
UiElement
>
adUiElements
,
@Nullable
AdEventListener
adEventListener
,
ImaFactory
imaFactory
)
{
...
...
@@ -423,7 +423,7 @@ public final class ImaAdsLoader
this
.
adsResponse
=
adsResponse
;
this
.
vastLoadTimeoutMs
=
vastLoadTimeoutMs
;
this
.
mediaLoadTimeoutMs
=
mediaLoadTimeoutMs
;
this
.
mediaBitrate
Kbps
=
mediaBitrateKbps
;
this
.
mediaBitrate
=
mediaBitrate
;
this
.
adUiElements
=
adUiElements
;
this
.
adEventListener
=
adEventListener
;
this
.
imaFactory
=
imaFactory
;
...
...
@@ -971,8 +971,8 @@ public final class ImaAdsLoader
if
(
mediaLoadTimeoutMs
!=
TIMEOUT_UNSET
)
{
adsRenderingSettings
.
setLoadVideoTimeout
(
mediaLoadTimeoutMs
);
}
if
(
mediaBitrate
Kbps
!=
BITRATE_UNSET
)
{
adsRenderingSettings
.
setBitrateKbps
(
mediaBitrate
Kbps
);
if
(
mediaBitrate
!=
BITRATE_UNSET
)
{
adsRenderingSettings
.
setBitrateKbps
(
mediaBitrate
/
1000
);
}
if
(
adUiElements
!=
null
)
{
adsRenderingSettings
.
setUiElements
(
adUiElements
);
...
...
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