Rollback of https://github.com/google/ExoPlayer/commit/962e08d3be3b47166d1628cd1951e115c5cc00be

*** Original commit ***

Add Offload gapless support

Confirmed to work on a Pixel 4 after enabling the feature:
 `setprop vendor.audio.offload.gapless.enabled true`

***

PiperOrigin-RevId: 315946947

library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java

@@ -434,12 +434,7 @@ public final class DefaultAudioSink implements AudioSink {
     }
     }
     if (enableOffload
     if (enableOffload
         && isOffloadedPlaybackSupported(
         && isOffloadedPlaybackSupported(
-            format.channelCount,
-            format.sampleRate,
-            encoding,
-            audioAttributes,
-            format.encoderDelay,
-            format.encoderPadding)) {
+            format.channelCount, format.sampleRate, encoding, audioAttributes)) {
       return true;
       return true;
     }
     }
     return isPassthroughPlaybackSupported(encoding, format.channelCount);
     return isPassthroughPlaybackSupported(encoding, format.channelCount);
@@ -523,13 +518,7 @@ public final class DefaultAudioSink implements AudioSink {
     boolean useOffload =
     boolean useOffload =
         enableOffload
         enableOffload
             && !isInputPcm
             && !isInputPcm
-            && isOffloadedPlaybackSupported(
-                channelCount,
-                sampleRate,
-                encoding,
-                audioAttributes,
-                trimStartFrames,
-                trimEndFrames);
+            && isOffloadedPlaybackSupported(channelCount, sampleRate, encoding, audioAttributes);
 
 
     Configuration pendingConfiguration =
     Configuration pendingConfiguration =
         new Configuration(
         new Configuration(
@@ -544,8 +533,6 @@ public final class DefaultAudioSink implements AudioSink {
             processingEnabled,
             processingEnabled,
             canApplyPlaybackParameters,
             canApplyPlaybackParameters,
             availableAudioProcessors,
             availableAudioProcessors,
-            trimStartFrames,
-            trimEndFrames,
             useOffload);
             useOffload);
     if (isInitialized()) {
     if (isInitialized()) {
       this.pendingConfiguration = pendingConfiguration;
       this.pendingConfiguration = pendingConfiguration;
@@ -591,8 +578,7 @@ public final class DefaultAudioSink implements AudioSink {
             .buildAudioTrack(tunneling, audioAttributes, audioSessionId);
             .buildAudioTrack(tunneling, audioAttributes, audioSessionId);
     if (isOffloadedPlayback(audioTrack)) {
     if (isOffloadedPlayback(audioTrack)) {
       // Receive stream event callbacks on the current (playback) thread.
       // Receive stream event callbacks on the current (playback) thread.
-      offloadStreamEventCallback.register(audioTrack);
-      audioTrack.setOffloadDelayPadding(configuration.trimStartFrames, configuration.trimEndFrames);
+      Assertions.checkNotNull(offloadStreamEventCallback).register(audioTrack);
     }
     }
     int audioSessionId = audioTrack.getAudioSessionId();
     int audioSessionId = audioTrack.getAudioSessionId();
     if (enablePreV21AudioSessionWorkaround) {
     if (enablePreV21AudioSessionWorkaround) {
@@ -670,11 +656,6 @@ public final class DefaultAudioSink implements AudioSink {
         // The current audio track can be reused for the new configuration.
         // The current audio track can be reused for the new configuration.
         configuration = pendingConfiguration;
         configuration = pendingConfiguration;
         pendingConfiguration = null;
         pendingConfiguration = null;
-        if (isOffloadedPlayback(audioTrack)) {
-          audioTrack.setOffloadEndOfStream();
-          audioTrack.setOffloadDelayPadding(
-              configuration.trimStartFrames, configuration.trimEndFrames);
-        }
       }
       }
       // Re-apply playback parameters.
       // Re-apply playback parameters.
       applyPlaybackSpeedAndSkipSilence(presentationTimeUs);
       applyPlaybackSpeedAndSkipSilence(presentationTimeUs);
@@ -1267,24 +1248,14 @@ public final class DefaultAudioSink implements AudioSink {
       int channelCount,
       int channelCount,
       int sampleRateHz,
       int sampleRateHz,
       @C.Encoding int encoding,
       @C.Encoding int encoding,
-      AudioAttributes audioAttributes,
-      int trimStartFrames,
-      int trimEndFrames) {
+      AudioAttributes audioAttributes) {
     if (Util.SDK_INT < 29) {
     if (Util.SDK_INT < 29) {
       return false;
       return false;
     }
     }
     int channelMask = getChannelConfig(channelCount, /* isInputPcm= */ false);
     int channelMask = getChannelConfig(channelCount, /* isInputPcm= */ false);
     AudioFormat audioFormat = getAudioFormat(sampleRateHz, channelMask, encoding);
     AudioFormat audioFormat = getAudioFormat(sampleRateHz, channelMask, encoding);
-    if (!AudioManager.isOffloadedPlaybackSupported(
-        audioFormat, audioAttributes.getAudioAttributesV21())) {
-      return false;
-    }
-    if (trimStartFrames > 0 || trimEndFrames > 0) {
-      // TODO(internal b/158191844): Gapless offload is not supported by all devices and there is no
-      // API to query its support.
-      return false;
-    }
-    return true;
+    return AudioManager.isOffloadedPlaybackSupported(
+        audioFormat, audioAttributes.getAudioAttributesV21());
   }
   }
 
 
   @EnsuresNonNullIf(
   @EnsuresNonNullIf(
@@ -1604,8 +1575,6 @@ public final class DefaultAudioSink implements AudioSink {
     public final boolean processingEnabled;
     public final boolean processingEnabled;
     public final boolean canApplyPlaybackParameters;
     public final boolean canApplyPlaybackParameters;
     public final AudioProcessor[] availableAudioProcessors;
     public final AudioProcessor[] availableAudioProcessors;
-    public int trimStartFrames;
-    public int trimEndFrames;
     public final boolean useOffload;
     public final boolean useOffload;
 
 
     public Configuration(
     public Configuration(
@@ -1620,8 +1589,6 @@ public final class DefaultAudioSink implements AudioSink {
         boolean processingEnabled,
         boolean processingEnabled,
         boolean canApplyPlaybackParameters,
         boolean canApplyPlaybackParameters,
         AudioProcessor[] availableAudioProcessors,
         AudioProcessor[] availableAudioProcessors,
-        int trimStartFrames,
-        int trimEndFrames,
         boolean useOffload) {
         boolean useOffload) {
       this.isInputPcm = isInputPcm;
       this.isInputPcm = isInputPcm;
       this.inputPcmFrameSize = inputPcmFrameSize;
       this.inputPcmFrameSize = inputPcmFrameSize;
@@ -1633,8 +1600,6 @@ public final class DefaultAudioSink implements AudioSink {
       this.processingEnabled = processingEnabled;
       this.processingEnabled = processingEnabled;
       this.canApplyPlaybackParameters = canApplyPlaybackParameters;
       this.canApplyPlaybackParameters = canApplyPlaybackParameters;
       this.availableAudioProcessors = availableAudioProcessors;
       this.availableAudioProcessors = availableAudioProcessors;
-      this.trimStartFrames = trimStartFrames;
-      this.trimEndFrames = trimEndFrames;
       this.useOffload = useOffload;
       this.useOffload = useOffload;
 
 
       // Call computeBufferSize() last as it depends on the other configuration values.
       // Call computeBufferSize() last as it depends on the other configuration values.