refactor(video_player): change audio track selection from string ID to separate indices

- Replaced concatenated string trackId with separate groupIndex and trackIndex parameters in Android implementation
- Updated iOS/macOS to use trackType and numeric trackId instead of prefixed string format
- Modified Pigeon message definitions and generated code to support new parameter structure

Author: nateshmbhat

packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayer.java

@@ -160,7 +160,8 @@ public ExoPlayer getExoPlayer() {
           // Create audio track data with metadata
           ExoPlayerAudioTrackData audioTrack =
               new ExoPlayerAudioTrackData(
-                  groupIndex + "_" + trackIndex,
+                  (long) groupIndex,
+                  (long) trackIndex,
                   format.label,
                   format.language,
                   isSelected,
@@ -178,26 +179,13 @@ public ExoPlayer getExoPlayer() {
 
   @UnstableApi
   @Override
-  public void selectAudioTrack(@NonNull String trackId) {
+  public void selectAudioTrack(long groupIndex, long trackIndex) {
     if (trackSelector == null) {
       Log.w("VideoPlayer", "Cannot select audio track: track selector is null");
       return;
     }
 
     try {
-      // Parse the trackId (format: "groupIndex_trackIndex")
-      String[] parts = trackId.split("_");
-      if (parts.length != 2) {
-        Log.w(
-            "VideoPlayer",
-            "Cannot select audio track: invalid trackId format '"
-                + trackId
-                + "'. Expected format: 'groupIndex_trackIndex'");
-        return;
-      }
-
-      int groupIndex = Integer.parseInt(parts[0]);
-      int trackIndex = Integer.parseInt(parts[1]);
 
       // Get current tracks
       Tracks tracks = exoPlayer.getCurrentTracks();
@@ -213,10 +201,10 @@ public void selectAudioTrack(@NonNull String trackId) {
         return;
       }
 
-      Tracks.Group group = tracks.getGroups().get(groupIndex);
+      Tracks.Group group = tracks.getGroups().get((int) groupIndex);
 
       // Verify it's an audio track and the track index is valid
-      if (group.getType() != C.TRACK_TYPE_AUDIO || trackIndex >= group.length) {
+      if (group.getType() != C.TRACK_TYPE_AUDIO || (int) trackIndex >= group.length) {
         if (group.getType() != C.TRACK_TYPE_AUDIO) {
           Log.w(
               "VideoPlayer",
@@ -239,16 +227,21 @@ public void selectAudioTrack(@NonNull String trackId) {
 
       // Get the track group and create a selection override
       TrackGroup trackGroup = group.getMediaTrackGroup();
-      TrackSelectionOverride override = new TrackSelectionOverride(trackGroup, trackIndex);
+      TrackSelectionOverride override = new TrackSelectionOverride(trackGroup, (int) trackIndex);
 
       // Apply the track selection override
       trackSelector.setParameters(
           trackSelector.buildUponParameters().setOverrideForType(override).build());
 
-    } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
+    } catch (ArrayIndexOutOfBoundsException e) {
       Log.w(
           "VideoPlayer",
-          "Cannot select audio track: invalid trackId format '" + trackId + "'. " + e.getMessage());
+          "Cannot select audio track: invalid indices (groupIndex: "
+              + groupIndex
+              + ", trackIndex: "
+              + trackIndex
+              + "). "
+              + e.getMessage());
     }
   }
 

packages/video_player/video_player_android/android/src/main/kotlin/io/flutter/plugins/videoplayer/Messages.kt

@@ -461,7 +461,8 @@ data class AudioTrackMessage(
  * Generated class from Pigeon that represents data sent in messages.
  */
 data class ExoPlayerAudioTrackData(
-    val trackId: String,
+    val groupIndex: Long,
+    val trackIndex: Long,
     val label: String? = null,
     val language: String? = null,
     val isSelected: Boolean,
@@ -472,22 +473,32 @@ data class ExoPlayerAudioTrackData(
 ) {
   companion object {
     fun fromList(pigeonVar_list: List<Any?>): ExoPlayerAudioTrackData {
-      val trackId = pigeonVar_list[0] as String
-      val label = pigeonVar_list[1] as String?
-      val language = pigeonVar_list[2] as String?
-      val isSelected = pigeonVar_list[3] as Boolean
-      val bitrate = pigeonVar_list[4] as Long?
-      val sampleRate = pigeonVar_list[5] as Long?
-      val channelCount = pigeonVar_list[6] as Long?
-      val codec = pigeonVar_list[7] as String?
+      val groupIndex = pigeonVar_list[0] as Long
+      val trackIndex = pigeonVar_list[1] as Long
+      val label = pigeonVar_list[2] as String?
+      val language = pigeonVar_list[3] as String?
+      val isSelected = pigeonVar_list[4] as Boolean
+      val bitrate = pigeonVar_list[5] as Long?
+      val sampleRate = pigeonVar_list[6] as Long?
+      val channelCount = pigeonVar_list[7] as Long?
+      val codec = pigeonVar_list[8] as String?
       return ExoPlayerAudioTrackData(
-          trackId, label, language, isSelected, bitrate, sampleRate, channelCount, codec)
+          groupIndex,
+          trackIndex,
+          label,
+          language,
+          isSelected,
+          bitrate,
+          sampleRate,
+          channelCount,
+          codec)
     }
   }
 
   fun toList(): List<Any?> {
     return listOf(
-        trackId,
+        groupIndex,
+        trackIndex,
         label,
         language,
         isSelected,
@@ -841,8 +852,8 @@ interface VideoPlayerInstanceApi {
   fun getBufferedPosition(): Long
   /** Gets the available audio tracks for the video. */
   fun getAudioTracks(): NativeAudioTrackData
-  /** Selects which audio track is chosen for playback from its [trackId] */
-  fun selectAudioTrack(trackId: String)
+  /** Selects which audio track is chosen for playback from its [groupIndex] and [trackIndex] */
+  fun selectAudioTrack(groupIndex: Long, trackIndex: Long)
 
   companion object {
     /** The codec used by VideoPlayerInstanceApi. */
@@ -1062,10 +1073,11 @@ interface VideoPlayerInstanceApi {
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val trackIdArg = args[0] as String
+            val groupIndexArg = args[0] as Long
+            val trackIndexArg = args[1] as Long
             val wrapped: List<Any?> =
                 try {
-                  api.selectAudioTrack(trackIdArg)
+                  api.selectAudioTrack(groupIndexArg, trackIndexArg)
                   listOf(null)
                 } catch (exception: Throwable) {
                   MessagesPigeonUtils.wrapError(exception)

packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/AudioTracksTest.java

@@ -125,7 +125,8 @@ public void testGetAudioTracks_withMultipleAudioTracks() {
 
     // Verify first track
     ExoPlayerAudioTrackData track1 = result.get(0);
-    assertEquals("0_0", track1.getTrackId());
+    assertEquals(0L, track1.getGroupIndex());
+    assertEquals(0L, track1.getTrackIndex());
     assertEquals("English", track1.getLabel());
     assertEquals("en", track1.getLanguage());
     assertTrue(track1.isSelected());
@@ -136,7 +137,8 @@ public void testGetAudioTracks_withMultipleAudioTracks() {
 
     // Verify second track
     ExoPlayerAudioTrackData track2 = result.get(1);
-    assertEquals("1_0", track2.getTrackId());
+    assertEquals(1L, track2.getGroupIndex());
+    assertEquals(0L, track2.getTrackIndex());
     assertEquals("Español", track2.getLabel());
     assertEquals("es", track2.getLanguage());
     assertFalse(track2.isSelected());
@@ -197,7 +199,8 @@ public void testGetAudioTracks_withNullValues() {
     assertEquals(1, result.size());
 
     ExoPlayerAudioTrackData track = result.get(0);
-    assertEquals("0_0", track.getTrackId());
+    assertEquals(0L, track.getGroupIndex());
+    assertEquals(0L, track.getTrackIndex());
     assertNull(track.getLabel()); // Null values should be preserved
     assertNull(track.getLanguage()); // Null values should be preserved
     assertFalse(track.isSelected());
@@ -246,12 +249,16 @@ public void testGetAudioTracks_withMultipleTracksInSameGroup() {
     assertNotNull(result);
     assertEquals(2, result.size());
 
-    // Verify track IDs are unique
+    // Verify track indices are correct
     ExoPlayerAudioTrackData track1 = result.get(0);
     ExoPlayerAudioTrackData track2 = result.get(1);
-    assertEquals("0_0", track1.getTrackId());
-    assertEquals("0_1", track2.getTrackId());
-    assertNotEquals(track1.getTrackId(), track2.getTrackId());
+    assertEquals(0L, track1.getGroupIndex());
+    assertEquals(0L, track1.getTrackIndex());
+    assertEquals(0L, track2.getGroupIndex());
+    assertEquals(1L, track2.getTrackIndex());
+    // Tracks have same group but different track indices
+    assertEquals(track1.getGroupIndex(), track2.getGroupIndex());
+    assertNotEquals(track1.getTrackIndex(), track2.getTrackIndex());
   }
 
   @Test

packages/video_player/video_player_android/lib/src/android_video_player.dart

@@ -235,9 +235,11 @@ class AndroidVideoPlayer extends VideoPlayerPlatform {
     // Convert ExoPlayer tracks to VideoAudioTrack
     if (nativeData.exoPlayerTracks != null) {
       for (final ExoPlayerAudioTrackData track in nativeData.exoPlayerTracks!) {
+        // Construct a string ID from groupIndex and trackIndex for compatibility
+        final String trackId = '${track.groupIndex}_${track.trackIndex}';
         tracks.add(
           VideoAudioTrack(
-            id: track.trackId,
+            id: trackId,
             label: track.label,
             language: track.language,
             isSelected: track.isSelected,
@@ -352,11 +354,22 @@ class _PlayerInstance {
   }
 
   Future<void> selectAudioTrack(String trackId) async {
+    // Parse the trackId to get groupIndex and trackIndex
+    final List<String> parts = trackId.split('_');
+    if (parts.length != 2) {
+      throw ArgumentError(
+        'Invalid trackId format: "$trackId". Expected format: "groupIndex_trackIndex"',
+      );
+    }
+
+    final int groupIndex = int.parse(parts[0]);
+    final int trackIndex = int.parse(parts[1]);
+
     // Create a completer to wait for the track selection to complete
     _audioTrackSelectionCompleter = Completer<void>();
 
     try {
-      await _api.selectAudioTrack(trackId);
+      await _api.selectAudioTrack(groupIndex, trackIndex);
 
       // Wait for the onTracksChanged event from ExoPlayer with a timeout
       await _audioTrackSelectionCompleter!.future.timeout(

packages/video_player/video_player_android/lib/src/messages.g.dart

@@ -469,7 +469,8 @@ class AudioTrackMessage {
 /// Raw audio track data from ExoPlayer Format objects.
 class ExoPlayerAudioTrackData {
   ExoPlayerAudioTrackData({
-    required this.trackId,
+    required this.groupIndex,
+    required this.trackIndex,
     this.label,
     this.language,
     required this.isSelected,
@@ -479,7 +480,9 @@ class ExoPlayerAudioTrackData {
     this.codec,
   });
 
-  String trackId;
+  int groupIndex;
+
+  int trackIndex;
 
   String? label;
 
@@ -497,7 +500,8 @@ class ExoPlayerAudioTrackData {
 
   List<Object?> _toList() {
     return <Object?>[
-      trackId,
+      groupIndex,
+      trackIndex,
       label,
       language,
       isSelected,
@@ -515,14 +519,15 @@ class ExoPlayerAudioTrackData {
   static ExoPlayerAudioTrackData decode(Object result) {
     result as List<Object?>;
     return ExoPlayerAudioTrackData(
-      trackId: result[0]! as String,
-      label: result[1] as String?,
-      language: result[2] as String?,
-      isSelected: result[3]! as bool,
-      bitrate: result[4] as int?,
-      sampleRate: result[5] as int?,
-      channelCount: result[6] as int?,
-      codec: result[7] as String?,
+      groupIndex: result[0]! as int,
+      trackIndex: result[1]! as int,
+      label: result[2] as String?,
+      language: result[3] as String?,
+      isSelected: result[4]! as bool,
+      bitrate: result[5] as int?,
+      sampleRate: result[6] as int?,
+      channelCount: result[7] as int?,
+      codec: result[8] as String?,
     );
   }
 
@@ -1142,8 +1147,8 @@ class VideoPlayerInstanceApi {
     }
   }
 
-  /// Selects which audio track is chosen for playback from its [trackId]
-  Future<void> selectAudioTrack(String trackId) async {
+  /// Selects which audio track is chosen for playback from its [groupIndex] and [trackIndex]
+  Future<void> selectAudioTrack(int groupIndex, int trackIndex) async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.video_player_android.VideoPlayerInstanceApi.selectAudioTrack$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel =
@@ -1153,7 +1158,7 @@ class VideoPlayerInstanceApi {
           binaryMessenger: pigeonVar_binaryMessenger,
         );
     final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(
-      <Object?>[trackId],
+      <Object?>[groupIndex, trackIndex],
     );
     final List<Object?>? pigeonVar_replyList =
         await pigeonVar_sendFuture as List<Object?>?;

packages/video_player/video_player_android/pigeons/messages.dart

@@ -118,7 +118,8 @@ class AudioTrackMessage {
 /// Raw audio track data from ExoPlayer Format objects.
 class ExoPlayerAudioTrackData {
   ExoPlayerAudioTrackData({
-    required this.trackId,
+    required this.groupIndex,
+    required this.trackIndex,
     this.label,
     this.language,
     required this.isSelected,
@@ -128,7 +129,8 @@ class ExoPlayerAudioTrackData {
     this.codec,
   });
 
-  String trackId;
+  int groupIndex;
+  int trackIndex;
   String? label;
   String? language;
   bool isSelected;
@@ -188,8 +190,8 @@ abstract class VideoPlayerInstanceApi {
   /// Gets the available audio tracks for the video.
   NativeAudioTrackData getAudioTracks();
 
-  /// Selects which audio track is chosen for playback from its [trackId]
-  void selectAudioTrack(String trackId);
+  /// Selects which audio track is chosen for playback from its [groupIndex] and [trackIndex]
+  void selectAudioTrack(int groupIndex, int trackIndex);
 }
 
 @EventChannelApi()