Add withAvailableAd for server side inserted ad groups
#minor-release PiperOrigin-RevId: 472714732
This commit is contained in:
bachinger
Marc Baechinger
parent
310e0fec5c
commit
70e82a29b7
@ -125,6 +125,9 @@ public final class AdPlaybackState implements Bundleable {
|
||||
* Returns the index of the next ad in the ad group that should be played after playing {@code
|
||||
* lastPlayedAdIndex}, or {@link #count} if no later ads should be played. If no ads have been
|
||||
* played, pass -1 to get the index of the first ad to play.
|
||||
*
|
||||
* <p>Note: {@linkplain #isServerSideInserted Server side inserted ads} are always considered
|
||||
* playable.
|
||||
*/
|
||||
public int getNextAdIndexToPlay(@IntRange(from = -1) int lastPlayedAdIndex) {
|
||||
int nextAdIndexToPlay = lastPlayedAdIndex + 1;
|
||||
@ -235,7 +238,7 @@ public final class AdPlaybackState implements Bundleable {
|
||||
@CheckResult
|
||||
public AdGroup withAdState(@AdState int state, @IntRange(from = 0) int index) {
|
||||
checkArgument(count == C.LENGTH_UNSET || index < count);
|
||||
@AdState int[] states = copyStatesWithSpaceForAdCount(this.states, index + 1);
|
||||
@AdState int[] states = copyStatesWithSpaceForAdCount(this.states, /* count= */ index + 1);
|
||||
checkArgument(
|
||||
states[index] == AD_STATE_UNAVAILABLE
|
||||
|| states[index] == AD_STATE_AVAILABLE
|
||||
@ -470,7 +473,7 @@ public final class AdPlaybackState implements Bundleable {
|
||||
*/
|
||||
public final long contentDurationUs;
|
||||
/**
|
||||
* The number of ad groups the have been removed. Ad groups with indices between {@code 0}
|
||||
* The number of ad groups that have been removed. Ad groups with indices between {@code 0}
|
||||
* (inclusive) and {@code removedAdGroupCount} (exclusive) will be empty and must not be modified
|
||||
* by any of the {@code with*} methods.
|
||||
*/
|
||||
@ -639,18 +642,40 @@ public final class AdPlaybackState implements Bundleable {
|
||||
adsId, adGroups, adResumePositionUs, contentDurationUs, removedAdGroupCount);
|
||||
}
|
||||
|
||||
/** Returns an instance with the specified ad URI. */
|
||||
/**
|
||||
* Returns an instance with the specified ad URI and the ad marked as {@linkplain
|
||||
* #AD_STATE_AVAILABLE available}.
|
||||
*
|
||||
* @throws IllegalStateException If {@link Uri#EMPTY} is passed as argument for a client-side
|
||||
* inserted ad group.
|
||||
*/
|
||||
@CheckResult
|
||||
public AdPlaybackState withAdUri(
|
||||
public AdPlaybackState withAvailableAdUri(
|
||||
@IntRange(from = 0) int adGroupIndex, @IntRange(from = 0) int adIndexInAdGroup, Uri uri) {
|
||||
int adjustedIndex = adGroupIndex - removedAdGroupCount;
|
||||
AdGroup[] adGroups = Util.nullSafeArrayCopy(this.adGroups, this.adGroups.length);
|
||||
checkState(!Uri.EMPTY.equals(uri) || adGroups[adjustedIndex].isServerSideInserted);
|
||||
adGroups[adjustedIndex] = adGroups[adjustedIndex].withAdUri(uri, adIndexInAdGroup);
|
||||
return new AdPlaybackState(
|
||||
adsId, adGroups, adResumePositionUs, contentDurationUs, removedAdGroupCount);
|
||||
}
|
||||
|
||||
/** Returns an instance with the specified ad marked as played. */
|
||||
/**
|
||||
* Returns an instance with the specified ad marked as {@linkplain #AD_STATE_AVAILABLE available}.
|
||||
*
|
||||
* <p>Must not be called with client side inserted ad groups. Client side inserted ads should use
|
||||
* {@link #withAvailableAdUri}.
|
||||
*
|
||||
* @throws IllegalStateException in case this methods is called on an ad group that {@linkplain
|
||||
* AdGroup#isServerSideInserted is not server side inserted}.
|
||||
*/
|
||||
@CheckResult
|
||||
public AdPlaybackState withAvailableAd(
|
||||
@IntRange(from = 0) int adGroupIndex, @IntRange(from = 0) int adIndexInAdGroup) {
|
||||
return withAvailableAdUri(adGroupIndex, adIndexInAdGroup, Uri.EMPTY);
|
||||
}
|
||||
|
||||
/** Returns an instance with the specified ad marked as {@linkplain #AD_STATE_PLAYED played}. */
|
||||
@CheckResult
|
||||
public AdPlaybackState withPlayedAd(
|
||||
@IntRange(from = 0) int adGroupIndex, @IntRange(from = 0) int adIndexInAdGroup) {
|
||||
@ -662,7 +687,7 @@ public final class AdPlaybackState implements Bundleable {
|
||||
adsId, adGroups, adResumePositionUs, contentDurationUs, removedAdGroupCount);
|
||||
}
|
||||
|
||||
/** Returns an instance with the specified ad marked as skipped. */
|
||||
/** Returns an instance with the specified ad marked as {@linkplain #AD_STATE_SKIPPED skipped}. */
|
||||
@CheckResult
|
||||
public AdPlaybackState withSkippedAd(
|
||||
@IntRange(from = 0) int adGroupIndex, @IntRange(from = 0) int adIndexInAdGroup) {
|
||||
@ -674,7 +699,10 @@ public final class AdPlaybackState implements Bundleable {
|
||||
adsId, adGroups, adResumePositionUs, contentDurationUs, removedAdGroupCount);
|
||||
}
|
||||
|
||||
/** Returns an instance with the specified ad marked as having a load error. */
|
||||
/**
|
||||
* Returns an instance with the specified ad marked {@linkplain #AD_STATE_ERROR as having a load
|
||||
* error}.
|
||||
*/
|
||||
@CheckResult
|
||||
public AdPlaybackState withAdLoadError(
|
||||
@IntRange(from = 0) int adGroupIndex, @IntRange(from = 0) int adIndexInAdGroup) {
|
||||
|
||||
@ -25,6 +25,7 @@ import static org.junit.Assert.fail;
|
||||
|
||||
import android.net.Uri;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
@ -33,7 +34,7 @@ import org.junit.runner.RunWith;
|
||||
public class AdPlaybackStateTest {
|
||||
|
||||
private static final long[] TEST_AD_GROUP_TIMES_US = new long[] {0, 5_000_000, 10_000_000};
|
||||
private static final Uri TEST_URI = Uri.EMPTY;
|
||||
private static final Uri TEST_URI = Uri.parse("http://www.google.com");
|
||||
private static final Object TEST_ADS_ID = new Object();
|
||||
|
||||
@Test
|
||||
@ -52,7 +53,7 @@ public class AdPlaybackStateTest {
|
||||
AdPlaybackState state =
|
||||
new AdPlaybackState(TEST_ADS_ID, TEST_AD_GROUP_TIMES_US).withRemovedAdGroupCount(1);
|
||||
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1, TEST_URI);
|
||||
state = state.withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 2);
|
||||
|
||||
assertThat(state.getAdGroup(1).uris[0]).isNull();
|
||||
@ -99,7 +100,7 @@ public class AdPlaybackStateTest {
|
||||
.withRemovedAdGroupCount(1)
|
||||
.withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 2)
|
||||
.withAdCount(/* adGroupIndex= */ 2, /* adCount= */ 1)
|
||||
.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1, TEST_URI)
|
||||
.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1, TEST_URI)
|
||||
.withSkippedAd(/* adGroupIndex= */ 2, /* adIndexInAdGroup= */ 0);
|
||||
|
||||
state =
|
||||
@ -139,8 +140,8 @@ public class AdPlaybackStateTest {
|
||||
AdPlaybackState state =
|
||||
new AdPlaybackState(TEST_ADS_ID, TEST_AD_GROUP_TIMES_US).withRemovedAdGroupCount(1);
|
||||
state = state.withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 3);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0, TEST_URI);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2, TEST_URI);
|
||||
|
||||
assertThat(state.getAdGroup(1).getFirstAdIndexToPlay()).isEqualTo(0);
|
||||
}
|
||||
@ -150,8 +151,8 @@ public class AdPlaybackStateTest {
|
||||
AdPlaybackState state =
|
||||
new AdPlaybackState(TEST_ADS_ID, TEST_AD_GROUP_TIMES_US).withRemovedAdGroupCount(1);
|
||||
state = state.withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 3);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0, TEST_URI);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2, TEST_URI);
|
||||
|
||||
state = state.withPlayedAd(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0);
|
||||
|
||||
@ -165,8 +166,8 @@ public class AdPlaybackStateTest {
|
||||
AdPlaybackState state =
|
||||
new AdPlaybackState(TEST_ADS_ID, TEST_AD_GROUP_TIMES_US).withRemovedAdGroupCount(1);
|
||||
state = state.withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 3);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0, TEST_URI);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2, TEST_URI);
|
||||
|
||||
state = state.withSkippedAd(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0);
|
||||
|
||||
@ -180,8 +181,8 @@ public class AdPlaybackStateTest {
|
||||
AdPlaybackState state =
|
||||
new AdPlaybackState(TEST_ADS_ID, TEST_AD_GROUP_TIMES_US).withRemovedAdGroupCount(1);
|
||||
state = state.withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 3);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0, TEST_URI);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2, TEST_URI);
|
||||
|
||||
state = state.withPlayedAd(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0);
|
||||
state = state.withAdLoadError(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1);
|
||||
@ -194,7 +195,7 @@ public class AdPlaybackStateTest {
|
||||
AdPlaybackState state =
|
||||
new AdPlaybackState(TEST_ADS_ID, TEST_AD_GROUP_TIMES_US).withRemovedAdGroupCount(1);
|
||||
state = state.withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 3);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1, TEST_URI);
|
||||
|
||||
state = state.withAdLoadError(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1);
|
||||
|
||||
@ -207,9 +208,9 @@ public class AdPlaybackStateTest {
|
||||
new AdPlaybackState(TEST_ADS_ID, TEST_AD_GROUP_TIMES_US).withRemovedAdGroupCount(1);
|
||||
state = state.withIsServerSideInserted(/* adGroupIndex= */ 1, /* isServerSideInserted= */ true);
|
||||
state = state.withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 3);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0, TEST_URI);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1, TEST_URI);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2, TEST_URI);
|
||||
|
||||
state = state.withPlayedAd(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0);
|
||||
|
||||
@ -222,9 +223,9 @@ public class AdPlaybackStateTest {
|
||||
new AdPlaybackState(TEST_ADS_ID, TEST_AD_GROUP_TIMES_US).withRemovedAdGroupCount(1);
|
||||
state = state.withIsServerSideInserted(/* adGroupIndex= */ 1, /* isServerSideInserted= */ true);
|
||||
state = state.withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 3);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0, TEST_URI);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1, TEST_URI);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2, TEST_URI);
|
||||
|
||||
state = state.withPlayedAd(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0);
|
||||
state = state.withPlayedAd(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1);
|
||||
@ -247,6 +248,51 @@ public class AdPlaybackStateTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void withAvailableAd() {
|
||||
int adGroupIndex = 2;
|
||||
AdPlaybackState state =
|
||||
new AdPlaybackState(TEST_ADS_ID, TEST_AD_GROUP_TIMES_US)
|
||||
.withRemovedAdGroupCount(2)
|
||||
.withAdCount(adGroupIndex, 3)
|
||||
.withAdDurationsUs(adGroupIndex, /* adDurationsUs...*/ 10, 20, 30)
|
||||
.withIsServerSideInserted(adGroupIndex, true);
|
||||
|
||||
state = state.withAvailableAd(adGroupIndex, /* adIndexInAdGroup= */ 2);
|
||||
|
||||
assertThat(state.getAdGroup(adGroupIndex).states)
|
||||
.asList()
|
||||
.containsExactly(AD_STATE_UNAVAILABLE, AD_STATE_UNAVAILABLE, AD_STATE_AVAILABLE)
|
||||
.inOrder();
|
||||
assertThat(state.getAdGroup(adGroupIndex).uris)
|
||||
.asList()
|
||||
.containsExactly(null, null, Uri.EMPTY)
|
||||
.inOrder();
|
||||
|
||||
state =
|
||||
state
|
||||
.withAvailableAd(adGroupIndex, /* adIndexInAdGroup= */ 0)
|
||||
.withAvailableAd(adGroupIndex, /* adIndexInAdGroup= */ 1)
|
||||
.withAvailableAd(adGroupIndex, /* adIndexInAdGroup= */ 2);
|
||||
|
||||
assertThat(state.getAdGroup(adGroupIndex).states)
|
||||
.asList()
|
||||
.containsExactly(AD_STATE_AVAILABLE, AD_STATE_AVAILABLE, AD_STATE_AVAILABLE)
|
||||
.inOrder();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void withAvailableAd_forClientSideAdGroup_throwsRuntimeException() {
|
||||
AdPlaybackState state =
|
||||
new AdPlaybackState(TEST_ADS_ID, TEST_AD_GROUP_TIMES_US)
|
||||
.withRemovedAdGroupCount(2)
|
||||
.withAdCount(/* adGroupIndex= */ 2, 3)
|
||||
.withAdDurationsUs(/* adGroupIndex= */ 2, /* adDurationsUs...*/ 10, 20, 30);
|
||||
|
||||
Assert.assertThrows(
|
||||
IllegalStateException.class, () -> state.withAvailableAd(/* adGroupIndex= */ 2, 1));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void skipAllWithoutAdCount() {
|
||||
AdPlaybackState state = new AdPlaybackState(TEST_ADS_ID, TEST_AD_GROUP_TIMES_US);
|
||||
@ -272,10 +318,10 @@ public class AdPlaybackStateTest {
|
||||
state =
|
||||
state.withAdDurationsUs(
|
||||
/* adGroupIndex= */ 1, /* adDurationsUs...= */ 1_000L, 2_000L, 3_000L, 4_000L, 5_000L);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1, Uri.EMPTY);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2, Uri.EMPTY);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 3, Uri.EMPTY);
|
||||
state = state.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 4, Uri.EMPTY);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 1, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 3, TEST_URI);
|
||||
state = state.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 4, TEST_URI);
|
||||
state = state.withPlayedAd(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 2);
|
||||
state = state.withSkippedAd(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 3);
|
||||
state = state.withAdLoadError(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 4);
|
||||
@ -303,7 +349,7 @@ public class AdPlaybackStateTest {
|
||||
.inOrder();
|
||||
assertThat(state.getAdGroup(/* adGroupIndex= */ 1).uris)
|
||||
.asList()
|
||||
.containsExactly(null, Uri.EMPTY, Uri.EMPTY, Uri.EMPTY, Uri.EMPTY)
|
||||
.containsExactly(null, TEST_URI, TEST_URI, TEST_URI, TEST_URI)
|
||||
.inOrder();
|
||||
assertThat(state.getAdGroup(/* adGroupIndex= */ 1).durationsUs)
|
||||
.asList()
|
||||
@ -317,12 +363,12 @@ public class AdPlaybackStateTest {
|
||||
.withRemovedAdGroupCount(1)
|
||||
.withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 1)
|
||||
.withPlayedAd(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0)
|
||||
.withAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0, TEST_URI)
|
||||
.withAvailableAdUri(/* adGroupIndex= */ 1, /* adIndexInAdGroup= */ 0, TEST_URI)
|
||||
.withAdCount(/* adGroupIndex= */ 2, /* adCount= */ 2)
|
||||
.withSkippedAd(/* adGroupIndex= */ 2, /* adIndexInAdGroup= */ 0)
|
||||
.withPlayedAd(/* adGroupIndex= */ 2, /* adIndexInAdGroup= */ 1)
|
||||
.withAdUri(/* adGroupIndex= */ 2, /* adIndexInAdGroup= */ 0, TEST_URI)
|
||||
.withAdUri(/* adGroupIndex= */ 2, /* adIndexInAdGroup= */ 1, TEST_URI)
|
||||
.withAvailableAdUri(/* adGroupIndex= */ 2, /* adIndexInAdGroup= */ 0, TEST_URI)
|
||||
.withAvailableAdUri(/* adGroupIndex= */ 2, /* adIndexInAdGroup= */ 1, TEST_URI)
|
||||
.withContentResumeOffsetUs(/* adGroupIndex= */ 1, /* contentResumeOffsetUs= */ 4444)
|
||||
.withContentResumeOffsetUs(/* adGroupIndex= */ 2, /* contentResumeOffsetUs= */ 3333)
|
||||
.withIsServerSideInserted(/* adGroupIndex= */ 1, /* isServerSideInserted= */ true)
|
||||
|
||||
@ -4758,7 +4758,8 @@ public final class ExoPlayerTest {
|
||||
new AdPlaybackState(/* adsId= */ new Object(), /* adGroupTimesUs...= */ 0);
|
||||
adPlaybackState = adPlaybackState.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1);
|
||||
adPlaybackState =
|
||||
adPlaybackState.withAdUri(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, Uri.EMPTY);
|
||||
adPlaybackState.withAvailableAdUri(
|
||||
/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, Uri.parse("https://google.com/ad"));
|
||||
long[][] durationsUs = new long[1][];
|
||||
durationsUs[0] = new long[] {Util.msToUs(adDurationMs)};
|
||||
adPlaybackState = adPlaybackState.withAdDurationsUs(durationsUs);
|
||||
@ -4859,7 +4860,8 @@ public final class ExoPlayerTest {
|
||||
new AdPlaybackState(/* adsId= */ new Object(), /* adGroupTimesUs...= */ 0);
|
||||
adPlaybackState = adPlaybackState.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1);
|
||||
adPlaybackState =
|
||||
adPlaybackState.withAdUri(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, Uri.EMPTY);
|
||||
adPlaybackState.withAvailableAdUri(
|
||||
/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, Uri.parse("https://google.com/ad"));
|
||||
long[][] durationsUs = new long[1][];
|
||||
durationsUs[0] = new long[] {Util.msToUs(adDurationMs)};
|
||||
adPlaybackState = adPlaybackState.withAdDurationsUs(durationsUs);
|
||||
@ -4940,7 +4942,10 @@ public final class ExoPlayerTest {
|
||||
AdPlaybackState adPlaybackState =
|
||||
new AdPlaybackState(/* adsId= */ new Object(), /* adGroupTimesUs...= */ 0)
|
||||
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
|
||||
.withAdUri(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, Uri.EMPTY);
|
||||
.withAvailableAdUri(
|
||||
/* adGroupIndex= */ 0,
|
||||
/* adIndexInAdGroup= */ 0,
|
||||
Uri.parse("https://google.com/ad"));
|
||||
long[][] durationsUs = new long[1][];
|
||||
durationsUs[0] = new long[] {Util.msToUs(adDurationMs)};
|
||||
adPlaybackState = adPlaybackState.withAdDurationsUs(durationsUs);
|
||||
@ -9052,7 +9057,10 @@ public final class ExoPlayerTest {
|
||||
AdPlaybackState adPlaybackState =
|
||||
new AdPlaybackState(/* adsId= */ new Object(), /* adGroupTimesUs...= */ 0)
|
||||
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
|
||||
.withAdUri(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, Uri.EMPTY)
|
||||
.withAvailableAdUri(
|
||||
/* adGroupIndex= */ 0,
|
||||
/* adIndexInAdGroup= */ 0,
|
||||
Uri.parse("https://google.com/ad"))
|
||||
.withAdDurationsUs(/* adDurationUs= */ new long[][] {{Util.msToUs(4_000)}});
|
||||
Timeline adTimeline =
|
||||
new FakeTimeline(
|
||||
|
||||
@ -70,6 +70,7 @@ public final class MediaPeriodQueueTest {
|
||||
private static final long FIRST_AD_START_TIME_US = 10 * C.MICROS_PER_SECOND;
|
||||
private static final long SECOND_AD_START_TIME_US = 20 * C.MICROS_PER_SECOND;
|
||||
|
||||
private static final Uri AD_URI = Uri.parse("https://google.com/empty");
|
||||
private static final Timeline CONTENT_TIMELINE =
|
||||
new SinglePeriodTimeline(
|
||||
CONTENT_DURATION_US,
|
||||
@ -77,8 +78,7 @@ public final class MediaPeriodQueueTest {
|
||||
/* isDynamic= */ false,
|
||||
/* useLiveConfiguration= */ false,
|
||||
/* manifest= */ null,
|
||||
MediaItem.fromUri(Uri.EMPTY));
|
||||
private static final Uri AD_URI = Uri.EMPTY;
|
||||
MediaItem.fromUri(AD_URI));
|
||||
|
||||
private MediaPeriodQueue mediaPeriodQueue;
|
||||
private AdPlaybackState adPlaybackState;
|
||||
@ -1174,7 +1174,7 @@ public final class MediaPeriodQueueTest {
|
||||
adPlaybackState =
|
||||
adPlaybackState
|
||||
.withAdCount(adGroupIndex, /* adCount= */ 1)
|
||||
.withAdUri(adGroupIndex, /* adIndexInAdGroup= */ 0, AD_URI)
|
||||
.withAvailableAdUri(adGroupIndex, /* adIndexInAdGroup= */ 0, AD_URI)
|
||||
.withAdDurationsUs(newDurations);
|
||||
updateTimeline();
|
||||
}
|
||||
|
||||
@ -62,7 +62,7 @@ public final class AdsMediaSourceTest {
|
||||
/* isDynamic= */ false,
|
||||
/* useLiveConfiguration= */ false,
|
||||
/* manifest= */ null,
|
||||
MediaItem.fromUri(Uri.EMPTY));
|
||||
MediaItem.fromUri(Uri.parse("https://google.com/empty")));
|
||||
private static final Object PREROLL_AD_PERIOD_UID =
|
||||
PREROLL_AD_TIMELINE.getUidOfPeriod(/* periodIndex= */ 0);
|
||||
|
||||
@ -74,7 +74,7 @@ public final class AdsMediaSourceTest {
|
||||
/* isDynamic= */ false,
|
||||
/* useLiveConfiguration= */ false,
|
||||
/* manifest= */ null,
|
||||
MediaItem.fromUri(Uri.EMPTY));
|
||||
MediaItem.fromUri(Uri.parse("https://google.com/empty")));
|
||||
private static final Object CONTENT_PERIOD_UID =
|
||||
CONTENT_TIMELINE.getUidOfPeriod(/* periodIndex= */ 0);
|
||||
|
||||
@ -82,7 +82,8 @@ public final class AdsMediaSourceTest {
|
||||
new AdPlaybackState(/* adsId= */ new Object(), /* adGroupTimesUs...= */ 0)
|
||||
.withContentDurationUs(CONTENT_DURATION_US)
|
||||
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
|
||||
.withAdUri(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, Uri.EMPTY)
|
||||
.withAvailableAdUri(
|
||||
/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, Uri.parse("https://google.com/ad"))
|
||||
.withPlayedAd(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0)
|
||||
.withAdResumePositionUs(/* adResumePositionUs= */ 0);
|
||||
|
||||
|
||||
@ -965,7 +965,7 @@ import java.util.Map;
|
||||
|
||||
Uri adUri = Uri.parse(adMediaInfo.getUrl());
|
||||
adPlaybackState =
|
||||
adPlaybackState.withAdUri(adInfo.adGroupIndex, adInfo.adIndexInAdGroup, adUri);
|
||||
adPlaybackState.withAvailableAdUri(adInfo.adGroupIndex, adInfo.adIndexInAdGroup, adUri);
|
||||
updateAdPlaybackState();
|
||||
}
|
||||
|
||||
|
||||
@ -315,7 +315,7 @@ public final class ImaAdsLoaderTest {
|
||||
new AdPlaybackState(TEST_ADS_ID, /* adGroupTimesUs...= */ 0)
|
||||
.withContentDurationUs(CONTENT_PERIOD_DURATION_US)
|
||||
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
|
||||
.withAdUri(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, TEST_URI)
|
||||
.withAvailableAdUri(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, TEST_URI)
|
||||
.withAdDurationsUs(new long[][] {{TEST_AD_DURATION_US}})
|
||||
.withPlayedAd(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0)
|
||||
.withAdResumePositionUs(/* adResumePositionUs= */ 0));
|
||||
@ -1063,7 +1063,7 @@ public final class ImaAdsLoaderTest {
|
||||
new AdPlaybackState(TEST_ADS_ID, getAdGroupTimesUsForCuePoints(cuePoints))
|
||||
.withContentDurationUs(CONTENT_PERIOD_DURATION_US)
|
||||
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
|
||||
.withAdUri(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, TEST_URI)
|
||||
.withAvailableAdUri(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, TEST_URI)
|
||||
.withAdDurationsUs(new long[][] {{TEST_AD_DURATION_US}}));
|
||||
}
|
||||
|
||||
@ -1117,7 +1117,7 @@ public final class ImaAdsLoaderTest {
|
||||
new AdPlaybackState(TEST_ADS_ID, /* adGroupTimesUs...= */ 0)
|
||||
.withContentDurationUs(CONTENT_PERIOD_DURATION_US)
|
||||
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
|
||||
.withAdUri(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, TEST_URI)
|
||||
.withAvailableAdUri(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, TEST_URI)
|
||||
.withAdDurationsUs(new long[][] {{TEST_AD_DURATION_US}})
|
||||
.withPlayedAd(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0)
|
||||
.withAdResumePositionUs(/* adResumePositionUs= */ 0));
|
||||
@ -1184,7 +1184,7 @@ public final class ImaAdsLoaderTest {
|
||||
new AdPlaybackState(TEST_ADS_ID, /* adGroupTimesUs...= */ 0)
|
||||
.withContentDurationUs(CONTENT_PERIOD_DURATION_US)
|
||||
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
|
||||
.withAdUri(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, TEST_URI)
|
||||
.withAvailableAdUri(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, TEST_URI)
|
||||
.withAdDurationsUs(new long[][] {{TEST_AD_DURATION_US}})
|
||||
.withPlayedAd(/* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0)
|
||||
.withAdResumePositionUs(/* adResumePositionUs= */ 0));
|
||||
|
||||
@ -295,7 +295,7 @@ public final class FakeTimeline extends Timeline {
|
||||
adPlaybackState = adPlaybackState.withAdCount(/* adGroupIndex= */ i, adsPerAdGroup);
|
||||
for (int j = 0; j < adsPerAdGroup; j++) {
|
||||
adPlaybackState =
|
||||
adPlaybackState.withAdUri(
|
||||
adPlaybackState.withAvailableAdUri(
|
||||
/* adGroupIndex= */ i,
|
||||
/* adIndexInAdGroup= */ j,
|
||||
Uri.parse("https://example.com/ad/" + i + "/" + j));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user