From 310f268a626ee54b6a5de0b2d2f223d10db07894 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 26 Oct 2021 22:30:30 +0100
Subject: [PATCH] Set assumedVideoMinimumCodecOperatingRate for all playbacks

PiperOrigin-RevId: 405736227
---
 .../video/MediaCodecVideoRenderer.java        | 54 +++++++++++++++++--
 1 file changed, 49 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index de6215e0b5..55b6359fef 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -205,7 +205,8 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
         /* enableDecoderFallback= */ false,
         eventHandler,
         eventListener,
-        maxDroppedFramesToNotify);
+        maxDroppedFramesToNotify,
+        /* assumedMinimumCodecOperatingRate= */ 30);
   }
 
   /**
@@ -238,12 +239,11 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
         enableDecoderFallback,
         eventHandler,
         eventListener,
-        maxDroppedFramesToNotify);
+        maxDroppedFramesToNotify,
+        /* assumedMinimumCodecOperatingRate= */ 30);
   }
 
   /**
-   * Creates a new instance.
-   *
    * @param context A context.
    * @param codecAdapterFactory The {@link MediaCodecAdapter.Factory} used to create {@link
    *     MediaCodecAdapter} instances.
@@ -268,12 +268,56 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
       @Nullable Handler eventHandler,
       @Nullable VideoRendererEventListener eventListener,
       int maxDroppedFramesToNotify) {
+
+    this(
+        context,
+        codecAdapterFactory,
+        mediaCodecSelector,
+        allowedJoiningTimeMs,
+        enableDecoderFallback,
+        eventHandler,
+        eventListener,
+        maxDroppedFramesToNotify,
+        /* assumedMinimumCodecOperatingRate= */ 30);
+  }
+
+  /**
+   * Creates a new instance.
+   *
+   * @param context A context.
+   * @param codecAdapterFactory The {@link MediaCodecAdapter.Factory} used to create {@link
+   *     MediaCodecAdapter} instances.
+   * @param mediaCodecSelector A decoder selector.
+   * @param allowedJoiningTimeMs The maximum duration in milliseconds for which this video renderer
+   *     can attempt to seamlessly join an ongoing playback.
+   * @param enableDecoderFallback Whether to enable fallback to lower-priority decoders if decoder
+   *     initialization fails. This may result in using a decoder that is slower/less efficient than
+   *     the primary decoder.
+   * @param eventHandler A handler to use when delivering events to {@code eventListener}. May be
+   *     null if delivery of events is not required.
+   * @param eventListener A listener of events. May be null if delivery of events is not required.
+   * @param maxDroppedFramesToNotify The maximum number of frames that can be dropped between
+   *     invocations of {@link VideoRendererEventListener#onDroppedFrames(int, long)}.
+   * @param assumedMinimumCodecOperatingRate A codec operating rate that all codecs instantiated by
+   *     this renderer are assumed to meet implicitly (i.e. without the operating rate being set
+   *     explicitly using {@link MediaFormat#KEY_OPERATING_RATE}).
+   */
+  public MediaCodecVideoRenderer(
+      Context context,
+      MediaCodecAdapter.Factory codecAdapterFactory,
+      MediaCodecSelector mediaCodecSelector,
+      long allowedJoiningTimeMs,
+      boolean enableDecoderFallback,
+      @Nullable Handler eventHandler,
+      @Nullable VideoRendererEventListener eventListener,
+      int maxDroppedFramesToNotify,
+      float assumedMinimumCodecOperatingRate) {
     super(
         C.TRACK_TYPE_VIDEO,
         codecAdapterFactory,
         mediaCodecSelector,
         enableDecoderFallback,
-        /* assumedMinimumCodecOperatingRate= */ 30);
+        assumedMinimumCodecOperatingRate);
     this.allowedJoiningTimeMs = allowedJoiningTimeMs;
     this.maxDroppedFramesToNotify = maxDroppedFramesToNotify;
     this.context = context.getApplicationContext();