loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Differ AudioManager retrieval to whenever AudioFocusManagement is required

Browse Source
This commit is contained in:
Colin Kho 2024-08-13 10:17:32 -07:00 committed by Ian Baker
parent 4b7c5100f1
commit 6af92b0af3
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/AudioFocusManager.java
View File

@ -160,11 +160,11 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private static final float VOLUME_MULTIPLIER_DUCK = 0.2f; private static final float VOLUME_MULTIPLIER_DUCK = 0.2f;
private static final float VOLUME_MULTIPLIER_DEFAULT = 1.0f; private static final float VOLUME_MULTIPLIER_DEFAULT = 1.0f;
private final AudioManager audioManager;
private final AudioFocusListener focusListener; private final AudioFocusListener focusListener;
private final Context applicationContext;
@Nullable private PlayerControl playerControl; @Nullable private PlayerControl playerControl;
@Nullable private AudioAttributes audioAttributes; @Nullable private AudioAttributes audioAttributes;
@Nullable private AudioManager audioManager;
private @AudioFocusState int audioFocusState; private @AudioFocusState int audioFocusState;
private @AudioFocusGain int focusGainToRequest; private @AudioFocusGain int focusGainToRequest;
private float volumeMultiplier = VOLUME_MULTIPLIER_DEFAULT; private float volumeMultiplier = VOLUME_MULTIPLIER_DEFAULT;
@ -180,9 +180,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
* @param playerControl A {@link PlayerControl} to handle commands from this instance. * @param playerControl A {@link PlayerControl} to handle commands from this instance.
*/ */
public AudioFocusManager(Context context, Handler eventHandler, PlayerControl playerControl) { public AudioFocusManager(Context context, Handler eventHandler, PlayerControl playerControl) {
this.audioManager = this.applicationContext = context;
checkNotNull(
(AudioManager) context.getApplicationContext().getSystemService(Context.AUDIO_SERVICE));
this.playerControl = playerControl; this.playerControl = playerControl;
this.focusListener = new AudioFocusListener(eventHandler); this.focusListener = new AudioFocusListener(eventHandler);
this.audioFocusState = AUDIO_FOCUS_STATE_NOT_REQUESTED; this.audioFocusState = AUDIO_FOCUS_STATE_NOT_REQUESTED;
@ -287,7 +285,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
} }
private int requestAudioFocusDefault() { private int requestAudioFocusDefault() {
return audioManager.requestAudioFocus( return getAudioManager().requestAudioFocus(
focusListener, focusListener,
Util.getStreamTypeForAudioUsage(checkNotNull(audioAttributes).usage), Util.getStreamTypeForAudioUsage(checkNotNull(audioAttributes).usage),
focusGainToRequest); focusGainToRequest);
@ -312,17 +310,17 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
rebuildAudioFocusRequest = false; rebuildAudioFocusRequest = false;
} }
return audioManager.requestAudioFocus(audioFocusRequest); return getAudioManager().requestAudioFocus(audioFocusRequest);
} }
private void abandonAudioFocusDefault() { private void abandonAudioFocusDefault() {
audioManager.abandonAudioFocus(focusListener); getAudioManager().abandonAudioFocus(focusListener);
} }
@RequiresApi(26) @RequiresApi(26)
private void abandonAudioFocusV26() { private void abandonAudioFocusV26() {
if (audioFocusRequest != null) { if (audioFocusRequest != null) {
audioManager.abandonAudioFocusRequest(audioFocusRequest); getAudioManager().abandonAudioFocusRequest(audioFocusRequest);
} }
} }
@ -455,6 +453,13 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
} }
} }
private AudioManager getAudioManager() {
if (audioManager == null) {
audioManager = (AudioManager) applicationContext.getSystemService(Context.AUDIO_SERVICE);
}
return audioManager;
}
// Internal audio focus listener. // Internal audio focus listener.
private class AudioFocusListener implements AudioManager.OnAudioFocusChangeListener { private class AudioFocusListener implements AudioManager.OnAudioFocusChangeListener {