这是indexloc提供的服务，不要输入任何密码
Skip to content

Allow CmcdConfiguration.Factory to return null to disable CMCD #2386

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

Merged
merged 1 commit into from
Apr 30, 2025
Merged

Allow CmcdConfiguration.Factory to return null to disable CMCD #2386

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
3 changes: 2 additions & 1 deletion libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,9 @@ public interface Factory {
* Creates a {@link CmcdConfiguration} based on the provided {@link MediaItem}.
*
* @param mediaItem The {@link MediaItem} from which to create the CMCD configuration.
* @return A {@link CmcdConfiguration} instance.
* @return A {@link CmcdConfiguration} instance, or {@code null} to disable CMCD.
*/
@Nullable
CmcdConfiguration createCmcdConfiguration(MediaItem mediaItem);

/**
Expand Down
14 changes: 14 additions & 0 deletions ...ies/exoplayer/src/test/java/androidx/media3/exoplayer/upstream/CmcdConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows;

import androidx.annotation.Nullable;
import androidx.media3.common.C;
import androidx.media3.common.MediaItem;
import androidx.test.ext.junit.runners.AndroidJUnit4;
Expand Down Expand Up @@ -134,4 +135,17 @@ public int getRequestedMaximumThroughputKbps(int throughputKbps) {
/* throughputKbps= */ 100))
.isEqualTo(200);
}

@Test
public void customFactory_returnsNull() {
CmcdConfiguration.Factory cmcdConfigurationFactory =
mediaItem -> null;
MediaItem mediaItem = new MediaItem.Builder().setMediaId(TEST_MEDIA_ID).build();

@Nullable
CmcdConfiguration cmcdConfiguration =
cmcdConfigurationFactory.createCmcdConfiguration(mediaItem);

assertThat(cmcdConfiguration).isNull();
}
}
2 changes: 1 addition & 1 deletion libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public static final class Factory implements MediaSourceFactory {
private final DashChunkSource.Factory chunkSourceFactory;
@Nullable private final DataSource.Factory manifestDataSourceFactory;

private CmcdConfiguration.Factory cmcdConfigurationFactory;
@Nullable private CmcdConfiguration.Factory cmcdConfigurationFactory;
private DrmSessionManagerProvider drmSessionManagerProvider;
private CompositeSequenceableLoaderFactory compositeSequenceableLoaderFactory;
private LoadErrorHandlingPolicy loadErrorHandlingPolicy;
Expand Down