mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Add audio focus handling to voice note playback.

fork-5.53.8
Alex Hart 2022-08-26 11:03:34 -03:00
rodzic 5f6b073cb6
commit cba1caa5be
4 zmienionych plików z 8 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackController.kt
Wyświetl plik

@ -41,7 +41,7 @@ class VoiceNotePlaybackController(
} }
player.playWhenReady = false player.playWhenReady = false
player.setAudioAttributes(attributes, false) player.setAudioAttributes(attributes, true)
if (newStreamType == AudioManager.STREAM_VOICE_CALL) { if (newStreamType == AudioManager.STREAM_VOICE_CALL) {
player.playWhenReady = true player.playWhenReady = true

2
app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackPreparer.java
Wyświetl plik

@ -39,7 +39,7 @@ import java.util.stream.Collectors;
/** /**
* ExoPlayer Preparer for Voice Notes. This only supports ACTION_PLAY_FROM_URI * ExoPlayer Preparer for Voice Notes. This only supports ACTION_PLAY_FROM_URI
*/ */
final class VoiceNotePlaybackPreparer implements MediaSessionConnector.PlaybackPreparer { final class VoiceNotePlaybackPreparer implements MediaSessionConnector.PlaybackPreparer {
private static final String TAG = Log.tag(VoiceNotePlaybackPreparer.class); private static final String TAG = Log.tag(VoiceNotePlaybackPreparer.class);
private static final Executor EXECUTOR = Executors.newSingleThreadExecutor(); private static final Executor EXECUTOR = Executors.newSingleThreadExecutor();

5
app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlayer.kt
Wyświetl plik

@ -5,6 +5,7 @@ import com.google.android.exoplayer2.C
import com.google.android.exoplayer2.DefaultLoadControl import com.google.android.exoplayer2.DefaultLoadControl
import com.google.android.exoplayer2.ForwardingPlayer import com.google.android.exoplayer2.ForwardingPlayer
import com.google.android.exoplayer2.SimpleExoPlayer import com.google.android.exoplayer2.SimpleExoPlayer
import com.google.android.exoplayer2.audio.AudioAttributes
import org.thoughtcrime.securesms.video.exo.SignalMediaSourceFactory import org.thoughtcrime.securesms.video.exo.SignalMediaSourceFactory
class VoiceNotePlayer @JvmOverloads constructor( class VoiceNotePlayer @JvmOverloads constructor(
@ -15,7 +16,9 @@ class VoiceNotePlayer @JvmOverloads constructor(
DefaultLoadControl.Builder() DefaultLoadControl.Builder()
.setBufferDurationsMs(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE) .setBufferDurationsMs(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE)
.build() .build()
).build() ).build().apply {
setAudioAttributes(AudioAttributes.Builder().setContentType(C.AUDIO_CONTENT_TYPE_MUSIC).setUsage(C.USAGE_MEDIA).build(), true)
}
) : ForwardingPlayer(internalPlayer) { ) : ForwardingPlayer(internalPlayer) {
override fun seekTo(windowIndex: Int, positionMs: Long) { override fun seekTo(windowIndex: Int, positionMs: Long) {

4
app/src/test/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackControllerTest.kt
Wyświetl plik

@ -43,7 +43,7 @@ class VoiceNotePlaybackControllerTest {
// THEN // THEN
verify(player).playWhenReady = false verify(player).playWhenReady = false
verify(player).setAudioAttributes(expected, false) verify(player).setAudioAttributes(expected, true)
verify(player).playWhenReady = true verify(player).playWhenReady = true
} }
@ -61,7 +61,7 @@ class VoiceNotePlaybackControllerTest {
// THEN // THEN
verify(player).playWhenReady = false verify(player).playWhenReady = false
verify(player).setAudioAttributes(expected, false) verify(player).setAudioAttributes(expected, true)
verify(player, Mockito.never()).playWhenReady = true verify(player, Mockito.never()).playWhenReady = true
} }