Stream might contain tracks which are not supported by platform. Add …

…isSupported boolean to audio tracks.
telia-oss · Sep 13, 2024 · 447b528 · 447b528
1 parent e9e1446
commit 447b528
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 18 deletions.
diff --git a/android/src/main/java/com/brentvatne/common/api/Track.kt b/android/src/main/java/com/brentvatne/common/api/Track.kt
@@ -8,6 +8,7 @@ class Track {
     var mimeType: String? = null
     var language: String? = null
     var isSelected = false
+    var isSupported = true
     var roleFlags: List<String> = emptyList()
 
     // in bps available only on audio tracks

diff --git a/android/src/main/java/com/brentvatne/common/react/VideoEventEmitter.kt b/android/src/main/java/com/brentvatne/common/react/VideoEventEmitter.kt
@@ -297,6 +297,7 @@ class VideoEventEmitter {
                         if (format.bitrate > 0) putInt("bitrate", format.bitrate)
                         putBoolean("selected", format.isSelected)
                         putArray("roleFlags", roleFlagsToArray(format.roleFlags))
+                        putBoolean("isSupported", format.isSupported)
                     }
                 )
             }

diff --git a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -1462,27 +1462,34 @@ private static boolean isTrackSelected(TrackSelection selection, TrackGroup grou
 
     private ArrayList<Track> getAudioTrackInfo() {
         ArrayList<Track> audioTracks = new ArrayList<>();
-        if (trackSelector == null) {
-            // Likely player is unmounting so no audio tracks are available anymore
-            return audioTracks;
-        }
 
-        MappingTrackSelector.MappedTrackInfo info = trackSelector.getCurrentMappedTrackInfo();
-        int index = getTrackRendererIndex(C.TRACK_TYPE_AUDIO);
-        if (info == null || index == C.INDEX_UNSET) {
-            return audioTracks;
+        if (player.isCommandAvailable(Player.COMMAND_GET_TRACKS)) {
+            Tracks currentTracks = player.getCurrentTracks();
+            for (Tracks.Group trackGroup : currentTracks.getGroups()) {
+                @C.TrackType int trackType = trackGroup.getType();
+
+                if (trackType == C.TRACK_TYPE_AUDIO) {
+                    for (int i = 0; i < trackGroup.length; i++) {
+                        boolean isSupported = trackGroup.isTrackSupported(i);
+                        boolean isSelected = trackGroup.isTrackSelected(i);
+                        Format trackFormat = trackGroup.getTrackFormat(i);
+
+                        Track track = new Track();
+                        track.setIndex(i);
+                        if (trackFormat.sampleMimeType != null)
+                            track.setMimeType(trackFormat.sampleMimeType);
+                        if (trackFormat.language != null) track.setLanguage(trackFormat.language);
+                        if (trackFormat.label != null) track.setTitle(trackFormat.label);
+                        track.setSelected(isSelected);
+                        track.setRoleFlags(Util.getRoleFlagStrings(trackFormat.roleFlags));
+                        track.setSupported(isSupported);
+                        track.setBitrate(trackFormat.bitrate == Format.NO_VALUE ? 0 : trackFormat.bitrate);
+                        audioTracks.add(track);
+                    }
+                }
+            }
         }
-        TrackGroupArray groups = info.getTrackGroups(index);
-        TrackSelectionArray selectionArray = player.getCurrentTrackSelections();
-        TrackSelection selection = selectionArray.get( C.TRACK_TYPE_AUDIO );
 
-        for (int i = 0; i < groups.length; ++i) {
-            TrackGroup group = groups.get(i);
-            Format format = group.getFormat(0);
-            Track audioTrack = exoplayerTrackToGenericTrack(format, i, selection, group);
-            audioTrack.setBitrate(format.bitrate == Format.NO_VALUE ? 0 : format.bitrate);
-            audioTracks.add(audioTrack);
-        }
         return audioTracks;
     }
 

diff --git a/ios/Video/Features/RCTVideoUtils.swift b/ios/Video/Features/RCTVideoUtils.swift
@@ -161,6 +161,7 @@ enum RCTVideoUtils {
                 "language": language ?? "",
                 "selected": currentOption?.displayName == selectedOption?.displayName,
                 "roleFlags": roleFlags,
+                "isSupported": true
             ] as [String: Any]
             audioTracks.add(audioTrack)
         }

diff --git a/src/specs/VideoNativeComponent.ts b/src/specs/VideoNativeComponent.ts
@@ -216,6 +216,7 @@ export type OnAudioTracksData = Readonly<{
     type?: string;
     selected?: boolean;
     roleFlags: string[];
+    isSupported: boolean;
   }[];
 }>;
 

diff --git a/src/types/events.ts b/src/types/events.ts
@@ -40,6 +40,7 @@ export type OnLoadData = Readonly<{
     type?: string;
     selected?: boolean;
     roleFlags: string[];
+    isSupported: boolean;
   }[];
   textTracks: {
     index: number;