SUP-42513: (PPF CZ) 3201: NG STB Videolibrary (VOD) error

kaltura · Oct 28, 2024 · 66e8f2c · 66e8f2c
1 parent ac22a85
commit 66e8f2c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/playkit/src/main/java/com/kaltura/playkit/KDefaultRenderersFactory.java b/playkit/src/main/java/com/kaltura/playkit/KDefaultRenderersFactory.java
@@ -26,7 +26,8 @@ public class KDefaultRenderersFactory {
 
     public static DefaultRenderersFactory createDecoderInitErrorRetryFactory(
             Context context,
-            PlayerSettings playerSettings
+            PlayerSettings playerSettings,
+            boolean skipFirstCodecReusage
     ) {
         final MediaCodecSupportFormatHelper mediaCodecSupportFormatHelper = new MediaCodecSupportFormatHelper(context);
         return new DefaultRenderersFactory(context) {
@@ -59,6 +60,9 @@ protected void buildVideoRenderers(@NonNull Context context,
                                 eventHandler,
                                 eventListener,
                                 MAX_DROPPED_VIDEO_FRAME_COUNT_TO_NOTIFY) {
+
+                                    private boolean firstCodecReusageSkipped = false;
+
                                     @Override
                                     public void render(long positionUs, long elapsedRealtimeUs) throws ExoPlaybackException {
                                         try {
@@ -101,9 +105,12 @@ protected int supportsFormat(MediaCodecSelector mediaCodecSelector, Format forma
                                     @NonNull
                                     @Override
                                     protected DecoderReuseEvaluation canReuseCodec(@NonNull MediaCodecInfo codecInfo, @NonNull Format oldFormat, @NonNull Format newFormat) {
-                                        if (playerSettings.canReuseCodec()) {
+                                        if (playerSettings.canReuseCodec() && (!skipFirstCodecReusage || firstCodecReusageSkipped)) {
                                             return super.canReuseCodec(codecInfo, oldFormat, newFormat);
                                         } else {
+                                            if (skipFirstCodecReusage) {
+                                                firstCodecReusageSkipped = true;
+                                            }
                                             return new DecoderReuseEvaluation(codecInfo.name,
                                                     oldFormat, newFormat,
                                                     DecoderReuseEvaluation.REUSE_RESULT_NO,

diff --git a/playkit/src/main/java/com/kaltura/playkit/player/ExoPlayerWrapper.java b/playkit/src/main/java/com/kaltura/playkit/player/ExoPlayerWrapper.java
@@ -245,13 +245,17 @@ public void onBandwidthSample(int elapsedMs, long bytes, long bitrate) {
     }
 
     private void initializePlayer() {
+        initializePlayer(false);
+    }
+
+    private void initializePlayer(boolean skipFirstCodecReusage) {
         DefaultTrackSelector trackSelector = initializeTrackSelector();
         if (exoPlayerView instanceof ExoPlayerView) {
             ((ExoPlayerView)exoPlayerView).setUsingSpeedAdjustedRenderer(this.useSpeedAdjustingRenderer);
         }
         DefaultRenderersFactory renderersFactory = this.useSpeedAdjustingRenderer
                 ? SpeedAdjustedRenderersFactory.createSpeedAdjustedRenderersFactory(context, playerSettings, exoPlayerView)
-                : KDefaultRenderersFactory.createDecoderInitErrorRetryFactory(context, playerSettings);
+                : KDefaultRenderersFactory.createDecoderInitErrorRetryFactory(context, playerSettings, skipFirstCodecReusage);
         renderersFactory.setAllowedVideoJoiningTimeMs(playerSettings.getLoadControlBuffers().getAllowedVideoJoiningTimeMs());
         renderersFactory.setEnableDecoderFallback(playerSettings.enableDecoderFallback());
 
@@ -1161,9 +1165,11 @@ private void maybeChangePlayerRenderView() {
     private void maybeReInitPlayerOnSpeedAdjustmentChange(PKMediaFormat format) {
         boolean useSpeedAdjustingRenderer = shouldUseSpeedAdjustingRenderer(format);
         if (useSpeedAdjustingRenderer != this.useSpeedAdjustingRenderer) {
+            // Do not reuse codec first time after switching from multicast to dash content
+            boolean skipFirstCodecReusage = !useSpeedAdjustingRenderer;
             this.useSpeedAdjustingRenderer = useSpeedAdjustingRenderer;
             destroyPlayer(false);
-            initializePlayer();
+            initializePlayer(skipFirstCodecReusage);
         }
     }