Skip to content

Isolate routing change listeners for API 23 and API 24 in AudioTrack #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nift4 merged 1 commit into from
Aug 23, 2026
Merged

Isolate routing change listeners for API 23 and API 24 in AudioTrack #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 68 additions & 25 deletions libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioTrackAudioOutput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,13 @@ public AudioTrackAudioOutput(
config.bufferSize);

if (capabilityChangeListener != null) {
onRoutingChangedListener = new OnRoutingChangedListener(audioTrack, capabilityChangeListener);
if (SDK_INT >= 24) {
onRoutingChangedListener =
new OnRoutingChangedListenerApi24(audioTrack, capabilityChangeListener);
} else if (SDK_INT >= 23) {
onRoutingChangedListener =
new OnRoutingChangedListenerApi23(audioTrack, capabilityChangeListener);
}
}
offloadStreamEventCallbackV29 = isOffloadedPlayback() ? new StreamEventCallbackV29() : null;
}
Expand Down Expand Up @@ -606,46 +612,83 @@ private InvalidAudioTrackTimestampException(String message) {
}
}

private static final class OnRoutingChangedListener {
private interface OnRoutingChangedListener {
void release();
}

@RequiresApi(23)
private static final class OnRoutingChangedListenerApi23 implements OnRoutingChangedListener {

private final AudioTrack audioTrack;
private final CapabilityChangeListener capabilityChangeListener;
private final Handler playbackThreadHandler;

@Nullable private AudioTrack.OnRoutingChangedListener listenerApi23;
@Nullable private AudioRouting.OnRoutingChangedListener listener;
@Nullable private AudioTrack.OnRoutingChangedListener listener;

private OnRoutingChangedListener(
private OnRoutingChangedListenerApi23(
AudioTrack audioTrack, CapabilityChangeListener capabilityChangeListener) {
this.audioTrack = audioTrack;
this.capabilityChangeListener = capabilityChangeListener;
this.playbackThreadHandler = Util.createHandlerForCurrentLooper();
if (SDK_INT >= 24) {
this.listener = this::onRoutingChanged;
audioTrack.addOnRoutingChangedListener(listener, playbackThreadHandler);
} else {
this.listenerApi23 = this::onRoutingChanged;
audioTrack.addOnRoutingChangedListener(listenerApi23, playbackThreadHandler);
}
this.listener = this::onRoutingChanged;
audioTrack.addOnRoutingChangedListener(listener, playbackThreadHandler);
}

private void release() {
if (SDK_INT >= 24) {
audioTrack.removeOnRoutingChangedListener(checkNotNull(listener));
listener = null;
} else {
audioTrack.removeOnRoutingChangedListener(checkNotNull(listenerApi23));
listenerApi23 = null;
@Override
public void release() {
audioTrack.removeOnRoutingChangedListener(checkNotNull(listener));
listener = null;
}

private void onRoutingChanged(AudioTrack router) {
if (listener == null) {
// Stale event.
return;
}
BackgroundExecutor.get()
.execute(
() -> {
@Nullable AudioDeviceInfo routedDevice = router.getRoutedDevice();
if (routedDevice != null) {
playbackThreadHandler.post(
() -> {
if (listener == null) {
// Stale event.
return;
}
capabilityChangeListener.onRoutedDeviceChanged(routedDevice);
});
}
});
}
}

@RequiresApi(24)
private void onRoutingChanged(AudioRouting router) {
onRoutingChanged((AudioTrack) router);
@RequiresApi(24)
private static final class OnRoutingChangedListenerApi24 implements OnRoutingChangedListener {

private final AudioTrack audioTrack;
private final CapabilityChangeListener capabilityChangeListener;
private final Handler playbackThreadHandler;

@Nullable private AudioRouting.OnRoutingChangedListener listener;

private OnRoutingChangedListenerApi24(
AudioTrack audioTrack, CapabilityChangeListener capabilityChangeListener) {
this.audioTrack = audioTrack;
this.capabilityChangeListener = capabilityChangeListener;
this.playbackThreadHandler = Util.createHandlerForCurrentLooper();
this.listener = this::onRoutingChanged;
audioTrack.addOnRoutingChangedListener(listener, playbackThreadHandler);
}

private void onRoutingChanged(AudioTrack router) {
if (listener == null && listenerApi23 == null) {
@Override
public void release() {
audioTrack.removeOnRoutingChangedListener(checkNotNull(listener));
listener = null;
}

private void onRoutingChanged(AudioRouting router) {
if (listener == null) {
// Stale event.
return;
}
Expand All @@ -656,7 +699,7 @@ private void onRoutingChanged(AudioTrack router) {
if (routedDevice != null) {
playbackThreadHandler.post(
() -> {
if (listener == null && listenerApi23 == null) {
if (listener == null) {
// Stale event.
return;
}
Expand Down