Commit 736242d1 by tianyifeng Committed by Tianyi Feng

Rollback of https://github.com/google/ExoPlayer/commit/927105ed0dc6c811a1057db4b664003cf753ac12

*** Original commit ***

Intercept audio capabilities change in `DefaultAudioSink`

***

PiperOrigin-RevId: 519760267
parent dbb61373
...@@ -24,6 +24,7 @@ import android.os.Handler; ...@@ -24,6 +24,7 @@ import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.audio.AudioCapabilities;
import com.google.android.exoplayer2.audio.AudioRendererEventListener; import com.google.android.exoplayer2.audio.AudioRendererEventListener;
import com.google.android.exoplayer2.audio.AudioSink; import com.google.android.exoplayer2.audio.AudioSink;
import com.google.android.exoplayer2.audio.DefaultAudioSink; import com.google.android.exoplayer2.audio.DefaultAudioSink;
...@@ -648,7 +649,8 @@ public class DefaultRenderersFactory implements RenderersFactory { ...@@ -648,7 +649,8 @@ public class DefaultRenderersFactory implements RenderersFactory {
boolean enableFloatOutput, boolean enableFloatOutput,
boolean enableAudioTrackPlaybackParams, boolean enableAudioTrackPlaybackParams,
boolean enableOffload) { boolean enableOffload) {
return new DefaultAudioSink.Builder(context) return new DefaultAudioSink.Builder()
.setAudioCapabilities(AudioCapabilities.getCapabilities(context))
.setEnableFloatOutput(enableFloatOutput) .setEnableFloatOutput(enableFloatOutput)
.setEnableAudioTrackPlaybackParams(enableAudioTrackPlaybackParams) .setEnableAudioTrackPlaybackParams(enableAudioTrackPlaybackParams)
.setOffloadMode( .setOffloadMode(
......
...@@ -24,7 +24,6 @@ import static java.lang.Math.min; ...@@ -24,7 +24,6 @@ import static java.lang.Math.min;
import static java.lang.annotation.ElementType.TYPE_USE; import static java.lang.annotation.ElementType.TYPE_USE;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context;
import android.media.AudioDeviceInfo; import android.media.AudioDeviceInfo;
import android.media.AudioFormat; import android.media.AudioFormat;
import android.media.AudioManager; import android.media.AudioManager;
...@@ -215,7 +214,6 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -215,7 +214,6 @@ public final class DefaultAudioSink implements AudioSink {
/** A builder to create {@link DefaultAudioSink} instances. */ /** A builder to create {@link DefaultAudioSink} instances. */
public static final class Builder { public static final class Builder {
@Nullable private final Context context;
private AudioCapabilities audioCapabilities; private AudioCapabilities audioCapabilities;
@Nullable private com.google.android.exoplayer2.audio.AudioProcessorChain audioProcessorChain; @Nullable private com.google.android.exoplayer2.audio.AudioProcessorChain audioProcessorChain;
private boolean enableFloatOutput; private boolean enableFloatOutput;
...@@ -224,34 +222,19 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -224,34 +222,19 @@ public final class DefaultAudioSink implements AudioSink {
AudioTrackBufferSizeProvider audioTrackBufferSizeProvider; AudioTrackBufferSizeProvider audioTrackBufferSizeProvider;
@Nullable AudioOffloadListener audioOffloadListener; @Nullable AudioOffloadListener audioOffloadListener;
/** /** Creates a new builder. */
* @deprecated Use {@link #Builder(Context)} instead.
*/
@Deprecated
public Builder() { public Builder() {
this(/* context= */ null);
}
/**
* Creates a new builder.
*
* @param context The {@link Context}.
*/
public Builder(@Nullable Context context) {
this.context = context;
audioCapabilities = DEFAULT_AUDIO_CAPABILITIES; audioCapabilities = DEFAULT_AUDIO_CAPABILITIES;
offloadMode = OFFLOAD_MODE_DISABLED; offloadMode = OFFLOAD_MODE_DISABLED;
audioTrackBufferSizeProvider = AudioTrackBufferSizeProvider.DEFAULT; audioTrackBufferSizeProvider = AudioTrackBufferSizeProvider.DEFAULT;
} }
/** /**
* @deprecated The {@linkplain AudioCapabilities audio capabilities} set to the {@linkplain * Sets audio capabilities for playback on this device. May be {@code null} if the default
* Builder builder} will be effective for the {@link DefaultAudioSink} only in the absence * capabilities (no encoded audio passthrough support) should be assumed.
* of {@linkplain Context context}. If the {@code Context} is {@code null} and the {@code *
* audioCapabilities} is not set to the {@code Builder}, the default capabilities (no * <p>Default is {@link AudioCapabilities#DEFAULT_AUDIO_CAPABILITIES}.
* encoded audio passthrough support) should be assumed.
*/ */
@Deprecated
@CanIgnoreReturnValue @CanIgnoreReturnValue
public Builder setAudioCapabilities(AudioCapabilities audioCapabilities) { public Builder setAudioCapabilities(AudioCapabilities audioCapabilities) {
checkNotNull(audioCapabilities); checkNotNull(audioCapabilities);
...@@ -487,7 +470,6 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -487,7 +470,6 @@ public final class DefaultAudioSink implements AudioSink {
private final PendingExceptionHolder<WriteException> writeExceptionPendingExceptionHolder; private final PendingExceptionHolder<WriteException> writeExceptionPendingExceptionHolder;
private final AudioTrackBufferSizeProvider audioTrackBufferSizeProvider; private final AudioTrackBufferSizeProvider audioTrackBufferSizeProvider;
@Nullable private final AudioOffloadListener audioOffloadListener; @Nullable private final AudioOffloadListener audioOffloadListener;
@Nullable private final AudioCapabilitiesReceiver audioCapabilitiesReceiver;
@Nullable private PlayerId playerId; @Nullable private PlayerId playerId;
@Nullable private Listener listener; @Nullable private Listener listener;
...@@ -537,14 +519,7 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -537,14 +519,7 @@ public final class DefaultAudioSink implements AudioSink {
@RequiresNonNull("#1.audioProcessorChain") @RequiresNonNull("#1.audioProcessorChain")
private DefaultAudioSink(Builder builder) { private DefaultAudioSink(Builder builder) {
audioCapabilitiesReceiver = audioCapabilities = builder.audioCapabilities;
builder.context != null
? new AudioCapabilitiesReceiver(builder.context, this::onAudioCapabilitiesChanged)
: null;
audioCapabilities =
audioCapabilitiesReceiver != null
? audioCapabilitiesReceiver.register()
: builder.audioCapabilities;
audioProcessorChain = builder.audioProcessorChain; audioProcessorChain = builder.audioProcessorChain;
enableFloatOutput = Util.SDK_INT >= 21 && builder.enableFloatOutput; enableFloatOutput = Util.SDK_INT >= 21 && builder.enableFloatOutput;
preferAudioTrackPlaybackParams = Util.SDK_INT >= 23 && builder.enableAudioTrackPlaybackParams; preferAudioTrackPlaybackParams = Util.SDK_INT >= 23 && builder.enableAudioTrackPlaybackParams;
...@@ -1443,21 +1418,6 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -1443,21 +1418,6 @@ public final class DefaultAudioSink implements AudioSink {
offloadDisabledUntilNextConfiguration = false; offloadDisabledUntilNextConfiguration = false;
} }
@Override
public void release() {
if (audioCapabilitiesReceiver != null) {
audioCapabilitiesReceiver.unregister();
}
}
// AudioCapabilitiesReceiver.Listener implementation.
public void onAudioCapabilitiesChanged(AudioCapabilities audioCapabilities) {
if (!audioCapabilities.equals(this.audioCapabilities)) {
this.audioCapabilities = audioCapabilities;
}
}
// Internal methods. // Internal methods.
private void resetSinkStateForFlush() { private void resetSinkStateForFlush() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment