mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-05-08 17:29:02 +01:00
Gifs stop or lower volume of other media playing.
Fixes #14297 Co-authored-by: Alex Hart <alex@signal.org>
This commit is contained in:
committed by
Alex Hart
parent
b81c1eb65c
commit
ad381783f7
@@ -1,14 +1,21 @@
|
||||
package org.thoughtcrime.securesms.video.exo
|
||||
|
||||
import androidx.media3.common.C
|
||||
import androidx.media3.common.Player
|
||||
import androidx.media3.exoplayer.ExoPlayer
|
||||
|
||||
fun ExoPlayer.configureForGifPlayback() {
|
||||
repeatMode = Player.REPEAT_MODE_ALL
|
||||
volume = 0f
|
||||
trackSelectionParameters = trackSelectionParameters.buildUpon()
|
||||
.setTrackTypeDisabled(C.TRACK_TYPE_AUDIO, true)
|
||||
.build()
|
||||
}
|
||||
|
||||
fun ExoPlayer.configureForVideoPlayback() {
|
||||
repeatMode = Player.REPEAT_MODE_OFF
|
||||
volume = 1f
|
||||
trackSelectionParameters = trackSelectionParameters.buildUpon()
|
||||
.setTrackTypeDisabled(C.TRACK_TYPE_AUDIO, false)
|
||||
.build()
|
||||
}
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
package org.thoughtcrime.securesms.video.exo
|
||||
|
||||
import android.app.Application
|
||||
import androidx.media3.common.TrackSelectionParameters
|
||||
import androidx.media3.exoplayer.ExoPlayer
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import org.junit.Assert.assertNotNull
|
||||
import org.junit.Assert.assertThrows
|
||||
@@ -84,7 +86,9 @@ class ExoPlayerPoolTest {
|
||||
): ExoPlayerPool<ExoPlayer> {
|
||||
return object : ExoPlayerPool<ExoPlayer>(maximumReservedPlayers) {
|
||||
override fun createPlayer(): ExoPlayer {
|
||||
return mockk<ExoPlayer>(relaxUnitFun = true)
|
||||
return mockk<ExoPlayer>(relaxUnitFun = true) {
|
||||
every { trackSelectionParameters } returns TrackSelectionParameters.DEFAULT
|
||||
}
|
||||
}
|
||||
|
||||
override fun getMaxSimultaneousPlayback(): Int {
|
||||
|
||||
Reference in New Issue
Block a user