expo-video 2.1.8 → 2.1.10-canary-20250611-f0afe80

package/CHANGELOG.md

@@ -8,8 +8,36 @@
 
 ### 🐛 Bug fixes
 
+- [Android] Fix aspect ratio of the Picture in Picture window when auto-entering for sources with ratio different from 16:9. ([#37225](https://github.com/expo/expo/pull/37225) by [@behenate](https://github.com/behenate))
+
 ### 💡 Others
 
+## 2.2.1 - 2025-06-10
+
+_This version does not introduce any user-facing changes._
+
+## 2.2.0 - 2025-06-04
+
+### 🎉 New features
+
+- [Android][iOS] Added support for Audio Track feature. You can now set the audio track using `player.audioTrack` and list available audio tracks using `player.availableAudioTracks`. ([#36207](https://github.com/expo/expo/pull/36207) by [@HADeveloper](https://github.com/HADeveloper))
+
+### 🐛 Bug fixes
+
+- [Android] Fix `onFirstFrameRender` not being emitted for sources with `pixelWidthHeightRatio` different than 1. ([#37009](https://github.com/expo/expo/pull/37009) by [@behenate](https://github.com/behenate))
+- [Android] Fix `useExoShutter` prop not being exposed to the JS side. ([#37012](https://github.com/expo/expo/pull/37012) by [@behenate](https://github.com/behenate))
+- [Android] Add missing `onFirstFrameRender` event to the `VideoView` definition. ([#37014](https://github.com/expo/expo/pull/37014) by [@behenate](https://github.com/behenate))
+- [iOS] Fix player not entering 'error' state when loading fails on iOS. ([#37177](https://github.com/expo/expo/pull/37177) by [@behenate](https://github.com/behenate))
+- [iOS] Fix player reporting status `readyToPlay` while a source is being loaded asynchronously. ([#37180](https://github.com/expo/expo/pull/37180) by [@behenate](https://github.com/behenate))
+- [iOS] Fix player going into `loading` status for a single frame when unpausing with a full buffer. ([#37181](https://github.com/expo/expo/pull/37181) by [@behenate](https://github.com/behenate))
+- [iOS] Fix player getting stuck in `loading` state for null sources. ([#37183](https://github.com/expo/expo/pull/37183) by [@behenate](https://github.com/behenate))
+
+## 2.1.9 — 2025-05-08
+
+### 🛠 Breaking changes
+
+- [web] Add crossOrigin prop, change default value to no CORS. ([#36713](https://github.com/expo/expo/pull/36713) by [@aleqsio](https://github.com/aleqsio))
+
 ## 2.1.8 — 2025-04-30
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 group = 'host.exp.exponent'
-version = '2.1.8'
+version = '2.1.10-canary-20250611-f0afe80'
 
 android {
   namespace "expo.modules.video"
   defaultConfig {
     versionCode 1
-    versionName '2.1.8'
+    versionName '2.1.10-canary-20250611-f0afe80'
   }
 }
 

package/android/src/main/java/expo/modules/video/FullscreenPlayerActivity.kt

@@ -12,8 +12,9 @@ import android.widget.ImageButton
 import androidx.media3.ui.PlayerView
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.video.player.VideoPlayer
-import expo.modules.video.utils.applyAutoEnterPiP
+import expo.modules.video.utils.applyPiPParams
 import expo.modules.video.utils.applyRectHint
+import expo.modules.video.utils.calculatePiPAspectRatio
 import expo.modules.video.utils.calculateRectHint
 
 @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
@@ -44,7 +45,10 @@ class FullscreenPlayerActivity : Activity() {
     videoPlayer = videoView.videoPlayer
     videoPlayer?.changePlayerView(playerView)
     VideoManager.registerFullscreenPlayerActivity(hashCode().toString(), this)
-    applyAutoEnterPiP(this, videoView.autoEnterPiP)
+    playerView.player?.let {
+      val aspectRatio = calculatePiPAspectRatio(it.videoSize, playerView.width, playerView.height, videoView.contentFit)
+      applyPiPParams(this, videoView.autoEnterPiP, aspectRatio)
+    }
   }
 
   override fun onPostCreate(savedInstanceState: Bundle?) {

package/android/src/main/java/expo/modules/video/VideoModule.kt

@@ -21,6 +21,7 @@ import expo.modules.video.enums.ContentFit
 import expo.modules.video.player.VideoPlayer
 import expo.modules.video.records.BufferOptions
 import expo.modules.video.records.SubtitleTrack
+import expo.modules.video.records.AudioTrack
 import expo.modules.video.records.VideoSource
 import expo.modules.video.records.VideoThumbnailOptions
 import expo.modules.video.utils.runWithPiPMisconfigurationSoftHandling
@@ -146,6 +147,21 @@ class VideoModule : Module() {
           }
         }
 
+      Property("availableAudioTracks")
+        .get { ref: VideoPlayer ->
+          ref.audioTracks.availableAudioTracks
+        }
+
+      Property("audioTrack")
+        .get { ref: VideoPlayer ->
+          ref.audioTracks.currentAudioTrack
+        }
+        .set { ref: VideoPlayer, audioTrack: AudioTrack? ->
+          appContext.mainQueue.launch {
+            ref.audioTracks.currentAudioTrack = audioTrack
+          }
+        }
+
       Property("currentOffsetFromLive")
         .get { ref: VideoPlayer ->
           runBlocking(appContext.mainQueue.coroutineContext) {
@@ -347,7 +363,8 @@ private inline fun <reified T : VideoView> ViewDefinitionBuilder<T>.VideoViewCom
     "onPictureInPictureStart",
     "onPictureInPictureStop",
     "onFullscreenEnter",
-    "onFullscreenExit"
+    "onFullscreenExit",
+    "onFirstFrameRender"
   )
   Prop("player") { view: T, player: VideoPlayer ->
     view.videoPlayer = player
@@ -369,6 +386,9 @@ private inline fun <reified T : VideoView> ViewDefinitionBuilder<T>.VideoViewCom
     view.playerView.applyRequiresLinearPlayback(linearPlayback)
     view.videoPlayer?.requiresLinearPlayback = linearPlayback
   }
+  Prop("useExoShutter") { view: T, useExoShutter: Boolean? ->
+    view.useExoShutter = useExoShutter
+  }
   AsyncFunction("enterFullscreen") { view: T ->
     view.enterFullscreen()
   }.runOnQueue(Queues.MAIN)

package/android/src/main/java/expo/modules/video/VideoView.kt

@@ -15,6 +15,7 @@ import android.widget.FrameLayout
 import android.widget.ImageButton
 import androidx.fragment.app.FragmentActivity
 import androidx.media3.common.Tracks
+import androidx.media3.common.VideoSize
 import androidx.media3.ui.PlayerView
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerHelper
@@ -27,8 +28,13 @@ import expo.modules.video.delegates.IgnoreSameSet
 import expo.modules.video.enums.ContentFit
 import expo.modules.video.player.VideoPlayer
 import expo.modules.video.player.VideoPlayerListener
-import expo.modules.video.utils.applyAutoEnterPiP
+import expo.modules.video.records.AudioTrack
+import expo.modules.video.records.SubtitleTrack
+import expo.modules.video.records.VideoSource
+import expo.modules.video.records.VideoTrack
+import expo.modules.video.utils.applyPiPParams
 import expo.modules.video.utils.applyRectHint
+import expo.modules.video.utils.calculatePiPAspectRatio
 import expo.modules.video.utils.calculateRectHint
 import expo.modules.video.utils.dispatchMotionEvent
 import java.util.UUID
@@ -55,6 +61,8 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     private set
   var showsSubtitlesButton = false
     private set
+  var showsAudioTracksButton = false
+    private set
 
   private val currentActivity = appContext.throwingActivity
   private val decorView = currentActivity.window.decorView
@@ -70,17 +78,17 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
 
   var useExoShutter: Boolean? = null
     set(value) {
-      if (value == false) {
-        playerView.setShutterBackgroundColor(Color.TRANSPARENT)
-      } else {
+      if (value == true) {
         playerView.setShutterBackgroundColor(Color.BLACK)
+      } else {
+        playerView.setShutterBackgroundColor(Color.TRANSPARENT)
       }
       applySurfaceViewVisibility()
       field = value
     }
 
   var autoEnterPiP: Boolean by IgnoreSameSet(false) { new, _ ->
-    applyAutoEnterPiP(currentActivity, new)
+    applyPiPParams(currentActivity, new, calculateCurrentPipAspectRatio())
   }
 
   var contentFit: ContentFit = ContentFit.CONTAIN
@@ -154,7 +162,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
   }
 
   fun applySurfaceViewVisibility() {
-    if (useExoShutter == false && shouldHideSurfaceView) {
+    if (useExoShutter != true && shouldHideSurfaceView) {
       playerView.videoSurfaceView?.alpha = 0f
     } else {
       playerView.videoSurfaceView?.alpha = 1f
@@ -176,7 +184,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
       currentActivity.overridePendingTransition(0, 0)
     }
     onFullscreenEnter(Unit)
-    applyAutoEnterPiP(currentActivity, false)
+    applyPiPParams(currentActivity, false, calculateCurrentPipAspectRatio())
   }
 
   fun attachPlayer() {
@@ -190,7 +198,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     attachPlayer()
     onFullscreenExit(Unit)
     isInFullscreen = false
-    applyAutoEnterPiP(currentActivity, autoEnterPiP)
+    applyPiPParams(currentActivity, autoEnterPiP, calculateCurrentPipAspectRatio())
   }
 
   fun enterPictureInPicture() {
@@ -201,32 +209,9 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     val player = playerView.player
       ?: throw PictureInPictureEnterException("No player attached to the VideoView")
     playerView.useController = false
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      var aspectRatio = if (contentFit == ContentFit.CONTAIN) {
-        Rational(player.videoSize.width, player.videoSize.height)
-      } else {
-        Rational(width, height)
-      }
-      // AspectRatio for the activity in picture-in-picture, must be between 2.39:1 and 1:2.39 (inclusive).
-      // https://developer.android.com/reference/android/app/PictureInPictureParams.Builder#setAspectRatio(android.util.Rational)
-      val maximumRatio = Rational(239, 100)
-      val minimumRatio = Rational(100, 239)
-      if (aspectRatio.toFloat() > maximumRatio.toFloat()) {
-        aspectRatio = maximumRatio
-      } else if (aspectRatio.toFloat() < minimumRatio.toFloat()) {
-        aspectRatio = minimumRatio
-      }
-
-      currentActivity.setPictureInPictureParams(
-        PictureInPictureParams
-          .Builder()
-          .setAspectRatio(aspectRatio)
-          .build()
-      )
-    }
-
+    applyPiPParams(currentActivity, autoEnterPiP, calculateCurrentPipAspectRatio())
     willEnterPiP = true
+
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       currentActivity.enterPictureInPictureMode(PictureInPictureParams.Builder().build())
     } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -235,6 +220,11 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     }
   }
 
+  private fun calculateCurrentPipAspectRatio(): Rational? {
+    val player = videoPlayer?.player ?: return null
+    return calculatePiPAspectRatio(player.videoSize, this.width, this.height, contentFit)
+  }
+
   /**
    * For optimal picture in picture experience it's best to only have one view. This method
    * hides all children of the root view and makes the player the only visible child of the rootView.
@@ -261,8 +251,25 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     this.addView(playerView)
   }
 
+  override fun onVideoSourceLoaded(
+    player: VideoPlayer,
+    videoSource: VideoSource?,
+    duration: Double?,
+    availableVideoTracks: List<VideoTrack>,
+    availableSubtitleTracks: List<SubtitleTrack>,
+    availableAudioTracks: List<AudioTrack>
+  ) {
+    availableVideoTracks.firstOrNull()?.let {
+      val videoSize = VideoSize(it.size.width, it.size.height)
+      val aspectRatio = calculatePiPAspectRatio(videoSize, this.width, this.height, contentFit)
+      applyPiPParams(currentActivity, autoEnterPiP, aspectRatio)
+    }
+    super.onVideoSourceLoaded(player, videoSource, duration, availableVideoTracks, availableSubtitleTracks, availableAudioTracks)
+  }
+
   override fun onTracksChanged(player: VideoPlayer, tracks: Tracks) {
     showsSubtitlesButton = player.subtitles.availableSubtitleTracks.isNotEmpty()
+    showsAudioTracksButton = player.audioTracks.availableAudioTracks.size > 1
     playerView.setShowSubtitleButton(showsSubtitlesButton)
     super.onTracksChanged(player, tracks)
   }
@@ -299,7 +306,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
         .add(fragment, fragment.id)
         .commitAllowingStateLoss()
     }
-    applyAutoEnterPiP(currentActivity, autoEnterPiP)
+    applyPiPParams(currentActivity, autoEnterPiP)
   }
 
   override fun onDetachedFromWindow() {
@@ -311,7 +318,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
         .remove(fragment)
         .commitAllowingStateLoss()
     }
-    applyAutoEnterPiP(currentActivity, false)
+    applyPiPParams(currentActivity, false)
   }
 
   // After adding the `PlayerView` to the hierarchy the touch events stop being emitted to the JS side.

package/android/src/main/java/expo/modules/video/player/FirstFrameEventGenerator.kt

@@ -64,7 +64,7 @@ internal class FirstFrameEventGenerator(
 
   private fun isPlayerSurfaceLayoutValid(): Boolean {
     // Sometimes the video size announced by the track will is 1px off the render size.
-    val epsilon = 0.01
+    val epsilon = 0.05
     val player = playerReference.get() ?: run {
       return false
     }
@@ -75,13 +75,14 @@ internal class FirstFrameEventGenerator(
     val surfaceHeight = player.surfaceSize.height
     val sourceWidth = player.videoSize.width
     val sourceHeight = player.videoSize.height
+    val sourcePixelWidthHeightRatio = player.videoSize.pixelWidthHeightRatio
 
     if (surfaceWidth == 0 || surfaceHeight == 0) {
       return false
     }
 
     val surfaceAspectRatio = surfaceWidth.toFloat() / surfaceHeight
-    val trackAspectRatio = sourceWidth.toFloat() / sourceHeight
+    val trackAspectRatio = sourceWidth.toFloat() / sourceHeight * sourcePixelWidthHeightRatio
 
     val videoSizeIsUnknown = sourceWidth == 0 || sourceHeight == 0
     val hasFillContentFit = currentPlayerView.resizeMode == ContentFit.FILL.toResizeMode()

package/android/src/main/java/expo/modules/video/player/PlayerEvent.kt

@@ -6,7 +6,9 @@ import androidx.media3.common.Tracks
 import androidx.media3.common.util.UnstableApi
 import expo.modules.video.enums.AudioMixingMode
 import expo.modules.video.enums.PlayerStatus
+import expo.modules.video.records.AudioTrack
 import expo.modules.video.records.AvailableSubtitleTracksChangedEventPayload
+import expo.modules.video.records.AvailableAudioTracksChangedEventPayload
 import expo.modules.video.records.IsPlayingEventPayload
 import expo.modules.video.records.MutedChangedEventPayload
 import expo.modules.video.records.PlaybackError
@@ -15,6 +17,7 @@ import expo.modules.video.records.SourceChangedEventPayload
 import expo.modules.video.records.StatusChangedEventPayload
 import expo.modules.video.records.SubtitleTrack
 import expo.modules.video.records.SubtitleTrackChangedEventPayload
+import expo.modules.video.records.AudioTrackChangedEventPayload
 import expo.modules.video.records.TimeUpdate
 import expo.modules.video.records.VideoEventPayload
 import expo.modules.video.records.VideoSource
@@ -74,6 +77,11 @@ sealed class PlayerEvent {
     override val jsEventPayload = SubtitleTrackChangedEventPayload(subtitleTrack, oldSubtitleTrack)
   }
 
+  data class AudioTrackChanged(val audioTrack: AudioTrack?, val oldAudioTrack: AudioTrack?) : PlayerEvent() {
+    override val name = "audioTrackChange"
+    override val jsEventPayload = AudioTrackChangedEventPayload(audioTrack, oldAudioTrack)
+  }
+
   data class VideoTrackChanged(val videoTrack: VideoTrack?, val oldVideoTrack: VideoTrack?) : PlayerEvent() {
     override val name = "videoTrackChange"
     override val jsEventPayload = VideoTrackChangedEventPayload(videoTrack, oldVideoTrack)
@@ -94,18 +102,28 @@ sealed class PlayerEvent {
     override val jsEventPayload = AvailableSubtitleTracksChangedEventPayload(availableSubtitleTracks, oldAvailableSubtitleTracks)
   }
 
+  data class AvailableAudioTracksChanged(
+    val availableAudioTracks: List<AudioTrack>,
+    val oldAvailableAudioTracks: List<AudioTrack>
+  ) : PlayerEvent() {
+    override val name = "availableAudioTracksChange"
+    override val jsEventPayload = AvailableAudioTracksChangedEventPayload(availableAudioTracks, oldAvailableAudioTracks)
+  }
+
   data class VideoSourceLoaded(
     val videoSource: VideoSource?,
     val duration: Double,
     val availableVideoTracks: List<VideoTrack>,
-    val availableSubtitleTracks: List<SubtitleTrack>
+    val availableSubtitleTracks: List<SubtitleTrack>,
+    val availableAudioTracks: List<AudioTrack>
   ) : PlayerEvent() {
     override val name = "sourceLoad"
     override val jsEventPayload = VideoSourceLoadedEventPayload(
       videoSource,
       duration,
       availableVideoTracks,
-      availableSubtitleTracks
+      availableSubtitleTracks,
+      availableAudioTracks
     )
   }
 
@@ -138,7 +156,8 @@ sealed class PlayerEvent {
       is AudioMixingModeChanged -> listeners.forEach { it.onAudioMixingModeChanged(player, audioMixingMode, oldAudioMixingMode) }
       is VideoTrackChanged -> listeners.forEach { it.onVideoTrackChanged(player, videoTrack, oldVideoTrack) }
       is RenderedFirstFrame -> listeners.forEach { it.onRenderedFirstFrame(player) }
-      // JS-only events - VideoSourceLoaded, SubtitleTrackChanged - In the native events the TracksChanged can be used instead
+      is VideoSourceLoaded -> listeners.forEach { it.onVideoSourceLoaded(player, videoSource, duration, availableVideoTracks, availableSubtitleTracks, availableAudioTracks) }
+      // JS-only events - SubtitleTrackChanged - In the native events the TracksChanged can be used instead
       else -> Unit
     }
   }

package/android/src/main/java/expo/modules/video/player/VideoPlayer.kt

@@ -54,6 +54,7 @@ class VideoPlayer(val context: Context, appContext: AppContext, source: VideoSou
   private var currentPlayerView = MutableWeakReference<PlayerView?>(null)
   val loadControl: VideoPlayerLoadControl = VideoPlayerLoadControl.Builder().build()
   val subtitles: VideoPlayerSubtitles = VideoPlayerSubtitles(this)
+  val audioTracks: VideoPlayerAudioTracks = VideoPlayerAudioTracks(this)
   val trackSelector = DefaultTrackSelector(context)
 
   val player = ExoPlayer
@@ -180,13 +181,17 @@ class VideoPlayer(val context: Context, appContext: AppContext, source: VideoSou
 
     override fun onTracksChanged(tracks: Tracks) {
       val oldSubtitleTracks = ArrayList(subtitles.availableSubtitleTracks)
+      val oldAudioTracks = ArrayList(audioTracks.availableAudioTracks)
       val oldCurrentTrack = subtitles.currentSubtitleTrack
+      val oldCurrentAudioTrack = audioTracks.currentAudioTrack
 
       // Emit the tracks change event to update the subtitles
       sendEvent(PlayerEvent.TracksChanged(tracks))
 
       val newSubtitleTracks = subtitles.availableSubtitleTracks
+      val newAudioTracks = audioTracks.availableAudioTracks
       val newCurrentSubtitleTrack = subtitles.currentSubtitleTrack
+      val newCurrentAudioTrack = audioTracks.currentAudioTrack
       availableVideoTracks = tracks.toVideoTracks()
 
       if (isLoadingNewSource) {
@@ -195,7 +200,8 @@ class VideoPlayer(val context: Context, appContext: AppContext, source: VideoSou
             commitedSource,
             this@VideoPlayer.player.duration / 1000.0,
             availableVideoTracks,
-            newSubtitleTracks
+            newSubtitleTracks,
+            newAudioTracks
           )
         )
         isLoadingNewSource = false
@@ -204,18 +210,27 @@ class VideoPlayer(val context: Context, appContext: AppContext, source: VideoSou
       if (!oldSubtitleTracks.toArray().contentEquals(newSubtitleTracks.toArray())) {
         sendEvent(PlayerEvent.AvailableSubtitleTracksChanged(newSubtitleTracks, oldSubtitleTracks))
       }
+      if (!oldAudioTracks.toArray().contentEquals(newAudioTracks.toArray())) {
+        sendEvent(PlayerEvent.AvailableAudioTracksChanged(newAudioTracks, oldAudioTracks))
+      }
       if (oldCurrentTrack != newCurrentSubtitleTrack) {
         sendEvent(PlayerEvent.SubtitleTrackChanged(newCurrentSubtitleTrack, oldCurrentTrack))
       }
+      if (oldCurrentAudioTrack != newCurrentAudioTrack) {
+        sendEvent(PlayerEvent.AudioTrackChanged(newCurrentAudioTrack, oldCurrentAudioTrack))
+      }
       super.onTracksChanged(tracks)
     }
 
     override fun onTrackSelectionParametersChanged(parameters: TrackSelectionParameters) {
       val oldTrack = subtitles.currentSubtitleTrack
+      val oldAudioTrack = audioTracks.currentAudioTrack
       sendEvent(PlayerEvent.TrackSelectionParametersChanged(parameters))
 
       val newTrack = subtitles.currentSubtitleTrack
+      val newAudioTrack = audioTracks.currentAudioTrack
       sendEvent(PlayerEvent.SubtitleTrackChanged(newTrack, oldTrack))
+      sendEvent(PlayerEvent.AudioTrackChanged(newAudioTrack, oldAudioTrack))
       super.onTrackSelectionParametersChanged(parameters)
     }
 

package/android/src/main/java/expo/modules/video/player/VideoPlayerAudioTracks.kt

@@ -0,0 +1,125 @@
+package expo.modules.video.player
+
+import androidx.annotation.OptIn
+import androidx.media3.common.C
+import androidx.media3.common.Format
+import androidx.media3.common.MimeTypes
+import androidx.media3.common.TrackGroup
+import androidx.media3.common.TrackSelectionOverride
+import androidx.media3.common.TrackSelectionParameters
+import androidx.media3.common.Tracks
+import androidx.media3.common.util.UnstableApi
+import expo.modules.video.records.AudioTrack
+import java.lang.ref.WeakReference
+
+@OptIn(UnstableApi::class)
+class VideoPlayerAudioTracks(owner: VideoPlayer) : VideoPlayerListener {
+  private val owner = WeakReference(owner)
+  private val videoPlayer: VideoPlayer?
+    get() {
+      return owner.get()
+    }
+  private val formatsToGroups = mutableMapOf<Format, Pair<TrackGroup, Int>>()
+  private var currentAudioTrackFormat: Format? = null
+  private var currentOverride: TrackSelectionOverride? = null
+
+  var currentAudioTrack: AudioTrack?
+    get() {
+      return AudioTrack.fromFormat(currentAudioTrackFormat)
+    }
+    set(value) {
+      applyAudioTrack(value)
+    }
+  val availableAudioTracks = arrayListOf<AudioTrack>()
+
+  init {
+    owner.addListener(this)
+  }
+
+  fun setAudioTracksEnabled(enabled: Boolean) {
+    val currentParams = videoPlayer?.player?.trackSelectionParameters ?: return
+    var params = currentParams.buildUpon().setTrackTypeDisabled(C.TRACK_TYPE_AUDIO, !enabled).build()
+    if (!enabled) {
+      params = params.buildUpon().clearOverridesOfType(C.TRACK_TYPE_AUDIO).build()
+    }
+    videoPlayer?.player?.trackSelectionParameters = params
+  }
+
+  // VideoPlayerListener
+  override fun onTrackSelectionParametersChanged(player: VideoPlayer, trackSelectionParameters: TrackSelectionParameters) {
+    currentAudioTrackFormat = findSelectedAudioFormat()
+    super.onTrackSelectionParametersChanged(player, trackSelectionParameters)
+  }
+
+  override fun onTracksChanged(player: VideoPlayer, tracks: Tracks) {
+    formatsToGroups.clear()
+    availableAudioTracks.clear()
+    for (group in tracks.groups) {
+      for (i in 0..<group.length) {
+        val format: Format = group.getTrackFormat(i)
+
+        if (MimeTypes.isAudio(format.sampleMimeType)) {
+          formatsToGroups[format] = group.mediaTrackGroup to i
+          val track = AudioTrack.fromFormat(format) ?: continue
+          availableAudioTracks.add(track)
+        }
+      }
+    }
+    currentAudioTrackFormat = findSelectedAudioFormat()
+    super.onTracksChanged(player, tracks)
+  }
+
+  // Private methods
+  private fun applyAudioTrack(audioTrack: AudioTrack?) {
+    val player = videoPlayer?.player ?: return
+    var newParameters: TrackSelectionParameters = player.trackSelectionParameters
+    currentOverride?.let { override ->
+      newParameters = newParameters.buildUpon().clearOverridesOfType(C.TRACK_TYPE_AUDIO).build()
+    }
+    if (audioTrack == null) {
+      player.trackSelectionParameters = newParameters
+      setAudioTracksEnabled(false)
+      currentOverride = null
+      return
+    }
+    val format = formatsToGroups.keys.firstOrNull {
+      it.id == audioTrack.id
+    }
+    format?.let {
+      formatsToGroups[it]?.let { subtitlePair ->
+        val trackSelectionOverride = TrackSelectionOverride(subtitlePair.first, subtitlePair.second)
+        newParameters = newParameters.buildUpon().addOverride(trackSelectionOverride).build()
+        player.trackSelectionParameters = newParameters
+        setAudioTracksEnabled(true)
+        currentOverride = trackSelectionOverride
+      }
+    }
+  }
+
+  private fun findSelectedAudioFormat(): Format? {
+    val trackSelectionParameters = videoPlayer?.player?.trackSelectionParameters
+    val preferredAudioLanguages = trackSelectionParameters?.preferredAudioLanguages
+    val overriddenFormat: Format? = trackSelectionParameters?.overrides?.let {
+      for ((group, trackSelectionOverride) in it) {
+        if (group.type == C.TRACK_TYPE_AUDIO) {
+          // For audioTracks only one index will be replaced
+          return@let trackSelectionOverride.trackIndices.firstOrNull()?.let { index ->
+            group.getFormat(index)
+          }
+        }
+      }
+      return@let null
+    }
+
+    val preferredFormat: Format? = preferredAudioLanguages?.let { preferredAudioLanguages ->
+      for (preferredLanguage in preferredAudioLanguages) {
+        return@let formatsToGroups.keys.firstOrNull {
+          it.language == preferredLanguage
+        }
+      }
+      return@let null
+    }
+
+    return overriddenFormat ?: preferredFormat
+  }
+}

package/android/src/main/java/expo/modules/video/player/VideoPlayerListener.kt

@@ -6,7 +6,9 @@ import androidx.media3.common.Tracks
 import androidx.media3.common.util.UnstableApi
 import expo.modules.video.enums.AudioMixingMode
 import expo.modules.video.enums.PlayerStatus
+import expo.modules.video.records.AudioTrack
 import expo.modules.video.records.PlaybackError
+import expo.modules.video.records.SubtitleTrack
 import expo.modules.video.records.VideoSource
 import expo.modules.video.records.TimeUpdate
 import expo.modules.video.records.VideoTrack
@@ -25,5 +27,6 @@ interface VideoPlayerListener {
   fun onPlayedToEnd(player: VideoPlayer) {}
   fun onAudioMixingModeChanged(player: VideoPlayer, audioMixingMode: AudioMixingMode, oldAudioMixingMode: AudioMixingMode?) {}
   fun onVideoTrackChanged(player: VideoPlayer, videoTrack: VideoTrack?, oldVideoTrack: VideoTrack?) {}
+  fun onVideoSourceLoaded(player: VideoPlayer, videoSource: VideoSource?, duration: Double?, availableVideoTracks: List<VideoTrack>, availableSubtitleTracks: List<SubtitleTrack>, availableAudioTracks: List<AudioTrack>) {}
   fun onRenderedFirstFrame(player: VideoPlayer) {}
 }

package/android/src/main/java/expo/modules/video/records/Tracks.kt

@@ -29,6 +29,27 @@ class SubtitleTrack(
   }
 }
 
+class AudioTrack(
+  @Field val id: String,
+  @Field val language: String?,
+  @Field val label: String?
+) : Record, Serializable {
+  companion object {
+    fun fromFormat(format: Format?): AudioTrack? {
+      format ?: return null
+      val id = format.id ?: return null
+      val language = format.language
+      val label = language?.let { Locale(it).displayLanguage } ?: "Unknown"
+
+      return AudioTrack(
+        id = id,
+        language = language,
+        label = label
+      )
+    }
+  }
+}
+
 @OptIn(UnstableApi::class)
 class VideoTrack(
   @Field val id: String,

package/android/src/main/java/expo/modules/video/records/VideoEventPayloads.kt

@@ -50,6 +50,11 @@ class SubtitleTrackChangedEventPayload(
   @Field val oldSubtitleTrack: SubtitleTrack?
 ) : VideoEventPayload
 
+class AudioTrackChangedEventPayload(
+  @Field val audioTrack: AudioTrack?,
+  @Field val oldAudioTrack: AudioTrack?
+) : VideoEventPayload
+
 class VideoTrackChangedEventPayload(
   @Field val videoTrack: VideoTrack?,
   @Field val oldVideoTrack: VideoTrack?
@@ -60,9 +65,15 @@ class AvailableSubtitleTracksChangedEventPayload(
   @Field val oldAvailableSubtitleTracks: List<SubtitleTrack>
 ) : VideoEventPayload
 
+class AvailableAudioTracksChangedEventPayload(
+  @Field val availableAudioTracks: List<AudioTrack>,
+  @Field val oldAvailableAudioTracks: List<AudioTrack>
+) : VideoEventPayload
+
 class VideoSourceLoadedEventPayload(
   @Field val videoSource: VideoSource?,
   @Field val duration: Double,
   @Field val availableVideoTracks: List<VideoTrack>,
-  @Field val availableSubtitleTracks: List<SubtitleTrack>
+  @Field val availableSubtitleTracks: List<SubtitleTrack>,
+  @Field val availableAudioTracks: List<AudioTrack>
 ) : VideoEventPayload