From b8687a3111ce4fc0705a1ad3598dd94aae8dc6a2 Mon Sep 17 00:00:00 2001 From: bachinger Date: Wed, 16 Feb 2022 11:53:27 +0000 Subject: [PATCH] Copy playback configuration when creating the content media item #minor-release PiperOrigin-RevId: 429006934 --- .../ima/ImaServerSideAdInsertionMediaSource.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/ImaServerSideAdInsertionMediaSource.java b/libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/ImaServerSideAdInsertionMediaSource.java index 5ec5b202f6..faa4dc7680 100644 --- a/libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/ImaServerSideAdInsertionMediaSource.java +++ b/libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/ImaServerSideAdInsertionMediaSource.java @@ -567,10 +567,17 @@ public final class ImaServerSideAdInsertionMediaSource extends CompositeMediaSou if (serverSideAdInsertionMediaSource != null) { return; } + MediaItem contentMediaItem = + new MediaItem.Builder() + .setUri(contentUri) + .setDrmConfiguration(checkNotNull(mediaItem.localConfiguration).drmConfiguration) + .setLiveConfiguration(mediaItem.liveConfiguration) + .setCustomCacheKey(mediaItem.localConfiguration.customCacheKey) + .setStreamKeys(mediaItem.localConfiguration.streamKeys) + .build(); ServerSideAdInsertionMediaSource serverSideAdInsertionMediaSource = new ServerSideAdInsertionMediaSource( - contentMediaSourceFactory.createMediaSource(MediaItem.fromUri(contentUri)), - componentListener); + contentMediaSourceFactory.createMediaSource(contentMediaItem), componentListener); this.serverSideAdInsertionMediaSource = serverSideAdInsertionMediaSource; if (isLiveStream) { AdPlaybackState liveAdPlaybackState =