From 91cb54b84e4050028a3d710c3e56607302d2146e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 30 Jun 2021 22:17:41 +0100
Subject: [PATCH] Make SkipAndContinueIfSampleTooLarge as default behavior.

Remove experimentalSetSkipAndContinueIfSampleTooLarge() api

PiperOrigin-RevId: 382383498
---
 .../mediacodec/MediaCodecRenderer.java        | 31 +++----------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 988a5286f7..a05190f7eb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -353,7 +353,6 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private boolean enableAsynchronousBufferQueueing;
   private boolean forceAsyncQueueingSynchronizationWorkaround;
   private boolean enableSynchronizeCodecInteractionsWithQueueing;
-  private boolean enableSkipAndContinueIfSampleTooLarge;
   @Nullable private ExoPlaybackException pendingPlaybackException;
   protected DecoderCounters decoderCounters;
   private long outputStreamStartPositionUs;
@@ -470,18 +469,6 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     enableSynchronizeCodecInteractionsWithQueueing = enabled;
   }
 
-  /**
-   * Enables skipping and continuing playback from the next key frame if a sample is encountered
-   * that's too large to fit into one of the decoder's input buffers. When not enabled, playback
-   * will fail in this case.
-   *
-   * <p>This method is experimental, and will be renamed or removed in a future release. It should
-   * only be called before the renderer is used.
-   */
-  public void experimentalSetSkipAndContinueIfSampleTooLarge(boolean enabled) {
-    enableSkipAndContinueIfSampleTooLarge = enabled;
-  }
-
   @Override
   @AdaptiveSupport
   public final int supportsMixedMimeTypeAdaptation() {
@@ -1254,19 +1241,11 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       result = readSource(formatHolder, buffer, /* readFlags= */ 0);
     } catch (InsufficientCapacityException e) {
       onCodecError(e);
-      if (enableSkipAndContinueIfSampleTooLarge) {
-        // Skip the sample that's too large by reading it without its data. Then flush the codec so
-        // that rendering will resume from the next key frame.
-        readSourceOmittingSampleData(/* readFlags= */ 0);
-        flushCodec();
-        return true;
-      } else {
-        throw createRendererException(
-            createDecoderException(e, getCodecInfo()),
-            inputFormat,
-            /* isRecoverable= */ false,
-            PlaybackException.ERROR_CODE_DECODING_FAILED);
-      }
+      // Skip the sample that's too large by reading it without its data. Then flush the codec so
+      // that rendering will resume from the next key frame.
+      readSourceOmittingSampleData(/* readFlags= */ 0);
+      flushCodec();
+      return true;
     }
 
     if (hasReadStreamToEnd()) {