sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split creation of AudioCapabilitiesReceiver from instance access

Browse source 
getAudioCapabilities currently creates the receiver and returns
the current capabilities. This is error-prone because the
capabilities are also available as a class field.

This can made cleaner by letting the method just create the receiver
and all access to the capabilities can be made via class field.

PiperOrigin-RevId: 592591590
This commit is contained in:
tonihei 2023-12-20 10:08:38 -08:00 committed by Copybara-Service
parent 770ca66fbc
commit 98519931e7
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java
View file

@ -536,7 +536,7 @@ public final class DefaultAudioSink implements AudioSink {
@Nullable private ByteBuffer inputBuffer; @Nullable private ByteBuffer inputBuffer;
private int inputBufferAccessUnitCount; private int inputBufferAccessUnitCount;
@Nullable private ByteBuffer outputBuffer; @Nullable private ByteBuffer outputBuffer;
private @MonotonicNonNull byte[] preV21OutputBuffer; private byte @MonotonicNonNull [] preV21OutputBuffer;
private int preV21OutputBufferOffset; private int preV21OutputBufferOffset;
private boolean handledEndOfStream; private boolean handledEndOfStream;
private boolean stoppedAudioTrack; private boolean stoppedAudioTrack;
@ -616,6 +616,7 @@ public final class DefaultAudioSink implements AudioSink {
@Override @Override
public @SinkFormatSupport int getFormatSupport(Format format) { public @SinkFormatSupport int getFormatSupport(Format format) {
maybeStartAudioCapabilitiesReceiver();
if (MimeTypes.AUDIO_RAW.equals(format.sampleMimeType)) { if (MimeTypes.AUDIO_RAW.equals(format.sampleMimeType)) {
if (!Util.isEncodingLinearPcm(format.pcmEncoding)) { if (!Util.isEncodingLinearPcm(format.pcmEncoding)) {
Log.w(TAG, "Invalid PCM encoding: " + format.pcmEncoding); Log.w(TAG, "Invalid PCM encoding: " + format.pcmEncoding);
@ -629,7 +630,7 @@ public final class DefaultAudioSink implements AudioSink {
// guaranteed to support. // guaranteed to support.
return SINK_FORMAT_SUPPORTED_WITH_TRANSCODING; return SINK_FORMAT_SUPPORTED_WITH_TRANSCODING;
} }
if (getAudioCapabilities().isPassthroughPlaybackSupported(format)) { if (audioCapabilities.isPassthroughPlaybackSupported(format)) {
return SINK_FORMAT_SUPPORTED_DIRECTLY; return SINK_FORMAT_SUPPORTED_DIRECTLY;
} }
return SINK_FORMAT_UNSUPPORTED; return SINK_FORMAT_UNSUPPORTED;
@ -666,6 +667,7 @@ public final class DefaultAudioSink implements AudioSink {
boolean enableAudioTrackPlaybackParams; boolean enableAudioTrackPlaybackParams;
boolean enableOffloadGapless = false; boolean enableOffloadGapless = false;
maybeStartAudioCapabilitiesReceiver();
if (MimeTypes.AUDIO_RAW.equals(inputFormat.sampleMimeType)) { if (MimeTypes.AUDIO_RAW.equals(inputFormat.sampleMimeType)) {
Assertions.checkArgument(Util.isEncodingLinearPcm(inputFormat.pcmEncoding)); Assertions.checkArgument(Util.isEncodingLinearPcm(inputFormat.pcmEncoding));
@ -734,7 +736,7 @@ public final class DefaultAudioSink implements AudioSink {
outputMode = OUTPUT_MODE_PASSTHROUGH; outputMode = OUTPUT_MODE_PASSTHROUGH;
@Nullable @Nullable
Pair<Integer, Integer> encodingAndChannelConfig = Pair<Integer, Integer> encodingAndChannelConfig =
getAudioCapabilities().getEncodingAndChannelConfigForPassthrough(inputFormat); audioCapabilities.getEncodingAndChannelConfigForPassthrough(inputFormat);
if (encodingAndChannelConfig == null) { if (encodingAndChannelConfig == null) {
throw new ConfigurationException( throw new ConfigurationException(
"Unable to configure passthrough for: " + inputFormat, inputFormat); "Unable to configure passthrough for: " + inputFormat, inputFormat);
@ -1490,7 +1492,7 @@ public final class DefaultAudioSink implements AudioSink {
public void onAudioCapabilitiesChanged(AudioCapabilities audioCapabilities) { public void onAudioCapabilitiesChanged(AudioCapabilities audioCapabilities) {
checkState(playbackLooper == Looper.myLooper()); checkState(playbackLooper == Looper.myLooper());
if (!audioCapabilities.equals(getAudioCapabilities())) { if (!audioCapabilities.equals(this.audioCapabilities)) {
this.audioCapabilities = audioCapabilities; this.audioCapabilities = audioCapabilities;
if (listener != null) { if (listener != null) {
listener.onAudioCapabilitiesChanged(); listener.onAudioCapabilitiesChanged();
@ -1703,7 +1705,7 @@ public final class DefaultAudioSink implements AudioSink {
: writtenEncodedFrames; : writtenEncodedFrames;
} }
private AudioCapabilities getAudioCapabilities() { private void maybeStartAudioCapabilitiesReceiver() {
if (audioCapabilitiesReceiver == null && context != null) { if (audioCapabilitiesReceiver == null && context != null) {
// Must be lazily initialized to receive audio capabilities receiver listener event on the // Must be lazily initialized to receive audio capabilities receiver listener event on the
// current (playback) thread as the constructor is not called in the playback thread. // current (playback) thread as the constructor is not called in the playback thread.
@ -1712,7 +1714,6 @@ public final class DefaultAudioSink implements AudioSink {
new AudioCapabilitiesReceiver(context, this::onAudioCapabilitiesChanged); new AudioCapabilitiesReceiver(context, this::onAudioCapabilitiesChanged);
audioCapabilities = audioCapabilitiesReceiver.register(); audioCapabilities = audioCapabilitiesReceiver.register();
} }
return audioCapabilities;
} }
private static boolean isOffloadedPlayback(AudioTrack audioTrack) { private static boolean isOffloadedPlayback(AudioTrack audioTrack) {