From ecbd361492bd282ec9573afb5eaa0ba16954cb58 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 --- .../ext/ima/ImaServerSideAdInsertionMediaSource.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.java index 433315ae8f..2b698340bd 100644 --- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.java +++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaServerSideAdInsertionMediaSource.java @@ -565,10 +565,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 =