From 59af470528f99bf60889f528b381af83f396764a Mon Sep 17 00:00:00 2001 From: Gilad Nadav Date: Wed, 14 Jun 2023 18:16:32 +0300 Subject: [PATCH] Upgrade Exo-Player 2.18.7 Moved the drmSessionManager.setPlayer(playbackLooper, playbackPlayerId); to class setPlayer --- playkit/build.gradle | 2 +- .../com/kaltura/playkit/drm/DeferredDrmSessionManager.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/playkit/build.gradle b/playkit/build.gradle index d67fcb551..286c30203 100644 --- a/playkit/build.gradle +++ b/playkit/build.gradle @@ -41,7 +41,7 @@ tasks.withType(Javadoc) { dependencies { - def exoPlayerVersion = '2.18.4' + def exoPlayerVersion = '2.18.7' api "com.kaltura.playkit:kexoplayer:$exoPlayerVersion" api 'com.google.code.gson:gson:2.8.6' diff --git a/playkit/src/main/java/com/kaltura/playkit/drm/DeferredDrmSessionManager.java b/playkit/src/main/java/com/kaltura/playkit/drm/DeferredDrmSessionManager.java index aa12bc766..0ce71189f 100644 --- a/playkit/src/main/java/com/kaltura/playkit/drm/DeferredDrmSessionManager.java +++ b/playkit/src/main/java/com/kaltura/playkit/drm/DeferredDrmSessionManager.java @@ -116,6 +116,9 @@ public void setLicenseUrl(String license) { public void setPlayer(@NonNull Looper looper, @NonNull PlayerId playerId) { playbackLooper = looper; playbackPlayerId = playerId; + if (drmSessionManager != null) { + drmSessionManager.setPlayer(playbackLooper, playbackPlayerId); + } } @Nullable @@ -143,8 +146,6 @@ public DrmSession acquireSession(@Nullable EventDispatcher eventDispatcher, @Non drmSessionListener.onError(error); } } - - drmSessionManager.setPlayer(playbackLooper, playbackPlayerId); return drmSessionManager.acquireSession(eventDispatcher, format); }