fix(FEC-12958): fix multicast change media not performing stop api on…

… TrackSelectionHelper (#798) clean selected track incase of exception
kaltura · Feb 21, 2023 · 678a64a · 678a64a
1 parent 81dcbcb
commit 678a64a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 10 deletions.
diff --git a/playkit/src/main/java/com/kaltura/playkit/player/ExoPlayerWrapper.java b/playkit/src/main/java/com/kaltura/playkit/player/ExoPlayerWrapper.java
@@ -958,7 +958,7 @@ public void onTimelineChanged(@NonNull Timeline timeline, int reason) {
         log.d("onTimelineChanged reason = " + reason + " duration = " + getDuration());
         if (reason == Player.TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED) {
             isLoadedMetaDataFired = false;
-            if (getDuration() != TIME_UNSET) {
+            if (getDuration() != TIME_UNSET || PKMediaFormat.udp.equals(sourceConfig.mediaSource.getMediaFormat())) {
                 sendDistinctEvent(PlayerEvent.Type.DURATION_CHANGE);
                 profiler.onDurationChanged(getDuration());
             }
@@ -1156,7 +1156,6 @@ public void pause() {
             if (currentEvent == PlayerEvent.Type.ENDED) {
                 return;
             }
-
             sendDistinctEvent(PlayerEvent.Type.PAUSE);
             profiler.onPauseRequested();
             player.setPlayWhenReady(false);
@@ -1346,6 +1345,10 @@ public void changeTrack(String uniqueId) {
             try {
                 trackSelectionHelper.changeTrack(uniqueId);
             } catch (IllegalArgumentException ex) {
+                int trackTypeId = trackSelectionHelper.getTrackTypeId(uniqueId);
+                if (trackTypeId >= 0) {
+                   lastSelectedTrackIds[trackTypeId] = TrackSelectionHelper.NONE;
+                }
                 sendTrackSelectionError(uniqueId, ex);
             }
         }

diff --git a/playkit/src/main/java/com/kaltura/playkit/player/PlayerController.java b/playkit/src/main/java/com/kaltura/playkit/player/PlayerController.java
@@ -918,7 +918,7 @@ private PlayerEngine.EventListener initEventListener() {
                         break;
                     case DURATION_CHANGE:
                         event = new PlayerEvent.DurationChanged(getDuration());
-                        if (getDuration() != Consts.TIME_UNSET && isNewEntry) {
+                        if ((getDuration() != Consts.TIME_UNSET || getMediaFormat() == PKMediaFormat.udp) && isNewEntry) {
                             if (mediaConfig.getStartPosition() != null) {
                                 if (mediaConfig.getStartPosition() * MILLISECONDS_MULTIPLIER > getDuration()) {
                                     mediaConfig.setStartPosition(getDuration() / MILLISECONDS_MULTIPLIER);

diff --git a/playkit/src/main/java/com/kaltura/playkit/player/TrackSelectionHelper.java b/playkit/src/main/java/com/kaltura/playkit/player/TrackSelectionHelper.java
@@ -327,7 +327,7 @@ public PKTracks buildTracks(String externalThumbnailWebVttUrl, List<CustomFormat
                                     // in future handle that in hls case for thumbnailInfo
                                     continue;
                                 }
-                                
+
                                 if (!videoTracksAvailable) {
                                     videoTracksAvailable = true;
                                 }
@@ -1149,11 +1149,16 @@ private int restoreLastSelectedTrack(List<? extends BaseTrack> trackList, String
         //If track was previously selected and selection is differed from the default selection apply it.
         String defaultUniqueId = trackList.get(defaultTrackIndex).getUniqueId();
         if (!NONE.equals(lastSelectedTrackId) && !lastSelectedTrackId.equals(defaultUniqueId)) {
-            changeTrack(lastSelectedTrackId);
-            for (int i = 0; i < trackList.size(); i++) {
-                if (lastSelectedTrackId.equals(trackList.get(i).getUniqueId())) {
-                    return i;
+            try {
+                changeTrack(lastSelectedTrackId);
+                for (int i = 0; i < trackList.size(); i++) {
+                    if (lastSelectedTrackId.equals(trackList.get(i).getUniqueId())) {
+                        return i;
+                    }
                 }
+            } catch (IllegalArgumentException ex) {
+                PKError currentError = new PKError(PKPlayerErrorType.UNEXPECTED, PKError.Severity.Fatal, ex.getMessage(), ex);
+                tracksErrorListener.onUnsupportedTracksAvailableError(currentError);
             }
         }
 
@@ -1238,7 +1243,7 @@ private String getUniqueIdPostfix(int rendererIndex, int trackIndex) {
      * @param uniqueId - unique identifier of the track to apply.
      */
 
-    protected void changeTrack(String uniqueId) {
+    protected void changeTrack(String uniqueId) throws IllegalArgumentException {
         if (assertTrackSelectorIsNull("changeTrack")) {
             return;
         }
@@ -1831,24 +1836,43 @@ private int[] validateUniqueId(String uniqueId) throws IllegalArgumentException
                 || uniqueId.contains(TEXT_PREFIX)
                 || uniqueId.contains(IMAGE_PREFIX)
                 && uniqueId.contains(",")) {
-
+            int trackTypeId = getTrackTypeId(uniqueId);
             int[] parsedUniqueId = parseUniqueId(uniqueId);
             if (!isRendererTypeValid(parsedUniqueId[RENDERER_INDEX])) {
+                lastSelectedTrackIds[trackTypeId] = NONE;
                 throw new IllegalArgumentException("Track selection with uniqueId = " + uniqueId + " failed. Due to invalid renderer index. " + parsedUniqueId[RENDERER_INDEX]);
             }
 
             if (!isGroupIndexValid(parsedUniqueId)) {
+                lastSelectedTrackIds[trackTypeId] = NONE;
                 throw new IllegalArgumentException("Track selection with uniqueId = " + uniqueId + " failed. Due to invalid group index. " + parsedUniqueId[GROUP_INDEX]);
             }
 
             if (!isTrackIndexValid(parsedUniqueId)) {
+                lastSelectedTrackIds[trackTypeId] = NONE;
                 throw new IllegalArgumentException("Track selection with uniqueId = " + uniqueId + " failed. Due to invalid track index. " + parsedUniqueId[TRACK_INDEX]);
             }
             return parsedUniqueId;
         }
         throw new IllegalArgumentException("Invalid structure of uniqueId " + uniqueId);
     }
 
+    public int getTrackTypeId(String uniqueId) {
+        if (uniqueId.contains(VIDEO_PREFIX)) {
+            return TRACK_TYPE_VIDEO;
+        }
+        if (uniqueId.contains(AUDIO_PREFIX)) {
+            return TRACK_TYPE_AUDIO;
+        }
+        if (uniqueId.contains(TEXT_PREFIX)) {
+            return TRACK_TYPE_TEXT;
+        }
+        if (uniqueId.contains(IMAGE_PREFIX)) {
+            return TRACK_TYPE_IMAGE;
+        }
+        return -1;
+    }
+
     private boolean isTrackIndexValid(int[] parsedUniqueId) {
         int rendererIndex = parsedUniqueId[RENDERER_INDEX];
         int groupIndex = parsedUniqueId[GROUP_INDEX];