Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix getPriorityCount and getPriorityCountAfterExclusion not counting base urls when no dvb namespace is declared in the manifest #2217

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix getPriorityCount and getPriorityCountAfterExclusion not counting base urls when no dvb namespace is declared in the manifest #2217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ...ies/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/BaseUrlExclusionList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,11 @@ public int getPriorityCountAfterExclusion(List<BaseUrl> baseUrls) {
Set<Integer> priorities = new HashSet<>();
List<BaseUrl> includedBaseUrls = applyExclusions(baseUrls);
for (int i = 0; i < includedBaseUrls.size(); i++) {
priorities.add(includedBaseUrls.get(i).priority);
int priority = includedBaseUrls.get(i).priority;
if (priority == BaseUrl.PRIORITY_UNSET) {
return includedBaseUrls.size();
}
priorities.add(priority);
}
return priorities.size();
}
Expand All @@ -140,7 +144,11 @@ public int getPriorityCountAfterExclusion(List<BaseUrl> baseUrls) {
public static int getPriorityCount(List<BaseUrl> baseUrls) {
Set<Integer> priorities = new HashSet<>();
for (int i = 0; i < baseUrls.size(); i++) {
priorities.add(baseUrls.get(i).priority);
int priority = baseUrls.get(i).priority;
if (priority == BaseUrl.PRIORITY_UNSET) {
return baseUrls.size();
}
priorities.add(priority);
}
return priorities.size();
}
Expand Down
82 changes: 82 additions & 0 deletions ...exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/BaseUrlExclusionListTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import static androidx.media3.exoplayer.dash.manifest.BaseUrl.DEFAULT_DVB_PRIORITY;
import static androidx.media3.exoplayer.dash.manifest.BaseUrl.DEFAULT_WEIGHT;
import static androidx.media3.exoplayer.dash.manifest.BaseUrl.PRIORITY_UNSET;
import static androidx.media3.exoplayer.upstream.DefaultLoadErrorHandlingPolicy.DEFAULT_LOCATION_EXCLUSION_MS;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
Expand Down Expand Up @@ -274,4 +275,85 @@ public void getPriorityCount_correctPriorityCount() {
assertThat(BaseUrlExclusionList.getPriorityCount(baseUrls)).isEqualTo(3);
assertThat(BaseUrlExclusionList.getPriorityCount(ImmutableList.of())).isEqualTo(0);
}

@Test
public void getPriorityCountAfterExclusion_priorityUnset_correctPriorityCount() {
List<BaseUrl> baseUrls =
ImmutableList.of(
new BaseUrl(
/* url= */ "a",
/* serviceLocation= */ "a",
/* priority= */ PRIORITY_UNSET,
/* weight= */ 1),
new BaseUrl(
/* url= */ "b",
/* serviceLocation= */ "b",
/* priority= */ PRIORITY_UNSET,
/* weight= */ 1),
new BaseUrl(
/* url= */ "c",
/* serviceLocation= */ "c",
/* priority= */ PRIORITY_UNSET,
/* weight= */ 1),
new BaseUrl(
/* url= */ "d",
/* serviceLocation= */ "d",
/* priority= */ PRIORITY_UNSET,
/* weight= */ 1),
new BaseUrl(
/* url= */ "e",
/* serviceLocation= */ "e",
/* priority= */ PRIORITY_UNSET,
/* weight= */ 1));
BaseUrlExclusionList baseUrlExclusionList = new BaseUrlExclusionList();

// Empty base URL list.
assertThat(baseUrlExclusionList.getPriorityCountAfterExclusion(ImmutableList.of()))
.isEqualTo(0);

assertThat(baseUrlExclusionList.getPriorityCountAfterExclusion(baseUrls)).isEqualTo(5);
// Exclude base urls.
baseUrlExclusionList.exclude(baseUrls.get(0), DEFAULT_LOCATION_EXCLUSION_MS);
assertThat(baseUrlExclusionList.getPriorityCountAfterExclusion(baseUrls)).isEqualTo(4);
baseUrlExclusionList.exclude(baseUrls.get(1), 2 * DEFAULT_LOCATION_EXCLUSION_MS);
assertThat(baseUrlExclusionList.getPriorityCountAfterExclusion(baseUrls)).isEqualTo(3);
baseUrlExclusionList.exclude(baseUrls.get(3), 3 * DEFAULT_LOCATION_EXCLUSION_MS);
assertThat(baseUrlExclusionList.getPriorityCountAfterExclusion(baseUrls)).isEqualTo(2);
// Time passes.
ShadowSystemClock.advanceBy(Duration.ofMillis(DEFAULT_LOCATION_EXCLUSION_MS));
assertThat(baseUrlExclusionList.getPriorityCountAfterExclusion(baseUrls)).isEqualTo(3);
ShadowSystemClock.advanceBy(Duration.ofMillis(DEFAULT_LOCATION_EXCLUSION_MS));
assertThat(baseUrlExclusionList.getPriorityCountAfterExclusion(baseUrls)).isEqualTo(4);
ShadowSystemClock.advanceBy(Duration.ofMillis(DEFAULT_LOCATION_EXCLUSION_MS));
assertThat(baseUrlExclusionList.getPriorityCountAfterExclusion(baseUrls)).isEqualTo(5);
}

@Test
public void getPriorityCount_priorityUnset_correctPriorityCount() {
List<BaseUrl> baseUrls =
ImmutableList.of(
new BaseUrl(
/* url= */ "a",
/* serviceLocation= */ "a",
/* priority= */ PRIORITY_UNSET,
/* weight= */ 1),
new BaseUrl(
/* url= */ "b",
/* serviceLocation= */ "b",
/* priority= */ PRIORITY_UNSET,
/* weight= */ 1),
new BaseUrl(
/* url= */ "c",
/* serviceLocation= */ "c",
/* priority= */ PRIORITY_UNSET,
/* weight= */ 1),
new BaseUrl(
/* url= */ "d",
/* serviceLocation= */ "d",
/* priority= */ PRIORITY_UNSET,
/* weight= */ 1));

assertThat(BaseUrlExclusionList.getPriorityCount(baseUrls)).isEqualTo(4);
assertThat(BaseUrlExclusionList.getPriorityCount(ImmutableList.of())).isEqualTo(0);
}
}