From 23e4236227bc3b85a8422ef43f2158152452097a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 18 Feb 2020 10:29:19 +0000
Subject: [PATCH 01/59] Add missing IntDef to switch

PiperOrigin-RevId: 295692163
---
 .../main/java/com/google/android/exoplayer2/audio/WavUtil.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java
index dff81021de7..208989124a1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java
@@ -61,6 +61,7 @@ public static int getTypeForPcmEncoding(@C.PcmEncoding int pcmEncoding) {
         return TYPE_PCM;
       case C.ENCODING_PCM_FLOAT:
         return TYPE_FLOAT;
+      case C.ENCODING_PCM_16BIT_BIG_ENDIAN: // Not TYPE_PCM, because TYPE_PCM is little endian.
       case C.ENCODING_INVALID:
       case Format.NO_VALUE:
       default:

From ed1eade980677008eb8710b338bb1549a37df137 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 18 Feb 2020 17:00:38 +0000
Subject: [PATCH 02/59] Update stale comment in TrimmingAudioProcessor

The part about leaving the pending trim start byte count unmodified
if the processor was just configured is not correct.

PiperOrigin-RevId: 295745371
---
 .../exoplayer2/audio/TrimmingAudioProcessor.java      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
index 9437e4ac26c..8d84325d932 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
@@ -155,15 +155,16 @@ protected void onQueueEndOfStream() {
   @Override
   protected void onFlush() {
     if (reconfigurationPending) {
+      // This is the initial flush after reconfiguration. Prepare to trim bytes from the start/end.
       reconfigurationPending = false;
       endBuffer = new byte[trimEndFrames * inputAudioFormat.bytesPerFrame];
       pendingTrimStartBytes = trimStartFrames * inputAudioFormat.bytesPerFrame;
     } else {
-      // Audio processors are flushed after initial configuration, so we leave the pending trim
-      // start byte count unmodified if the processor was just configured. Otherwise we (possibly
-      // incorrectly) assume that this is a seek to a non-zero position. We should instead check the
-      // timestamp of the first input buffer queued after flushing to decide whether to trim (see
-      // also [Internal: b/77292509]).
+      // This is a flush during playback (after the initial flush). We assume this was caused by a
+      // seek to a non-zero position and clear pending start bytes. This assumption may be wrong (we
+      // may be seeking to zero), but playing data that should have been trimmed shouldn't be
+      // noticeable after a seek. Ideally we would check the timestamp of the first input buffer
+      // queued after flushing to decide whether to trim (see also [Internal: b/77292509]).
       pendingTrimStartBytes = 0;
     }
     endBufferSize = 0;

From 1818921a20b673f1d45f70659e8f27d4b0dc885b Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Wed, 19 Feb 2020 11:09:53 +0000
Subject: [PATCH 03/59] Catch-and-log all subtitle decode errors

issue:#6885
PiperOrigin-RevId: 295931197
---
 RELEASENOTES.md                               |  6 +++
 .../exoplayer2/decoder/SimpleDecoder.java     |  7 +++-
 .../android/exoplayer2/text/TextRenderer.java | 40 ++++++++++++++-----
 3 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index e23bf592a51..847746d425e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,11 @@
 # Release notes #
 
+### 2.11.4 (not yet released) ###
+
+* Text: Catch-and-log all fatal exceptions in `TextRenderer` instead of
+  re-throwing, allowing playback to continue even if subtitles fail
+  ([#6885](https://github.com/google/ExoPlayer/issues/6885)).
+
 ### 2.11.3 (2020-02-19) ###
 
 * SmoothStreaming: Fix regression that broke playback in 2.11.2
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
index 03aabecb0e7..4eef1ea32de 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
@@ -149,6 +149,7 @@ public final void flush() {
       while (!queuedOutputBuffers.isEmpty()) {
         queuedOutputBuffers.removeFirst().release();
       }
+      exception = null;
     }
   }
 
@@ -225,6 +226,7 @@ private boolean decode() throws InterruptedException {
       if (inputBuffer.isDecodeOnly()) {
         outputBuffer.addFlag(C.BUFFER_FLAG_DECODE_ONLY);
       }
+      @Nullable E exception;
       try {
         exception = decode(inputBuffer, outputBuffer, resetDecoder);
       } catch (RuntimeException e) {
@@ -238,8 +240,9 @@ private boolean decode() throws InterruptedException {
         exception = createUnexpectedDecodeException(e);
       }
       if (exception != null) {
-        // Memory barrier to ensure that the decoder exception is visible from the playback thread.
-        synchronized (lock) {}
+        synchronized (lock) {
+          this.exception = exception;
+        }
         return false;
       }
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
index 058b1c4526b..46c26db1228 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
@@ -23,11 +23,11 @@
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.BaseRenderer;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
 import java.lang.annotation.Documented;
@@ -45,6 +45,8 @@
  */
 public final class TextRenderer extends BaseRenderer implements Callback {
 
+  private static final String TAG = "TextRenderer";
+
   @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
@@ -143,19 +145,13 @@ protected void onStreamChanged(Format[] formats, long offsetUs) {
 
   @Override
   protected void onPositionReset(long positionUs, boolean joining) {
-    clearOutput();
     inputStreamEnded = false;
     outputStreamEnded = false;
-    if (decoderReplacementState != REPLACEMENT_STATE_NONE) {
-      replaceDecoder();
-    } else {
-      releaseBuffers();
-      decoder.flush();
-    }
+    resetOutputAndDecoder();
   }
 
   @Override
-  public void render(long positionUs, long elapsedRealtimeUs) throws ExoPlaybackException {
+  public void render(long positionUs, long elapsedRealtimeUs) {
     if (outputStreamEnded) {
       return;
     }
@@ -165,7 +161,8 @@ public void render(long positionUs, long elapsedRealtimeUs) throws ExoPlaybackEx
       try {
         nextSubtitle = decoder.dequeueOutputBuffer();
       } catch (SubtitleDecoderException e) {
-        throw createRendererException(e, streamFormat);
+        handleDecoderError(e);
+        return;
       }
     }
 
@@ -247,7 +244,8 @@ public void render(long positionUs, long elapsedRealtimeUs) throws ExoPlaybackEx
         }
       }
     } catch (SubtitleDecoderException e) {
-      throw createRendererException(e, streamFormat);
+      handleDecoderError(e);
+      return;
     }
   }
 
@@ -329,4 +327,24 @@ private void invokeUpdateOutputInternal(List<Cue> cues) {
     output.onCues(cues);
   }
 
+  /**
+   * Called when {@link #decoder} throws an exception, so it can be logged and playback can
+   * continue.
+   *
+   * <p>Logs {@code e} and resets state to allow decoding the next sample.
+   */
+  private void handleDecoderError(SubtitleDecoderException e) {
+    Log.e(TAG, "Subtitle decoding failed. streamFormat=" + streamFormat, e);
+    resetOutputAndDecoder();
+  }
+
+  private void resetOutputAndDecoder() {
+    clearOutput();
+    if (decoderReplacementState != REPLACEMENT_STATE_NONE) {
+      replaceDecoder();
+    } else {
+      releaseBuffers();
+      decoder.flush();
+    }
+  }
 }

From 11635191a63e5ba1e1c0bf5b046faeb1b6cfb9a6 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 7 Feb 2020 00:57:15 +0000
Subject: [PATCH 04/59] Switch to new libgav1 frame buffer callback API.

The new code in Libgav1GetFrameBuffer is copied from
libgav1/src/frame_buffer_callback_adaptor.cc. It may become libgav1
utility functions available to libgav1 clients in the future.

The Libgav1FrameBuffer struct in the old frame buffer callback API is
defined as follows:

  typedef struct Libgav1FrameBuffer {
    uint8_t* data[3];
    size_t size[3];
    void* private_data;
  } Libgav1FrameBuffer;

Copy these three fields to the JniFrameBuffer class as private data
members and add the RawBuffer() and Id() getter methods.

The existing AlignTo16 function is replaced by the copied Align template
function.

PiperOrigin-RevId: 293709205
---
 extensions/av1/src/main/jni/gav1_jni.cc | 182 +++++++++++++++++++-----
 1 file changed, 146 insertions(+), 36 deletions(-)

diff --git a/extensions/av1/src/main/jni/gav1_jni.cc b/extensions/av1/src/main/jni/gav1_jni.cc
index 9ac3ea5cd28..29ef3f0ec41 100644
--- a/extensions/av1/src/main/jni/gav1_jni.cc
+++ b/extensions/av1/src/main/jni/gav1_jni.cc
@@ -27,6 +27,7 @@
 #endif  // CPU_FEATURES_COMPILED_ANY_ARM_NEON
 #include <jni.h>
 
+#include <cstdint>
 #include <cstring>
 #include <mutex>  // NOLINT
 #include <new>
@@ -121,15 +122,13 @@ const char* GetJniErrorMessage(JniStatusCode error_code) {
   }
 }
 
-// Manages Libgav1FrameBuffer and reference information.
+// Manages frame buffer and reference information.
 class JniFrameBuffer {
  public:
-  explicit JniFrameBuffer(int id) : id_(id), reference_count_(0) {
-    gav1_frame_buffer_.private_data = &id_;
-  }
+  explicit JniFrameBuffer(int id) : id_(id), reference_count_(0) {}
   ~JniFrameBuffer() {
     for (int plane_index = kPlaneY; plane_index < kMaxPlanes; plane_index++) {
-      delete[] gav1_frame_buffer_.data[plane_index];
+      delete[] raw_buffer_[plane_index];
     }
   }
 
@@ -160,9 +159,8 @@ class JniFrameBuffer {
   void RemoveReference() { reference_count_--; }
   bool InUse() const { return reference_count_ != 0; }
 
-  const Libgav1FrameBuffer& GetGav1FrameBuffer() const {
-    return gav1_frame_buffer_;
-  }
+  uint8_t* RawBuffer(int plane_index) const { return raw_buffer_[plane_index]; }
+  int Id() const { return id_; }
 
   // Attempts to reallocate data planes if the existing ones don't have enough
   // capacity. Returns true if the allocation was successful or wasn't needed,
@@ -172,15 +170,14 @@ class JniFrameBuffer {
     for (int plane_index = kPlaneY; plane_index < kMaxPlanes; plane_index++) {
       const int min_size =
           (plane_index == kPlaneY) ? y_plane_min_size : uv_plane_min_size;
-      if (gav1_frame_buffer_.size[plane_index] >= min_size) continue;
-      delete[] gav1_frame_buffer_.data[plane_index];
-      gav1_frame_buffer_.data[plane_index] =
-          new (std::nothrow) uint8_t[min_size];
-      if (!gav1_frame_buffer_.data[plane_index]) {
-        gav1_frame_buffer_.size[plane_index] = 0;
+      if (raw_buffer_size_[plane_index] >= min_size) continue;
+      delete[] raw_buffer_[plane_index];
+      raw_buffer_[plane_index] = new (std::nothrow) uint8_t[min_size];
+      if (!raw_buffer_[plane_index]) {
+        raw_buffer_size_[plane_index] = 0;
         return false;
       }
-      gav1_frame_buffer_.size[plane_index] = min_size;
+      raw_buffer_size_[plane_index] = min_size;
     }
     return true;
   }
@@ -190,9 +187,12 @@ class JniFrameBuffer {
   uint8_t* plane_[kMaxPlanes];
   int displayed_width_[kMaxPlanes];
   int displayed_height_[kMaxPlanes];
-  int id_;
+  const int id_;
   int reference_count_;
-  Libgav1FrameBuffer gav1_frame_buffer_ = {};
+  // Pointers to the raw buffers allocated for the data planes.
+  uint8_t* raw_buffer_[kMaxPlanes] = {};
+  // Sizes of the raw buffers in bytes.
+  size_t raw_buffer_size_[kMaxPlanes] = {};
 };
 
 // Manages frame buffers used by libgav1 decoder and ExoPlayer.
@@ -210,7 +210,7 @@ class JniBufferManager {
   }
 
   JniStatusCode GetBuffer(size_t y_plane_min_size, size_t uv_plane_min_size,
-                          Libgav1FrameBuffer* frame_buffer) {
+                          JniFrameBuffer** jni_buffer) {
     std::lock_guard<std::mutex> lock(mutex_);
 
     JniFrameBuffer* output_buffer;
@@ -230,7 +230,7 @@ class JniBufferManager {
     }
 
     output_buffer->AddReference();
-    *frame_buffer = output_buffer->GetGav1FrameBuffer();
+    *jni_buffer = output_buffer;
 
     return kJniStatusOk;
   }
@@ -316,33 +316,142 @@ struct JniContext {
   JniStatusCode jni_status_code = kJniStatusOk;
 };
 
-int Libgav1GetFrameBuffer(void* private_data, size_t y_plane_min_size,
-                          size_t uv_plane_min_size,
-                          Libgav1FrameBuffer* frame_buffer) {
-  JniContext* const context = reinterpret_cast<JniContext*>(private_data);
+// Aligns |value| to the desired |alignment|. |alignment| must be a power of 2.
+template <typename T>
+constexpr T Align(T value, T alignment) {
+  const T alignment_mask = alignment - 1;
+  return (value + alignment_mask) & ~alignment_mask;
+}
+
+// Aligns |addr| to the desired |alignment|. |alignment| must be a power of 2.
+uint8_t* AlignAddr(uint8_t* const addr, const size_t alignment) {
+  const auto value = reinterpret_cast<size_t>(addr);
+  return reinterpret_cast<uint8_t*>(Align(value, alignment));
+}
+
+// Libgav1 frame buffer callbacks return 0 on success, -1 on failure.
+
+int Libgav1OnFrameBufferSizeChanged(void* /*callback_private_data*/,
+                                    int /*bitdepth*/,
+                                    libgav1::ImageFormat /*image_format*/,
+                                    int /*width*/, int /*height*/,
+                                    int /*left_border*/, int /*right_border*/,
+                                    int /*top_border*/, int /*bottom_border*/,
+                                    int /*stride_alignment*/) {
+  // The libgav1 decoder calls this callback to provide information on the
+  // subsequent frames in the video. JniBufferManager ignores this information.
+  return 0;
+}
+
+int Libgav1GetFrameBuffer(void* callback_private_data, int bitdepth,
+                          libgav1::ImageFormat image_format, int width,
+                          int height, int left_border, int right_border,
+                          int top_border, int bottom_border,
+                          int stride_alignment,
+                          libgav1::FrameBuffer2* frame_buffer) {
+  bool is_monochrome = false;
+  int8_t subsampling_x = 1;
+  int8_t subsampling_y = 1;
+  switch (image_format) {
+    case libgav1::kImageFormatYuv420:
+      break;
+    case libgav1::kImageFormatYuv422:
+      subsampling_y = 0;
+      break;
+    case libgav1::kImageFormatYuv444:
+      subsampling_x = subsampling_y = 0;
+      break;
+    default:
+      // image_format is libgav1::kImageFormatMonochrome400. (AV1 has only four
+      // image formats, hardcoded in the spec).
+      is_monochrome = true;
+      break;
+  }
+
+  // Calculate y_stride (in bytes). It is padded to a multiple of
+  // |stride_alignment| bytes.
+  int y_stride = width + left_border + right_border;
+  if (bitdepth > 8) y_stride *= sizeof(uint16_t);
+  y_stride = Align(y_stride, stride_alignment);
+  // Size of the Y plane in bytes.
+  const uint64_t y_plane_size =
+      (height + top_border + bottom_border) * static_cast<uint64_t>(y_stride) +
+      (stride_alignment - 1);
+
+  const int uv_width = is_monochrome ? 0 : width >> subsampling_x;
+  const int uv_height = is_monochrome ? 0 : height >> subsampling_y;
+  const int uv_left_border = is_monochrome ? 0 : left_border >> subsampling_x;
+  const int uv_right_border = is_monochrome ? 0 : right_border >> subsampling_x;
+  const int uv_top_border = is_monochrome ? 0 : top_border >> subsampling_y;
+  const int uv_bottom_border =
+      is_monochrome ? 0 : bottom_border >> subsampling_y;
+
+  // Calculate uv_stride (in bytes). It is padded to a multiple of
+  // |stride_alignment| bytes.
+  int uv_stride = uv_width + uv_left_border + uv_right_border;
+  if (bitdepth > 8) uv_stride *= sizeof(uint16_t);
+  uv_stride = Align(uv_stride, stride_alignment);
+  // Size of the U or V plane in bytes.
+  const uint64_t uv_plane_size =
+      is_monochrome ? 0
+                    : (uv_height + uv_top_border + uv_bottom_border) *
+                              static_cast<uint64_t>(uv_stride) +
+                          (stride_alignment - 1);
+
+  // Check if it is safe to cast y_plane_size and uv_plane_size to size_t.
+  if (y_plane_size > SIZE_MAX || uv_plane_size > SIZE_MAX) {
+    return -1;
+  }
+
+  JniContext* const context =
+      reinterpret_cast<JniContext*>(callback_private_data);
+  JniFrameBuffer* jni_buffer;
   context->jni_status_code = context->buffer_manager.GetBuffer(
-      y_plane_min_size, uv_plane_min_size, frame_buffer);
+      static_cast<size_t>(y_plane_size), static_cast<size_t>(uv_plane_size),
+      &jni_buffer);
   if (context->jni_status_code != kJniStatusOk) {
     LOGE("%s", GetJniErrorMessage(context->jni_status_code));
     return -1;
   }
+
+  uint8_t* const y_buffer = jni_buffer->RawBuffer(0);
+  uint8_t* const u_buffer = !is_monochrome ? jni_buffer->RawBuffer(1) : nullptr;
+  uint8_t* const v_buffer = !is_monochrome ? jni_buffer->RawBuffer(2) : nullptr;
+
+  int left_border_bytes = left_border;
+  int uv_left_border_bytes = uv_left_border;
+  if (bitdepth > 8) {
+    left_border_bytes *= sizeof(uint16_t);
+    uv_left_border_bytes *= sizeof(uint16_t);
+  }
+  frame_buffer->plane[0] = AlignAddr(
+      y_buffer + (top_border * y_stride) + left_border_bytes, stride_alignment);
+  frame_buffer->plane[1] =
+      AlignAddr(u_buffer + (uv_top_border * uv_stride) + uv_left_border_bytes,
+                stride_alignment);
+  frame_buffer->plane[2] =
+      AlignAddr(v_buffer + (uv_top_border * uv_stride) + uv_left_border_bytes,
+                stride_alignment);
+
+  frame_buffer->stride[0] = y_stride;
+  frame_buffer->stride[1] = frame_buffer->stride[2] = uv_stride;
+
+  frame_buffer->private_data = reinterpret_cast<void*>(jni_buffer->Id());
+
   return 0;
 }
 
-int Libgav1ReleaseFrameBuffer(void* private_data,
-                              Libgav1FrameBuffer* frame_buffer) {
-  JniContext* const context = reinterpret_cast<JniContext*>(private_data);
-  const int buffer_id = *reinterpret_cast<int*>(frame_buffer->private_data);
+void Libgav1ReleaseFrameBuffer(void* callback_private_data,
+                               void* buffer_private_data) {
+  JniContext* const context =
+      reinterpret_cast<JniContext*>(callback_private_data);
+  const int buffer_id = reinterpret_cast<int>(buffer_private_data);
   context->jni_status_code = context->buffer_manager.ReleaseBuffer(buffer_id);
   if (context->jni_status_code != kJniStatusOk) {
     LOGE("%s", GetJniErrorMessage(context->jni_status_code));
-    return -1;
   }
-  return 0;
 }
 
-constexpr int AlignTo16(int value) { return (value + 15) & (~15); }
-
 void CopyPlane(const uint8_t* source, int source_stride, uint8_t* destination,
                int destination_stride, int width, int height) {
   while (height--) {
@@ -508,8 +617,9 @@ DECODER_FUNC(jlong, gav1Init, jint threads) {
 
   libgav1::DecoderSettings settings;
   settings.threads = threads;
-  settings.get = Libgav1GetFrameBuffer;
-  settings.release = Libgav1ReleaseFrameBuffer;
+  settings.on_frame_buffer_size_changed = Libgav1OnFrameBufferSizeChanged;
+  settings.get_frame_buffer = Libgav1GetFrameBuffer;
+  settings.release_frame_buffer = Libgav1ReleaseFrameBuffer;
   settings.callback_private_data = context;
 
   context->libgav1_status_code = context->decoder.Init(&settings);
@@ -619,7 +729,7 @@ DECODER_FUNC(jint, gav1GetFrame, jlong jContext, jobject jOutputBuffer,
     }
 
     const int buffer_id =
-        *reinterpret_cast<int*>(decoder_buffer->buffer_private_data);
+        reinterpret_cast<int>(decoder_buffer->buffer_private_data);
     context->buffer_manager.AddBufferReference(buffer_id);
     JniFrameBuffer* const jni_buffer =
         context->buffer_manager.GetBuffer(buffer_id);
@@ -680,7 +790,7 @@ DECODER_FUNC(jint, gav1RenderFrame, jlong jContext, jobject jSurface,
   const int32_t native_window_buffer_uv_height =
       (native_window_buffer.height + 1) / 2;
   const int native_window_buffer_uv_stride =
-      AlignTo16(native_window_buffer.stride / 2);
+      Align(native_window_buffer.stride / 2, 16);
 
   // TODO(b/140606738): Handle monochrome videos.
 

From 0acc95cfbbb9c164c7321d7be98d425430245907 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 7 Feb 2020 15:51:27 +0000
Subject: [PATCH 05/59] Cast void* to JniContext* using static_cast.

static_cast is more appropriate than reinrerpret_cast for casting from
void* to JniContext*. See Section 7.2.1 (page 173) in The C++
Programming Language, 4th Edition and
https://stackoverflow.com/questions/310451/should-i-use-static-cast-or-reinterpret-cast-when-casting-a-void-to-whatever

PiperOrigin-RevId: 293812940
---
 extensions/av1/src/main/jni/gav1_jni.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/extensions/av1/src/main/jni/gav1_jni.cc b/extensions/av1/src/main/jni/gav1_jni.cc
index 29ef3f0ec41..8ba4413fea6 100644
--- a/extensions/av1/src/main/jni/gav1_jni.cc
+++ b/extensions/av1/src/main/jni/gav1_jni.cc
@@ -403,8 +403,7 @@ int Libgav1GetFrameBuffer(void* callback_private_data, int bitdepth,
     return -1;
   }
 
-  JniContext* const context =
-      reinterpret_cast<JniContext*>(callback_private_data);
+  JniContext* const context = static_cast<JniContext*>(callback_private_data);
   JniFrameBuffer* jni_buffer;
   context->jni_status_code = context->buffer_manager.GetBuffer(
       static_cast<size_t>(y_plane_size), static_cast<size_t>(uv_plane_size),
@@ -443,8 +442,7 @@ int Libgav1GetFrameBuffer(void* callback_private_data, int bitdepth,
 
 void Libgav1ReleaseFrameBuffer(void* callback_private_data,
                                void* buffer_private_data) {
-  JniContext* const context =
-      reinterpret_cast<JniContext*>(callback_private_data);
+  JniContext* const context = static_cast<JniContext*>(callback_private_data);
   const int buffer_id = reinterpret_cast<int>(buffer_private_data);
   context->jni_status_code = context->buffer_manager.ReleaseBuffer(buffer_id);
   if (context->jni_status_code != kJniStatusOk) {

From b73f6b6ef06bd2c2af6e490bf3a47cf2cebab864 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 14 Feb 2020 21:16:57 +0000
Subject: [PATCH 06/59] gav1_jni: fix pointer->int conversion warnings

fixes:
gav1_jni.cc:446:25: error: cast from pointer to smaller type 'int' loses information
  const int buffer_id = reinterpret_cast<int>(buffer_private_data);
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
gav1_jni.cc:730:9: error: cast from pointer to smaller type 'int' loses information
        reinterpret_cast<int>(decoder_buffer->buffer_private_data);
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

after https://github.com/google/ExoPlayer/commit/0915998add5918214fa0282a69b50a159168a6d5

PiperOrigin-RevId: 295211245
---
 extensions/av1/src/main/jni/gav1_jni.cc | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/extensions/av1/src/main/jni/gav1_jni.cc b/extensions/av1/src/main/jni/gav1_jni.cc
index 8ba4413fea6..30c88693df7 100644
--- a/extensions/av1/src/main/jni/gav1_jni.cc
+++ b/extensions/av1/src/main/jni/gav1_jni.cc
@@ -27,6 +27,8 @@
 #endif  // CPU_FEATURES_COMPILED_ANY_ARM_NEON
 #include <jni.h>
 
+#include <cassert>
+#include <climits>
 #include <cstdint>
 #include <cstring>
 #include <mutex>  // NOLINT
@@ -443,8 +445,10 @@ int Libgav1GetFrameBuffer(void* callback_private_data, int bitdepth,
 void Libgav1ReleaseFrameBuffer(void* callback_private_data,
                                void* buffer_private_data) {
   JniContext* const context = static_cast<JniContext*>(callback_private_data);
-  const int buffer_id = reinterpret_cast<int>(buffer_private_data);
-  context->jni_status_code = context->buffer_manager.ReleaseBuffer(buffer_id);
+  const intptr_t buffer_id = reinterpret_cast<intptr_t>(buffer_private_data);
+  assert(buffer_id <= INT_MAX);
+  context->jni_status_code =
+      context->buffer_manager.ReleaseBuffer(static_cast<int>(buffer_id));
   if (context->jni_status_code != kJniStatusOk) {
     LOGE("%s", GetJniErrorMessage(context->jni_status_code));
   }
@@ -726,11 +730,12 @@ DECODER_FUNC(jint, gav1GetFrame, jlong jContext, jobject jOutputBuffer,
       return kStatusError;
     }
 
-    const int buffer_id =
-        reinterpret_cast<int>(decoder_buffer->buffer_private_data);
-    context->buffer_manager.AddBufferReference(buffer_id);
+    const intptr_t buffer_id =
+        reinterpret_cast<intptr_t>(decoder_buffer->buffer_private_data);
+    assert(buffer_id <= INT_MAX);
+    context->buffer_manager.AddBufferReference(static_cast<int>(buffer_id));
     JniFrameBuffer* const jni_buffer =
-        context->buffer_manager.GetBuffer(buffer_id);
+        context->buffer_manager.GetBuffer(static_cast<int>(buffer_id));
     jni_buffer->SetFrameData(*decoder_buffer);
     env->CallVoidMethod(jOutputBuffer, context->init_for_private_frame_method,
                         decoder_buffer->displayed_width[kPlaneY],
@@ -739,7 +744,8 @@ DECODER_FUNC(jint, gav1GetFrame, jlong jContext, jobject jOutputBuffer,
       // Exception is thrown in Java when returning from the native call.
       return kStatusError;
     }
-    env->SetIntField(jOutputBuffer, context->decoder_private_field, buffer_id);
+    env->SetIntField(jOutputBuffer, context->decoder_private_field,
+                     static_cast<int>(buffer_id));
   }
 
   return kStatusOk;

From 766b383d274ebbf9ebe387b0abe8df9dc323f8eb Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 17 Feb 2020 11:00:56 +0000
Subject: [PATCH 07/59] Use libgav1 frame buffer callback helper functions

Libgav1 recently added the ComputeFrameBufferInfo() and SetFrameBuffer()
helper functions for writing frame buffer callbacks. Using them
simplifies the Libgav1GetFrameBuffer() function.

Also resurrect the AlignTo16() function.

PiperOrigin-RevId: 295548330
---
 extensions/av1/src/main/jni/gav1_jni.cc | 111 ++++--------------------
 1 file changed, 18 insertions(+), 93 deletions(-)

diff --git a/extensions/av1/src/main/jni/gav1_jni.cc b/extensions/av1/src/main/jni/gav1_jni.cc
index 30c88693df7..4ce614a3d97 100644
--- a/extensions/av1/src/main/jni/gav1_jni.cc
+++ b/extensions/av1/src/main/jni/gav1_jni.cc
@@ -318,19 +318,6 @@ struct JniContext {
   JniStatusCode jni_status_code = kJniStatusOk;
 };
 
-// Aligns |value| to the desired |alignment|. |alignment| must be a power of 2.
-template <typename T>
-constexpr T Align(T value, T alignment) {
-  const T alignment_mask = alignment - 1;
-  return (value + alignment_mask) & ~alignment_mask;
-}
-
-// Aligns |addr| to the desired |alignment|. |alignment| must be a power of 2.
-uint8_t* AlignAddr(uint8_t* const addr, const size_t alignment) {
-  const auto value = reinterpret_cast<size_t>(addr);
-  return reinterpret_cast<uint8_t*>(Align(value, alignment));
-}
-
 // Libgav1 frame buffer callbacks return 0 on success, -1 on failure.
 
 int Libgav1OnFrameBufferSizeChanged(void* /*callback_private_data*/,
@@ -351,95 +338,31 @@ int Libgav1GetFrameBuffer(void* callback_private_data, int bitdepth,
                           int top_border, int bottom_border,
                           int stride_alignment,
                           libgav1::FrameBuffer2* frame_buffer) {
-  bool is_monochrome = false;
-  int8_t subsampling_x = 1;
-  int8_t subsampling_y = 1;
-  switch (image_format) {
-    case libgav1::kImageFormatYuv420:
-      break;
-    case libgav1::kImageFormatYuv422:
-      subsampling_y = 0;
-      break;
-    case libgav1::kImageFormatYuv444:
-      subsampling_x = subsampling_y = 0;
-      break;
-    default:
-      // image_format is libgav1::kImageFormatMonochrome400. (AV1 has only four
-      // image formats, hardcoded in the spec).
-      is_monochrome = true;
-      break;
-  }
-
-  // Calculate y_stride (in bytes). It is padded to a multiple of
-  // |stride_alignment| bytes.
-  int y_stride = width + left_border + right_border;
-  if (bitdepth > 8) y_stride *= sizeof(uint16_t);
-  y_stride = Align(y_stride, stride_alignment);
-  // Size of the Y plane in bytes.
-  const uint64_t y_plane_size =
-      (height + top_border + bottom_border) * static_cast<uint64_t>(y_stride) +
-      (stride_alignment - 1);
-
-  const int uv_width = is_monochrome ? 0 : width >> subsampling_x;
-  const int uv_height = is_monochrome ? 0 : height >> subsampling_y;
-  const int uv_left_border = is_monochrome ? 0 : left_border >> subsampling_x;
-  const int uv_right_border = is_monochrome ? 0 : right_border >> subsampling_x;
-  const int uv_top_border = is_monochrome ? 0 : top_border >> subsampling_y;
-  const int uv_bottom_border =
-      is_monochrome ? 0 : bottom_border >> subsampling_y;
-
-  // Calculate uv_stride (in bytes). It is padded to a multiple of
-  // |stride_alignment| bytes.
-  int uv_stride = uv_width + uv_left_border + uv_right_border;
-  if (bitdepth > 8) uv_stride *= sizeof(uint16_t);
-  uv_stride = Align(uv_stride, stride_alignment);
-  // Size of the U or V plane in bytes.
-  const uint64_t uv_plane_size =
-      is_monochrome ? 0
-                    : (uv_height + uv_top_border + uv_bottom_border) *
-                              static_cast<uint64_t>(uv_stride) +
-                          (stride_alignment - 1);
-
-  // Check if it is safe to cast y_plane_size and uv_plane_size to size_t.
-  if (y_plane_size > SIZE_MAX || uv_plane_size > SIZE_MAX) {
-    return -1;
-  }
+  libgav1::FrameBufferInfo info;
+  Libgav1StatusCode status = libgav1::ComputeFrameBufferInfo(
+      bitdepth, image_format, width, height, left_border, right_border,
+      top_border, bottom_border, stride_alignment, &info);
+  if (status != kLibgav1StatusOk) return -1;
 
   JniContext* const context = static_cast<JniContext*>(callback_private_data);
   JniFrameBuffer* jni_buffer;
   context->jni_status_code = context->buffer_manager.GetBuffer(
-      static_cast<size_t>(y_plane_size), static_cast<size_t>(uv_plane_size),
-      &jni_buffer);
+      info.y_buffer_size, info.uv_buffer_size, &jni_buffer);
   if (context->jni_status_code != kJniStatusOk) {
     LOGE("%s", GetJniErrorMessage(context->jni_status_code));
     return -1;
   }
 
   uint8_t* const y_buffer = jni_buffer->RawBuffer(0);
-  uint8_t* const u_buffer = !is_monochrome ? jni_buffer->RawBuffer(1) : nullptr;
-  uint8_t* const v_buffer = !is_monochrome ? jni_buffer->RawBuffer(2) : nullptr;
-
-  int left_border_bytes = left_border;
-  int uv_left_border_bytes = uv_left_border;
-  if (bitdepth > 8) {
-    left_border_bytes *= sizeof(uint16_t);
-    uv_left_border_bytes *= sizeof(uint16_t);
-  }
-  frame_buffer->plane[0] = AlignAddr(
-      y_buffer + (top_border * y_stride) + left_border_bytes, stride_alignment);
-  frame_buffer->plane[1] =
-      AlignAddr(u_buffer + (uv_top_border * uv_stride) + uv_left_border_bytes,
-                stride_alignment);
-  frame_buffer->plane[2] =
-      AlignAddr(v_buffer + (uv_top_border * uv_stride) + uv_left_border_bytes,
-                stride_alignment);
-
-  frame_buffer->stride[0] = y_stride;
-  frame_buffer->stride[1] = frame_buffer->stride[2] = uv_stride;
-
-  frame_buffer->private_data = reinterpret_cast<void*>(jni_buffer->Id());
-
-  return 0;
+  uint8_t* const u_buffer =
+      (info.uv_buffer_size != 0) ? jni_buffer->RawBuffer(1) : nullptr;
+  uint8_t* const v_buffer =
+      (info.uv_buffer_size != 0) ? jni_buffer->RawBuffer(2) : nullptr;
+
+  status = libgav1::SetFrameBuffer(&info, y_buffer, u_buffer, v_buffer,
+                                   reinterpret_cast<void*>(jni_buffer->Id()),
+                                   frame_buffer);
+  return (status == kLibgav1StatusOk) ? 0 : -1;
 }
 
 void Libgav1ReleaseFrameBuffer(void* callback_private_data,
@@ -454,6 +377,8 @@ void Libgav1ReleaseFrameBuffer(void* callback_private_data,
   }
 }
 
+constexpr int AlignTo16(int value) { return (value + 15) & (~15); }
+
 void CopyPlane(const uint8_t* source, int source_stride, uint8_t* destination,
                int destination_stride, int width, int height) {
   while (height--) {
@@ -794,7 +719,7 @@ DECODER_FUNC(jint, gav1RenderFrame, jlong jContext, jobject jSurface,
   const int32_t native_window_buffer_uv_height =
       (native_window_buffer.height + 1) / 2;
   const int native_window_buffer_uv_stride =
-      Align(native_window_buffer.stride / 2, 16);
+      AlignTo16(native_window_buffer.stride / 2);
 
   // TODO(b/140606738): Handle monochrome videos.
 

From 75bd4ebc1800e5960e8badfc0e7e18d1e97821a3 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 17 Feb 2020 11:22:38 +0000
Subject: [PATCH 08/59] Use &id_ as buffer_private_data for libgav1.

This avoids the issue of whether it is defined behaviour to cast an
arbitrary int (or even intptr_t) value to a void* pointer. This is the
original approach used before commit 0915998add5918214fa0282a69b50a159168a6d5.

PiperOrigin-RevId: 295552115
---
 extensions/av1/src/main/jni/gav1_jni.cc | 34 ++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/extensions/av1/src/main/jni/gav1_jni.cc b/extensions/av1/src/main/jni/gav1_jni.cc
index 4ce614a3d97..5be4f5b923b 100644
--- a/extensions/av1/src/main/jni/gav1_jni.cc
+++ b/extensions/av1/src/main/jni/gav1_jni.cc
@@ -27,8 +27,6 @@
 #endif  // CPU_FEATURES_COMPILED_ANY_ARM_NEON
 #include <jni.h>
 
-#include <cassert>
-#include <climits>
 #include <cstdint>
 #include <cstring>
 #include <mutex>  // NOLINT
@@ -134,6 +132,12 @@ class JniFrameBuffer {
     }
   }
 
+  // Not copyable or movable.
+  JniFrameBuffer(const JniFrameBuffer&) = delete;
+  JniFrameBuffer(JniFrameBuffer&&) = delete;
+  JniFrameBuffer& operator=(const JniFrameBuffer&) = delete;
+  JniFrameBuffer& operator=(JniFrameBuffer&&) = delete;
+
   void SetFrameData(const libgav1::DecoderBuffer& decoder_buffer) {
     for (int plane_index = kPlaneY; plane_index < decoder_buffer.NumPlanes();
          plane_index++) {
@@ -162,7 +166,7 @@ class JniFrameBuffer {
   bool InUse() const { return reference_count_ != 0; }
 
   uint8_t* RawBuffer(int plane_index) const { return raw_buffer_[plane_index]; }
-  int Id() const { return id_; }
+  void* BufferPrivateData() const { return const_cast<int*>(&id_); }
 
   // Attempts to reallocate data planes if the existing ones don't have enough
   // capacity. Returns true if the allocation was successful or wasn't needed,
@@ -359,19 +363,17 @@ int Libgav1GetFrameBuffer(void* callback_private_data, int bitdepth,
   uint8_t* const v_buffer =
       (info.uv_buffer_size != 0) ? jni_buffer->RawBuffer(2) : nullptr;
 
-  status = libgav1::SetFrameBuffer(&info, y_buffer, u_buffer, v_buffer,
-                                   reinterpret_cast<void*>(jni_buffer->Id()),
-                                   frame_buffer);
+  status =
+      libgav1::SetFrameBuffer(&info, y_buffer, u_buffer, v_buffer,
+                              jni_buffer->BufferPrivateData(), frame_buffer);
   return (status == kLibgav1StatusOk) ? 0 : -1;
 }
 
 void Libgav1ReleaseFrameBuffer(void* callback_private_data,
                                void* buffer_private_data) {
   JniContext* const context = static_cast<JniContext*>(callback_private_data);
-  const intptr_t buffer_id = reinterpret_cast<intptr_t>(buffer_private_data);
-  assert(buffer_id <= INT_MAX);
-  context->jni_status_code =
-      context->buffer_manager.ReleaseBuffer(static_cast<int>(buffer_id));
+  const int buffer_id = *static_cast<const int*>(buffer_private_data);
+  context->jni_status_code = context->buffer_manager.ReleaseBuffer(buffer_id);
   if (context->jni_status_code != kJniStatusOk) {
     LOGE("%s", GetJniErrorMessage(context->jni_status_code));
   }
@@ -655,12 +657,11 @@ DECODER_FUNC(jint, gav1GetFrame, jlong jContext, jobject jOutputBuffer,
       return kStatusError;
     }
 
-    const intptr_t buffer_id =
-        reinterpret_cast<intptr_t>(decoder_buffer->buffer_private_data);
-    assert(buffer_id <= INT_MAX);
-    context->buffer_manager.AddBufferReference(static_cast<int>(buffer_id));
+    const int buffer_id =
+        *static_cast<const int*>(decoder_buffer->buffer_private_data);
+    context->buffer_manager.AddBufferReference(buffer_id);
     JniFrameBuffer* const jni_buffer =
-        context->buffer_manager.GetBuffer(static_cast<int>(buffer_id));
+        context->buffer_manager.GetBuffer(buffer_id);
     jni_buffer->SetFrameData(*decoder_buffer);
     env->CallVoidMethod(jOutputBuffer, context->init_for_private_frame_method,
                         decoder_buffer->displayed_width[kPlaneY],
@@ -669,8 +670,7 @@ DECODER_FUNC(jint, gav1GetFrame, jlong jContext, jobject jOutputBuffer,
       // Exception is thrown in Java when returning from the native call.
       return kStatusError;
     }
-    env->SetIntField(jOutputBuffer, context->decoder_private_field,
-                     static_cast<int>(buffer_id));
+    env->SetIntField(jOutputBuffer, context->decoder_private_field, buffer_id);
   }
 
   return kStatusOk;

From 908a76e8515073c721eeffb1205b5799af9f2efa Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 19 Feb 2020 16:09:10 +0000
Subject: [PATCH 09/59] Change libgav1's frame buffer callback API.

1. Have frame buffer callbacks return Libgav1StatusCode instead of int.
The 0 (success), -1 (failure) return value convention is less obvious.
Note: The callers of frame buffer callbacks,
BufferPool::OnFrameBufferSizeChanged() and YuvBuffer::Realloc(),
currently return bool, so more work is needed to propagate the frame
buffer callbacks' Libgav1StatusCode return value to the Decoder API.

2. Allow the FrameBufferSizeChangedCallback to be omitted if the frame
buffer size information is not useful to the application.

3. Remove the old (version 1) frame buffer callback API. Remove the
frame buffer callback adaptor.

frame_buffer2.h is renamed frame_buffer.h.
Libgav1FrameBuffer2 is renamed Libgav1FrameBuffer.
GetFrameBufferCallback2 and ReleaseFrameBufferCallback2 are renamed
GetFrameBufferCallback and ReleaseFrameBufferCallback.

PiperOrigin-RevId: 295971183
---
 extensions/av1/src/main/jni/gav1_jni.cc | 38 +++++++------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/extensions/av1/src/main/jni/gav1_jni.cc b/extensions/av1/src/main/jni/gav1_jni.cc
index 5be4f5b923b..e3fb890c326 100644
--- a/extensions/av1/src/main/jni/gav1_jni.cc
+++ b/extensions/av1/src/main/jni/gav1_jni.cc
@@ -322,31 +322,18 @@ struct JniContext {
   JniStatusCode jni_status_code = kJniStatusOk;
 };
 
-// Libgav1 frame buffer callbacks return 0 on success, -1 on failure.
-
-int Libgav1OnFrameBufferSizeChanged(void* /*callback_private_data*/,
-                                    int /*bitdepth*/,
-                                    libgav1::ImageFormat /*image_format*/,
-                                    int /*width*/, int /*height*/,
-                                    int /*left_border*/, int /*right_border*/,
-                                    int /*top_border*/, int /*bottom_border*/,
-                                    int /*stride_alignment*/) {
-  // The libgav1 decoder calls this callback to provide information on the
-  // subsequent frames in the video. JniBufferManager ignores this information.
-  return 0;
-}
-
-int Libgav1GetFrameBuffer(void* callback_private_data, int bitdepth,
-                          libgav1::ImageFormat image_format, int width,
-                          int height, int left_border, int right_border,
-                          int top_border, int bottom_border,
-                          int stride_alignment,
-                          libgav1::FrameBuffer2* frame_buffer) {
+Libgav1StatusCode Libgav1GetFrameBuffer(void* callback_private_data,
+                                        int bitdepth,
+                                        libgav1::ImageFormat image_format,
+                                        int width, int height, int left_border,
+                                        int right_border, int top_border,
+                                        int bottom_border, int stride_alignment,
+                                        libgav1::FrameBuffer* frame_buffer) {
   libgav1::FrameBufferInfo info;
   Libgav1StatusCode status = libgav1::ComputeFrameBufferInfo(
       bitdepth, image_format, width, height, left_border, right_border,
       top_border, bottom_border, stride_alignment, &info);
-  if (status != kLibgav1StatusOk) return -1;
+  if (status != kLibgav1StatusOk) return status;
 
   JniContext* const context = static_cast<JniContext*>(callback_private_data);
   JniFrameBuffer* jni_buffer;
@@ -354,7 +341,7 @@ int Libgav1GetFrameBuffer(void* callback_private_data, int bitdepth,
       info.y_buffer_size, info.uv_buffer_size, &jni_buffer);
   if (context->jni_status_code != kJniStatusOk) {
     LOGE("%s", GetJniErrorMessage(context->jni_status_code));
-    return -1;
+    return kLibgav1StatusOutOfMemory;
   }
 
   uint8_t* const y_buffer = jni_buffer->RawBuffer(0);
@@ -363,10 +350,8 @@ int Libgav1GetFrameBuffer(void* callback_private_data, int bitdepth,
   uint8_t* const v_buffer =
       (info.uv_buffer_size != 0) ? jni_buffer->RawBuffer(2) : nullptr;
 
-  status =
-      libgav1::SetFrameBuffer(&info, y_buffer, u_buffer, v_buffer,
-                              jni_buffer->BufferPrivateData(), frame_buffer);
-  return (status == kLibgav1StatusOk) ? 0 : -1;
+  return libgav1::SetFrameBuffer(&info, y_buffer, u_buffer, v_buffer,
+                                 jni_buffer->BufferPrivateData(), frame_buffer);
 }
 
 void Libgav1ReleaseFrameBuffer(void* callback_private_data,
@@ -546,7 +531,6 @@ DECODER_FUNC(jlong, gav1Init, jint threads) {
 
   libgav1::DecoderSettings settings;
   settings.threads = threads;
-  settings.on_frame_buffer_size_changed = Libgav1OnFrameBufferSizeChanged;
   settings.get_frame_buffer = Libgav1GetFrameBuffer;
   settings.release_frame_buffer = Libgav1ReleaseFrameBuffer;
   settings.callback_private_data = context;

From 8591e69b6a40162ffc801a1569549ca826606cc5 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 30 Mar 2020 13:46:24 +0100
Subject: [PATCH 10/59] Remove duplicate SCTE-35 format and add sample to
 TsExtractorTest

It's not clear why we're currently outputting the format in both init()
and consume() - it seems likely that this was accidentally introduced
in <unknown commit>
when we started outputting the format in consume() but didn't remove it
from init().
---
 .../exoplayer2/extractor/ts/SpliceInfoSectionReader.java        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java
index 27838d4c257..ab674396076 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java
@@ -38,8 +38,6 @@ public void init(TimestampAdjuster timestampAdjuster, ExtractorOutput extractorO
     this.timestampAdjuster = timestampAdjuster;
     idGenerator.generateNewId();
     output = extractorOutput.track(idGenerator.getTrackId(), C.TRACK_TYPE_METADATA);
-    output.format(Format.createSampleFormat(idGenerator.getFormatId(), MimeTypes.APPLICATION_SCTE35,
-        null, Format.NO_VALUE, null));
   }
 
   @Override

From 265670cf93fa9d688df4db55a296214ad9630501 Mon Sep 17 00:00:00 2001
From: vigneshv <vigneshv@google.com>
Date: Thu, 20 Feb 2020 20:52:37 +0000
Subject: [PATCH 11/59] Add ReleaseInputBuffer callback

The release_input_buffer callback will be called when the library
is done consuming an "input buffer". The buffer passed into
EnqueueFrame must be kept valid until this callback is called. If
frame parallel is false, then this callback can be nullptr (in
this case the buffer has to be kept valid until the next call to
DequeueFrame). If frame parallel is true, this callback cannot be
nullptr.

PiperOrigin-RevId: 296276083
---
 extensions/av1/src/main/jni/gav1_jni.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/av1/src/main/jni/gav1_jni.cc b/extensions/av1/src/main/jni/gav1_jni.cc
index e3fb890c326..e0cef86d227 100644
--- a/extensions/av1/src/main/jni/gav1_jni.cc
+++ b/extensions/av1/src/main/jni/gav1_jni.cc
@@ -567,7 +567,8 @@ DECODER_FUNC(jint, gav1Decode, jlong jContext, jobject encodedData,
   const uint8_t* const buffer = reinterpret_cast<const uint8_t*>(
       env->GetDirectBufferAddress(encodedData));
   context->libgav1_status_code =
-      context->decoder.EnqueueFrame(buffer, length, /*user_private_data=*/0);
+      context->decoder.EnqueueFrame(buffer, length, /*user_private_data=*/0,
+                                    /*buffer_private_data=*/nullptr);
   if (context->libgav1_status_code != kLibgav1StatusOk) {
     return kStatusError;
   }

From c3f9f0e5fec9735d36dcc83afc8faf03325121d7 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 25 Feb 2020 21:24:27 +0000
Subject: [PATCH 12/59] Merge pull request #7010 from dbrain:fix_nullability

PiperOrigin-RevId: 297187116
---
 .../exoplayer2/offline/DownloadHelper.java    | 26 +++++++++----------
 .../exoplayer2/offline/DownloadService.java   | 12 ++++++---
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index d176b1905c6..6707c1e4960 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -245,8 +245,8 @@ public static DownloadHelper forDash(
    * @param dataSourceFactory A {@link DataSource.Factory} used to load the manifest.
    * @param renderersFactory A {@link RenderersFactory} creating the renderers for which tracks are
    *     selected.
-   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
-   *     {@code renderersFactory}.
+   * @param drmSessionManager An optional {@link DrmSessionManager}. Used to help determine which
+   *     tracks can be selected.
    * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
    *     downloading.
    * @return A {@link DownloadHelper} for DASH streams.
@@ -315,8 +315,8 @@ public static DownloadHelper forHls(
    * @param dataSourceFactory A {@link DataSource.Factory} used to load the playlist.
    * @param renderersFactory A {@link RenderersFactory} creating the renderers for which tracks are
    *     selected.
-   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
-   *     {@code renderersFactory}.
+   * @param drmSessionManager An optional {@link DrmSessionManager}. Used to help determine which
+   *     tracks can be selected.
    * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
    *     downloading.
    * @return A {@link DownloadHelper} for HLS streams.
@@ -385,8 +385,8 @@ public static DownloadHelper forSmoothStreaming(
    * @param dataSourceFactory A {@link DataSource.Factory} used to load the manifest.
    * @param renderersFactory A {@link RenderersFactory} creating the renderers for which tracks are
    *     selected.
-   * @param drmSessionManager An optional {@link DrmSessionManager} used by the renderers created by
-   *     {@code renderersFactory}.
+   * @param drmSessionManager An optional {@link DrmSessionManager}. Used to help determine which
+   *     tracks can be selected.
    * @param trackSelectorParameters {@link DefaultTrackSelector.Parameters} for selecting tracks for
    *     downloading.
    * @return A {@link DownloadHelper} for SmoothStreaming streams.
@@ -414,27 +414,27 @@ public static DownloadHelper forSmoothStreaming(
 
   /**
    * Equivalent to {@link #createMediaSource(DownloadRequest, Factory, DrmSessionManager)
-   * createMediaSource(downloadRequest, dataSourceFactory,
-   * DrmSessionManager.getDummyDrmSessionManager())}.
+   * createMediaSource(downloadRequest, dataSourceFactory, null)}.
    */
   public static MediaSource createMediaSource(
       DownloadRequest downloadRequest, DataSource.Factory dataSourceFactory) {
-    return createMediaSource(
-        downloadRequest, dataSourceFactory, DrmSessionManager.getDummyDrmSessionManager());
+    return createMediaSource(downloadRequest, dataSourceFactory, /* drmSessionManager= */ null);
   }
 
   /**
-   * Utility method to create a MediaSource which only contains the tracks defined in {@code
+   * Utility method to create a {@link MediaSource} that only exposes the tracks defined in {@code
    * downloadRequest}.
    *
    * @param downloadRequest A {@link DownloadRequest}.
    * @param dataSourceFactory A factory for {@link DataSource}s to read the media.
-   * @return A MediaSource which only contains the tracks defined in {@code downloadRequest}.
+   * @param drmSessionManager An optional {@link DrmSessionManager} to be passed to the {@link
+   *     MediaSource}.
+   * @return A {@link MediaSource} that only exposes the tracks defined in {@code downloadRequest}.
    */
   public static MediaSource createMediaSource(
       DownloadRequest downloadRequest,
       DataSource.Factory dataSourceFactory,
-      DrmSessionManager<?> drmSessionManager) {
+      @Nullable DrmSessionManager<?> drmSessionManager) {
     @Nullable Constructor<? extends MediaSourceFactory> constructor;
     switch (downloadRequest.type) {
       case DownloadRequest.TYPE_DASH:
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
index b1ab5ac7c62..819478b80e6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
@@ -595,7 +595,7 @@ public void onCreate() {
   }
 
   @Override
-  public int onStartCommand(Intent intent, int flags, int startId) {
+  public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
     lastStartId = startId;
     taskRemoved = false;
     @Nullable String intentAction = null;
@@ -617,7 +617,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // Do nothing.
         break;
       case ACTION_ADD_DOWNLOAD:
-        @Nullable DownloadRequest downloadRequest = intent.getParcelableExtra(KEY_DOWNLOAD_REQUEST);
+        @Nullable
+        DownloadRequest downloadRequest =
+            Assertions.checkNotNull(intent).getParcelableExtra(KEY_DOWNLOAD_REQUEST);
         if (downloadRequest == null) {
           Log.e(TAG, "Ignored ADD_DOWNLOAD: Missing " + KEY_DOWNLOAD_REQUEST + " extra");
         } else {
@@ -642,7 +644,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         downloadManager.pauseDownloads();
         break;
       case ACTION_SET_STOP_REASON:
-        if (!intent.hasExtra(KEY_STOP_REASON)) {
+        if (!Assertions.checkNotNull(intent).hasExtra(KEY_STOP_REASON)) {
           Log.e(TAG, "Ignored SET_STOP_REASON: Missing " + KEY_STOP_REASON + " extra");
         } else {
           int stopReason = intent.getIntExtra(KEY_STOP_REASON, /* defaultValue= */ 0);
@@ -650,7 +652,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         }
         break;
       case ACTION_SET_REQUIREMENTS:
-        @Nullable Requirements requirements = intent.getParcelableExtra(KEY_REQUIREMENTS);
+        @Nullable
+        Requirements requirements =
+            Assertions.checkNotNull(intent).getParcelableExtra(KEY_REQUIREMENTS);
         if (requirements == null) {
           Log.e(TAG, "Ignored SET_REQUIREMENTS: Missing " + KEY_REQUIREMENTS + " extra");
         } else {

From e2a6775ea44935c8fe78fc49f6698989e29c5454 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 10 Mar 2020 10:17:13 +0000
Subject: [PATCH 13/59] Merge pull request #6999 from xufuji456:dev-v2

PiperOrigin-RevId: 298544278
---
 .../exoplayer2/ext/ffmpeg/FfmpegLibrary.java  |  2 +-
 extensions/ffmpeg/src/main/jni/Android.mk     |  7 +----
 .../ffmpeg/src/main/jni/build_ffmpeg.sh       |  2 +-
 extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc  | 29 +++++++++----------
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
index 46398512630..dc72e12e65b 100644
--- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
+++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
@@ -33,7 +33,7 @@ public final class FfmpegLibrary {
   private static final String TAG = "FfmpegLibrary";
 
   private static final LibraryLoader LOADER =
-      new LibraryLoader("avutil", "avresample", "swresample", "avcodec", "ffmpeg");
+      new LibraryLoader("avutil", "swresample", "avcodec", "ffmpeg");
 
   private FfmpegLibrary() {}
 
diff --git a/extensions/ffmpeg/src/main/jni/Android.mk b/extensions/ffmpeg/src/main/jni/Android.mk
index 22a4edcdae2..bcaf12cd119 100644
--- a/extensions/ffmpeg/src/main/jni/Android.mk
+++ b/extensions/ffmpeg/src/main/jni/Android.mk
@@ -21,11 +21,6 @@ LOCAL_MODULE    := libavcodec
 LOCAL_SRC_FILES := ffmpeg/android-libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE).so
 include $(PREBUILT_SHARED_LIBRARY)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libavresample
-LOCAL_SRC_FILES := ffmpeg/android-libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE).so
-include $(PREBUILT_SHARED_LIBRARY)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libswresample
 LOCAL_SRC_FILES := ffmpeg/android-libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE).so
@@ -40,6 +35,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := ffmpeg
 LOCAL_SRC_FILES := ffmpeg_jni.cc
 LOCAL_C_INCLUDES := ffmpeg
-LOCAL_SHARED_LIBRARIES := libavcodec libavresample libswresample libavutil
+LOCAL_SHARED_LIBRARIES := libavcodec libswresample libavutil
 LOCAL_LDLIBS := -Lffmpeg/android-libs/$(TARGET_ARCH_ABI) -llog
 include $(BUILD_SHARED_LIBRARY)
diff --git a/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh b/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh
index a76fa0e5897..d6db5fc1722 100755
--- a/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh
+++ b/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh
@@ -32,7 +32,7 @@ COMMON_OPTIONS="
     --disable-postproc
     --disable-avfilter
     --disable-symver
-    --enable-avresample
+    --disable-avresample
     --enable-swresample
     "
 TOOLCHAIN_PREFIX="${NDK_PATH}/toolchains/llvm/prebuilt/${HOST_PLATFORM}/bin"
diff --git a/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc b/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
index dcd4560e4ab..400039af893 100644
--- a/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
+++ b/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
@@ -26,10 +26,10 @@ extern "C" {
 #include <stdint.h>
 #endif
 #include <libavcodec/avcodec.h>
-#include <libavresample/avresample.h>
 #include <libavutil/channel_layout.h>
 #include <libavutil/error.h>
 #include <libavutil/opt.h>
+#include <libswresample/swresample.h>
 }
 
 #define LOG_TAG "ffmpeg_jni"
@@ -289,11 +289,11 @@ int decodePacket(AVCodecContext *context, AVPacket *packet,
     int sampleCount = frame->nb_samples;
     int dataSize = av_samples_get_buffer_size(NULL, channelCount, sampleCount,
                                               sampleFormat, 1);
-    AVAudioResampleContext *resampleContext;
+    SwrContext *resampleContext;
     if (context->opaque) {
-      resampleContext = (AVAudioResampleContext *) context->opaque;
+      resampleContext = (SwrContext *)context->opaque;
     } else {
-      resampleContext = avresample_alloc_context();
+      resampleContext = swr_alloc();
       av_opt_set_int(resampleContext, "in_channel_layout",  channelLayout, 0);
       av_opt_set_int(resampleContext, "out_channel_layout", channelLayout, 0);
       av_opt_set_int(resampleContext, "in_sample_rate", sampleRate, 0);
@@ -302,9 +302,9 @@ int decodePacket(AVCodecContext *context, AVPacket *packet,
       // The output format is always the requested format.
       av_opt_set_int(resampleContext, "out_sample_fmt",
           context->request_sample_fmt, 0);
-      result = avresample_open(resampleContext);
+      result = swr_init(resampleContext);
       if (result < 0) {
-        logError("avresample_open", result);
+        logError("swr_init", result);
         av_frame_free(&frame);
         return -1;
       }
@@ -312,7 +312,7 @@ int decodePacket(AVCodecContext *context, AVPacket *packet,
     }
     int inSampleSize = av_get_bytes_per_sample(sampleFormat);
     int outSampleSize = av_get_bytes_per_sample(context->request_sample_fmt);
-    int outSamples = avresample_get_out_samples(resampleContext, sampleCount);
+    int outSamples = swr_get_out_samples(resampleContext, sampleCount);
     int bufferOutSize = outSampleSize * channelCount * outSamples;
     if (outSize + bufferOutSize > outputSize) {
       LOGE("Output buffer size (%d) too small for output data (%d).",
@@ -320,15 +320,14 @@ int decodePacket(AVCodecContext *context, AVPacket *packet,
       av_frame_free(&frame);
       return -1;
     }
-    result = avresample_convert(resampleContext, &outputBuffer, bufferOutSize,
-                                outSamples, frame->data, frame->linesize[0],
-                                sampleCount);
+    result = swr_convert(resampleContext, &outputBuffer, bufferOutSize,
+                         (const uint8_t **)frame->data, frame->nb_samples);
     av_frame_free(&frame);
     if (result < 0) {
-      logError("avresample_convert", result);
+      logError("swr_convert", result);
       return result;
     }
-    int available = avresample_available(resampleContext);
+    int available = swr_get_out_samples(resampleContext, 0);
     if (available != 0) {
       LOGE("Expected no samples remaining after resampling, but found %d.",
            available);
@@ -351,9 +350,9 @@ void releaseContext(AVCodecContext *context) {
   if (!context) {
     return;
   }
-  AVAudioResampleContext *resampleContext;
-  if ((resampleContext = (AVAudioResampleContext *) context->opaque)) {
-    avresample_free(&resampleContext);
+  SwrContext *swrContext;
+  if ((swrContext = (SwrContext *)context->opaque)) {
+    swr_free(&swrContext);
     context->opaque = NULL;
   }
   avcodec_free_context(&context);

From 4e6383aeae900fb7504035610020b38dfe3c33ab Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 10 Mar 2020 10:20:37 +0000
Subject: [PATCH 14/59] Merge pull request #7051 from Cizor:dev-v2

PiperOrigin-RevId: 299357049
---
 .../google/android/exoplayer2/video/MediaCodecVideoRenderer.java | 1 +
 1 file changed, 1 insertion(+)

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 4e72a1b3d73..25dc09be816 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
@@ -1000,6 +1000,7 @@ protected void onProcessedTunneledBuffer(long presentationTimeUs) {
       processOutputFormat(getCodec(), format.width, format.height);
     }
     maybeNotifyVideoSizeChanged();
+    decoderCounters.renderedOutputBufferCount++;
     maybeNotifyRenderedFirstFrame();
     onProcessedOutputBuffer(presentationTimeUs);
   }

From 40d5db04607e8a91449608a08c8c25fa6ee3eedb Mon Sep 17 00:00:00 2001
From: krocard <krocard@google.com>
Date: Mon, 9 Mar 2020 16:43:38 +0000
Subject: [PATCH 15/59] Add support for x86_64 for the ffmpeg extension

Requested by https://github.com/google/ExoPlayer/issues/7058.
Additionally move one of the common option in COMMON_OPTIONS.

PiperOrigin-RevId: 299862479
---
 RELEASENOTES.md                                |  1 +
 extensions/ffmpeg/src/main/jni/build_ffmpeg.sh | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 847746d425e..bc862102d15 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -5,6 +5,7 @@
 * Text: Catch-and-log all fatal exceptions in `TextRenderer` instead of
   re-throwing, allowing playback to continue even if subtitles fail
   ([#6885](https://github.com/google/ExoPlayer/issues/6885)).
+* FFmpeg extension: Add support for x86_64.
 
 ### 2.11.3 (2020-02-19) ###
 
diff --git a/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh b/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh
index d6db5fc1722..b7d8f0eb7fe 100755
--- a/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh
+++ b/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh
@@ -34,6 +34,7 @@ COMMON_OPTIONS="
     --disable-symver
     --disable-avresample
     --enable-swresample
+    --extra-ldexeflags=-pie
     "
 TOOLCHAIN_PREFIX="${NDK_PATH}/toolchains/llvm/prebuilt/${HOST_PLATFORM}/bin"
 for decoder in "${ENABLED_DECODERS[@]}"
@@ -53,7 +54,6 @@ git checkout release/4.2
     --strip="${TOOLCHAIN_PREFIX}/arm-linux-androideabi-strip" \
     --extra-cflags="-march=armv7-a -mfloat-abi=softfp" \
     --extra-ldflags="-Wl,--fix-cortex-a8" \
-    --extra-ldexeflags=-pie \
     ${COMMON_OPTIONS}
 make -j4
 make install-libs
@@ -65,7 +65,6 @@ make clean
     --cross-prefix="${TOOLCHAIN_PREFIX}/aarch64-linux-android21-" \
     --nm="${TOOLCHAIN_PREFIX}/aarch64-linux-android-nm" \
     --strip="${TOOLCHAIN_PREFIX}/aarch64-linux-android-strip" \
-    --extra-ldexeflags=-pie \
     ${COMMON_OPTIONS}
 make -j4
 make install-libs
@@ -77,7 +76,18 @@ make clean
     --cross-prefix="${TOOLCHAIN_PREFIX}/i686-linux-android16-" \
     --nm="${TOOLCHAIN_PREFIX}/i686-linux-android-nm" \
     --strip="${TOOLCHAIN_PREFIX}/i686-linux-android-strip" \
-    --extra-ldexeflags=-pie \
+    --disable-asm \
+    ${COMMON_OPTIONS}
+make -j4
+make install-libs
+make clean
+./configure \
+    --libdir=android-libs/x86_64 \
+    --arch=x86_64 \
+    --cpu=x86_64 \
+    --cross-prefix="${TOOLCHAIN_PREFIX}/x86_64-linux-android16-" \
+    --nm="${TOOLCHAIN_PREFIX}/x86_64-linux-android-nm" \
+    --strip="${TOOLCHAIN_PREFIX}/x86_64-linux-android-strip" \
     --disable-asm \
     ${COMMON_OPTIONS}
 make -j4

From dca68b2198066da57633947c05e1ad7915cba3fa Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 11 Mar 2020 16:27:47 +0000
Subject: [PATCH 16/59] Merge pull request #7064 from davibe:enhancement/6907

PiperOrigin-RevId: 300330109
---
 RELEASENOTES.md                               |  2 ++
 .../source/dash/DashMediaSource.java          | 21 +++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index bc862102d15..543a7f83ef6 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -5,6 +5,8 @@
 * Text: Catch-and-log all fatal exceptions in `TextRenderer` instead of
   re-throwing, allowing playback to continue even if subtitles fail
   ([#6885](https://github.com/google/ExoPlayer/issues/6885)).
+* DASH: Update the manifest URI to avoid repeated HTTP redirects
+  ([#6907](https://github.com/google/ExoPlayer/issues/6907)).
 * FFmpeg extension: Add support for x86_64.
 
 ### 2.11.3 (2020-02-19) ###
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
index dfcd62b8b10..dcd4b15caed 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
@@ -807,15 +807,18 @@ protected void releaseSourceInternal() {
     manifestLoadPending &= manifest.dynamic;
     manifestLoadStartTimestampMs = elapsedRealtimeMs - loadDurationMs;
     manifestLoadEndTimestampMs = elapsedRealtimeMs;
-    if (manifest.location != null) {
-      synchronized (manifestUriLock) {
-        // This condition checks that replaceManifestUri wasn't called between the start and end of
-        // this load. If it was, we ignore the manifest location and prefer the manual replacement.
-        @SuppressWarnings("ReferenceEquality")
-        boolean isSameUriInstance = loadable.dataSpec.uri == manifestUri;
-        if (isSameUriInstance) {
-          manifestUri = manifest.location;
-        }
+
+    synchronized (manifestUriLock) {
+      // Checks whether replaceManifestUri(Uri) was called to manually replace the URI between the
+      // start and end of this load. If it was then isSameUriInstance evaluates to false, and we
+      // prefer the manual replacement to one derived from the previous request.
+      @SuppressWarnings("ReferenceEquality")
+      boolean isSameUriInstance = loadable.dataSpec.uri == manifestUri;
+      if (isSameUriInstance) {
+        // Replace the manifest URI with one specified by a manifest Location element (if present),
+        // or with the final (possibly redirected) URI. This follows the recommendation in
+        // DASH-IF-IOP 4.3, section 3.2.15.3. See: https://dashif.org/docs/DASH-IF-IOP-v4.3.pdf.
+        manifestUri = manifest.location != null ? manifest.location : loadable.getUri();
       }
     }
 

From b2849fde3d6cab091fcf10608ef93a26870fc45e Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 11 Mar 2020 16:27:36 +0000
Subject: [PATCH 17/59] Merge pull request #7057 from
 Chimerapps:dash_assetidentifier

PiperOrigin-RevId: 300313753
---
 RELEASENOTES.md                               |  6 +++--
 .../dash/manifest/DashManifestParser.java     | 20 ++++++++++++-----
 .../source/dash/manifest/Period.java          | 22 ++++++++++++++++++-
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 543a7f83ef6..98de3a6255c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -5,8 +5,10 @@
 * Text: Catch-and-log all fatal exceptions in `TextRenderer` instead of
   re-throwing, allowing playback to continue even if subtitles fail
   ([#6885](https://github.com/google/ExoPlayer/issues/6885)).
-* DASH: Update the manifest URI to avoid repeated HTTP redirects
-  ([#6907](https://github.com/google/ExoPlayer/issues/6907)).
+* DASH: 
+    * Update the manifest URI to avoid repeated HTTP redirects
+      ([#6907](https://github.com/google/ExoPlayer/issues/6907)).
+    * Parse period `AssetIdentifier` elements.
 * FFmpeg extension: Add support for x86_64.
 
 ### 2.11.3 (2020-02-19) ###
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
index b107be4794d..95129d68c45 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -222,10 +222,11 @@ protected UtcTimingElement buildUtcTimingElement(String schemeIdUri, String valu
 
   protected Pair<Period, Long> parsePeriod(XmlPullParser xpp, String baseUrl, long defaultStartMs)
       throws XmlPullParserException, IOException {
-    String id = xpp.getAttributeValue(null, "id");
+    @Nullable String id = xpp.getAttributeValue(null, "id");
     long startMs = parseDuration(xpp, "start", defaultStartMs);
     long durationMs = parseDuration(xpp, "duration", C.TIME_UNSET);
-    SegmentBase segmentBase = null;
+    @Nullable SegmentBase segmentBase = null;
+    @Nullable Descriptor assetIdentifier = null;
     List<AdaptationSet> adaptationSets = new ArrayList<>();
     List<EventStream> eventStreams = new ArrayList<>();
     boolean seenFirstBaseUrl = false;
@@ -246,17 +247,24 @@ protected Pair<Period, Long> parsePeriod(XmlPullParser xpp, String baseUrl, long
         segmentBase = parseSegmentList(xpp, null, durationMs);
       } else if (XmlPullParserUtil.isStartTag(xpp, "SegmentTemplate")) {
         segmentBase = parseSegmentTemplate(xpp, null, Collections.emptyList(), durationMs);
+      } else if (XmlPullParserUtil.isStartTag(xpp, "AssetIdentifier")) {
+        assetIdentifier = parseDescriptor(xpp, "AssetIdentifier");
       } else {
         maybeSkipTag(xpp);
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "Period"));
 
-    return Pair.create(buildPeriod(id, startMs, adaptationSets, eventStreams), durationMs);
+    return Pair.create(
+        buildPeriod(id, startMs, adaptationSets, eventStreams, assetIdentifier), durationMs);
   }
 
-  protected Period buildPeriod(String id, long startMs, List<AdaptationSet> adaptationSets,
-      List<EventStream> eventStreams) {
-    return new Period(id, startMs, adaptationSets, eventStreams);
+  protected Period buildPeriod(
+      @Nullable String id,
+      long startMs,
+      List<AdaptationSet> adaptationSets,
+      List<EventStream> eventStreams,
+      @Nullable Descriptor assetIdentifier) {
+    return new Period(id, startMs, adaptationSets, eventStreams, assetIdentifier);
   }
 
   // AdaptationSet parsing.
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java
index 18614ca4b01..b472aed50cf 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java
@@ -45,13 +45,16 @@ public class Period {
    */
   public final List<EventStream> eventStreams;
 
+  /** The asset identifier for this period, if one exists */
+  @Nullable public final Descriptor assetIdentifier;
+
   /**
    * @param id The period identifier. May be null.
    * @param startMs The start time of the period in milliseconds.
    * @param adaptationSets The adaptation sets belonging to the period.
    */
   public Period(@Nullable String id, long startMs, List<AdaptationSet> adaptationSets) {
-    this(id, startMs, adaptationSets, Collections.emptyList());
+    this(id, startMs, adaptationSets, Collections.emptyList(), /* assetIdentifier= */ null);
   }
 
   /**
@@ -62,10 +65,27 @@ public Period(@Nullable String id, long startMs, List<AdaptationSet> adaptationS
    */
   public Period(@Nullable String id, long startMs, List<AdaptationSet> adaptationSets,
       List<EventStream> eventStreams) {
+    this(id, startMs, adaptationSets, eventStreams, /* assetIdentifier= */ null);
+  }
+
+  /**
+   * @param id The period identifier. May be null.
+   * @param startMs The start time of the period in milliseconds.
+   * @param adaptationSets The adaptation sets belonging to the period.
+   * @param eventStreams The {@link EventStream}s belonging to the period.
+   * @param assetIdentifier The asset identifier for this period
+   */
+  public Period(
+      @Nullable String id,
+      long startMs,
+      List<AdaptationSet> adaptationSets,
+      List<EventStream> eventStreams,
+      @Nullable Descriptor assetIdentifier) {
     this.id = id;
     this.startMs = startMs;
     this.adaptationSets = Collections.unmodifiableList(adaptationSets);
     this.eventStreams = Collections.unmodifiableList(eventStreams);
+    this.assetIdentifier = assetIdentifier;
   }
 
   /**

From 4750785f5abe64a3f7c71ca88a4db24a65765c15 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 13 Mar 2020 09:04:00 +0000
Subject: [PATCH 18/59] Add option for sensor rotation in 360 playbacks

Issue: #6761
PiperOrigin-RevId: 300715682
---
 RELEASENOTES.md                               |  3 ++
 .../android/exoplayer2/ui/PlayerView.java     | 27 ++++++++++++++
 .../ui/spherical/SphericalGLSurfaceView.java  | 35 +++++++++++++++----
 library/ui/src/main/res/values/attrs.xml      |  2 +-
 4 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 98de3a6255c..c9b986f7314 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -5,6 +5,9 @@
 * Text: Catch-and-log all fatal exceptions in `TextRenderer` instead of
   re-throwing, allowing playback to continue even if subtitles fail
   ([#6885](https://github.com/google/ExoPlayer/issues/6885)).
+* UI: Add an option to set whether to use the orientation sensor for rotation
+  in spherical playbacks
+  ([#6761](https://github.com/google/ExoPlayer/issues/6761)).
 * DASH: 
     * Update the manifest URI to avoid repeated HTTP redirects
       ([#6907](https://github.com/google/ExoPlayer/issues/6907)).
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index 03168643cf3..2eae9c1dde2 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -143,6 +143,12 @@
  *         <li>Corresponding method: None
  *         <li>Default: {@code surface_view}
  *       </ul>
+ *   <li><b>{@code use_sensor_rotation}</b> - Whether to use the orientation sensor for rotation
+ *       during spherical playbacks (if available).
+ *       <ul>
+ *         <li>Corresponding method: {@link #setUseSensorRotation(boolean)}
+ *         <li>Default: {@code true}
+ *       </ul>
  *   <li><b>{@code shutter_background_color}</b> - The background color of the {@code exo_shutter}
  *       view.
  *       <ul>
@@ -308,6 +314,7 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider
   @Nullable private Drawable defaultArtwork;
   private @ShowBuffering int showBuffering;
   private boolean keepContentOnPlayerReset;
+  private boolean useSensorRotation;
   @Nullable private ErrorMessageProvider<? super ExoPlaybackException> errorMessageProvider;
   @Nullable private CharSequence customErrorMessage;
   private int controllerShowTimeoutMs;
@@ -367,6 +374,7 @@ public PlayerView(Context context, @Nullable AttributeSet attrs, int defStyleAtt
     boolean controllerAutoShow = true;
     boolean controllerHideDuringAds = true;
     int showBuffering = SHOW_BUFFERING_NEVER;
+    useSensorRotation = true;
     if (attrs != null) {
       TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.PlayerView, 0, 0);
       try {
@@ -390,6 +398,8 @@ public PlayerView(Context context, @Nullable AttributeSet attrs, int defStyleAtt
                 R.styleable.PlayerView_keep_content_on_player_reset, keepContentOnPlayerReset);
         controllerHideDuringAds =
             a.getBoolean(R.styleable.PlayerView_hide_during_ads, controllerHideDuringAds);
+        useSensorRotation =
+            a.getBoolean(R.styleable.PlayerView_use_sensor_rotation, useSensorRotation);
       } finally {
         a.recycle();
       }
@@ -422,6 +432,7 @@ public PlayerView(Context context, @Nullable AttributeSet attrs, int defStyleAtt
         case SURFACE_TYPE_SPHERICAL_GL_SURFACE_VIEW:
           SphericalGLSurfaceView sphericalGLSurfaceView = new SphericalGLSurfaceView(context);
           sphericalGLSurfaceView.setSingleTapListener(componentListener);
+          sphericalGLSurfaceView.setUseSensorRotation(useSensorRotation);
           surfaceView = sphericalGLSurfaceView;
           break;
         case SURFACE_TYPE_VIDEO_DECODER_GL_SURFACE_VIEW:
@@ -746,6 +757,22 @@ public void setKeepContentOnPlayerReset(boolean keepContentOnPlayerReset) {
     }
   }
 
+  /**
+   * Sets whether to use the orientation sensor for rotation during spherical playbacks (if
+   * available)
+   *
+   * @param useSensorRotation Whether to use the orientation sensor for rotation during spherical
+   *     playbacks.
+   */
+  public void setUseSensorRotation(boolean useSensorRotation) {
+    if (this.useSensorRotation != useSensorRotation) {
+      this.useSensorRotation = useSensorRotation;
+      if (surfaceView instanceof SphericalGLSurfaceView) {
+        ((SphericalGLSurfaceView) surfaceView).setUseSensorRotation(useSensorRotation);
+      }
+    }
+  }
+
   /**
    * Sets whether a buffering spinner is displayed when the player is in the buffering state. The
    * buffering spinner is not displayed by default.
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalGLSurfaceView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalGLSurfaceView.java
index c01fccf54b5..1c96f41df57 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalGLSurfaceView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalGLSurfaceView.java
@@ -72,6 +72,9 @@ public final class SphericalGLSurfaceView extends GLSurfaceView {
   @Nullable private SurfaceTexture surfaceTexture;
   @Nullable private Surface surface;
   @Nullable private Player.VideoComponent videoComponent;
+  private boolean useSensorRotation;
+  private boolean isStarted;
+  private boolean isOrientationListenerRegistered;
 
   public SphericalGLSurfaceView(Context context) {
     this(context, null);
@@ -104,6 +107,7 @@ public SphericalGLSurfaceView(Context context, @Nullable AttributeSet attributeS
     WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
     Display display = Assertions.checkNotNull(windowManager).getDefaultDisplay();
     orientationListener = new OrientationListener(display, touchTracker, renderer);
+    useSensorRotation = true;
 
     setEGLContextClientVersion(2);
     setRenderer(renderer);
@@ -145,20 +149,23 @@ public void setSingleTapListener(@Nullable SingleTapListener listener) {
     touchTracker.setSingleTapListener(listener);
   }
 
+  /** Sets whether to use the orientation sensor for rotation (if available). */
+  public void setUseSensorRotation(boolean useSensorRotation) {
+    this.useSensorRotation = useSensorRotation;
+    updateOrientationListenerRegistration();
+  }
+
   @Override
   public void onResume() {
     super.onResume();
-    if (orientationSensor != null) {
-      sensorManager.registerListener(
-          orientationListener, orientationSensor, SensorManager.SENSOR_DELAY_FASTEST);
-    }
+    isStarted = true;
+    updateOrientationListenerRegistration();
   }
 
   @Override
   public void onPause() {
-    if (orientationSensor != null) {
-      sensorManager.unregisterListener(orientationListener);
-    }
+    isStarted = false;
+    updateOrientationListenerRegistration();
     super.onPause();
   }
 
@@ -181,6 +188,20 @@ protected void onDetachedFromWindow() {
         });
   }
 
+  private void updateOrientationListenerRegistration() {
+    boolean enabled = useSensorRotation && isStarted;
+    if (orientationSensor == null || enabled == isOrientationListenerRegistered) {
+      return;
+    }
+    if (enabled) {
+      sensorManager.registerListener(
+          orientationListener, orientationSensor, SensorManager.SENSOR_DELAY_FASTEST);
+    } else {
+      sensorManager.unregisterListener(orientationListener);
+    }
+    isOrientationListenerRegistered = enabled;
+  }
+
   // Called on GL thread.
   private void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture) {
     mainHandler.post(
diff --git a/library/ui/src/main/res/values/attrs.xml b/library/ui/src/main/res/values/attrs.xml
index 535bf320fbf..e0a6b7faf47 100644
--- a/library/ui/src/main/res/values/attrs.xml
+++ b/library/ui/src/main/res/values/attrs.xml
@@ -77,8 +77,8 @@
       <enum name="always" value="2"/>
     </attr>
     <attr name="keep_content_on_player_reset" format="boolean"/>
+    <attr name="use_sensor_rotation" format="boolean"/>
     <attr name="player_layout_id" format="reference"/>
-
     <attr name="surface_type"/>
     <!-- AspectRatioFrameLayout attributes -->
     <attr name="resize_mode"/>

From dd4a732303dafc9b5fb8a3bb3e6c67bd6a6b403b Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 20 Mar 2020 12:49:00 +0000
Subject: [PATCH 19/59] Merge pull request #7098 from
 matamegger:feature/webvtt_negative_media_timestamp

PiperOrigin-RevId: 301996778
---
 .../google/android/exoplayer2/source/hls/WebvttExtractor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java
index a62e135b774..285ec1b6a1f 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java
@@ -49,7 +49,7 @@
 public final class WebvttExtractor implements Extractor {
 
   private static final Pattern LOCAL_TIMESTAMP = Pattern.compile("LOCAL:([^,]+)");
-  private static final Pattern MEDIA_TIMESTAMP = Pattern.compile("MPEGTS:(\\d+)");
+  private static final Pattern MEDIA_TIMESTAMP = Pattern.compile("MPEGTS:(-?\\d+)");
   private static final int HEADER_MIN_LENGTH = 6 /* "WEBVTT" */;
   private static final int HEADER_MAX_LENGTH = 3 /* optional Byte Order Mark */ + HEADER_MIN_LENGTH;
 

From a39715d3235f406bbb044ed87ba00b0818f0e40f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 20 Mar 2020 12:17:32 +0000
Subject: [PATCH 20/59] Improve logging

- Make sure logging of UnknownHostException indicates the failure reason
- Indent stack traces inside event blocks in EventLogger
- Don't log media URLs

PiperOrigin-RevId: 302007601
---
 .../ext/okhttp/OkHttpDataSource.java          |  2 +-
 .../exoplayer2/ExoPlayerImplInternal.java     |  4 +-
 .../upstream/DefaultHttpDataSource.java       |  8 +-
 .../android/exoplayer2/util/EventLogger.java  | 41 ++++++----
 .../google/android/exoplayer2/util/Log.java   | 76 +++++++++++++------
 5 files changed, 83 insertions(+), 48 deletions(-)

diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
index 3053961f491..fe2bdd672b0 100644
--- a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
+++ b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
@@ -223,7 +223,7 @@ public long open(DataSpec dataSpec) throws HttpDataSourceException {
       responseByteStream = responseBody.byteStream();
     } catch (IOException e) {
       throw new HttpDataSourceException(
-          "Unable to connect to " + dataSpec.uri, e, dataSpec, HttpDataSourceException.TYPE_OPEN);
+          "Unable to connect", e, dataSpec, HttpDataSourceException.TYPE_OPEN);
     }
 
     int responseCode = response.code();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 240c6436c48..6fd23a93c5b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -386,7 +386,7 @@ public boolean handleMessage(Message msg) {
       playbackInfo = playbackInfo.copyWithPlaybackError(e);
       maybeNotifyPlaybackInfoChanged();
     } catch (IOException e) {
-      Log.e(TAG, "Source error.", e);
+      Log.e(TAG, "Source error", e);
       stopInternal(
           /* forceResetRenderers= */ false,
           /* resetPositionAndState= */ false,
@@ -394,7 +394,7 @@ public boolean handleMessage(Message msg) {
       playbackInfo = playbackInfo.copyWithPlaybackError(ExoPlaybackException.createForSource(e));
       maybeNotifyPlaybackInfoChanged();
     } catch (RuntimeException | OutOfMemoryError e) {
-      Log.e(TAG, "Internal runtime error.", e);
+      Log.e(TAG, "Internal runtime error", e);
       ExoPlaybackException error =
           e instanceof OutOfMemoryError
               ? ExoPlaybackException.createForOutOfMemoryError((OutOfMemoryError) e)
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
index ae115ab58cc..ec11ad2348a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
@@ -279,8 +279,8 @@ public long open(DataSpec dataSpec) throws HttpDataSourceException {
     try {
       connection = makeConnection(dataSpec);
     } catch (IOException e) {
-      throw new HttpDataSourceException("Unable to connect to " + dataSpec.uri.toString(), e,
-          dataSpec, HttpDataSourceException.TYPE_OPEN);
+      throw new HttpDataSourceException(
+          "Unable to connect", e, dataSpec, HttpDataSourceException.TYPE_OPEN);
     }
 
     String responseMessage;
@@ -289,8 +289,8 @@ public long open(DataSpec dataSpec) throws HttpDataSourceException {
       responseMessage = connection.getResponseMessage();
     } catch (IOException e) {
       closeConnectionQuietly();
-      throw new HttpDataSourceException("Unable to connect to " + dataSpec.uri.toString(), e,
-          dataSpec, HttpDataSourceException.TYPE_OPEN);
+      throw new HttpDataSourceException(
+          "Unable to connect", e, dataSpec, HttpDataSourceException.TYPE_OPEN);
     }
 
     // Check for a valid response code.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java b/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
index 0a303c1df7c..9d145caee5a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.util;
 
 import android.os.SystemClock;
+import android.text.TextUtils;
 import android.view.Surface;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
@@ -198,7 +199,7 @@ public void onTracksChanged(
       logd(eventTime, "tracks", "[]");
       return;
     }
-    logd("tracks [" + getEventTimeString(eventTime) + ", ");
+    logd("tracks [" + getEventTimeString(eventTime));
     // Log tracks associated to renderers.
     int rendererCount = mappedTrackInfo.getRendererCount();
     for (int rendererIndex = 0; rendererIndex < rendererCount; rendererIndex++) {
@@ -282,7 +283,7 @@ public void onSeekProcessed(EventTime eventTime) {
 
   @Override
   public void onMetadata(EventTime eventTime, Metadata metadata) {
-    logd("metadata [" + getEventTimeString(eventTime) + ", ");
+    logd("metadata [" + getEventTimeString(eventTime));
     printMetadata(metadata, "  ");
     logd("]");
   }
@@ -469,27 +470,26 @@ protected void logd(String msg) {
   }
 
   /**
-   * Logs an error message and exception.
+   * Logs an error message.
    *
    * @param msg The message to log.
-   * @param tr The exception to log.
    */
-  protected void loge(String msg, @Nullable Throwable tr) {
-    Log.e(tag, msg, tr);
+  protected void loge(String msg) {
+    Log.e(tag, msg);
   }
 
   // Internal methods
 
   private void logd(EventTime eventTime, String eventName) {
-    logd(getEventString(eventTime, eventName));
+    logd(getEventString(eventTime, eventName, /* eventDescription= */ null, /* throwable= */ null));
   }
 
   private void logd(EventTime eventTime, String eventName, String eventDescription) {
-    logd(getEventString(eventTime, eventName, eventDescription));
+    logd(getEventString(eventTime, eventName, eventDescription, /* throwable= */ null));
   }
 
   private void loge(EventTime eventTime, String eventName, @Nullable Throwable throwable) {
-    loge(getEventString(eventTime, eventName), throwable);
+    loge(getEventString(eventTime, eventName, /* eventDescription= */ null, throwable));
   }
 
   private void loge(
@@ -497,7 +497,7 @@ private void loge(
       String eventName,
       String eventDescription,
       @Nullable Throwable throwable) {
-    loge(getEventString(eventTime, eventName, eventDescription), throwable);
+    loge(getEventString(eventTime, eventName, eventDescription, throwable));
   }
 
   private void printInternalError(EventTime eventTime, String type, Exception e) {
@@ -510,12 +510,21 @@ private void printMetadata(Metadata metadata, String prefix) {
     }
   }
 
-  private String getEventString(EventTime eventTime, String eventName) {
-    return eventName + " [" + getEventTimeString(eventTime) + "]";
-  }
-
-  private String getEventString(EventTime eventTime, String eventName, String eventDescription) {
-    return eventName + " [" + getEventTimeString(eventTime) + ", " + eventDescription + "]";
+  private String getEventString(
+      EventTime eventTime,
+      String eventName,
+      @Nullable String eventDescription,
+      @Nullable Throwable throwable) {
+    String eventString = eventName + " [" + getEventTimeString(eventTime);
+    if (eventDescription != null) {
+      eventString += ", " + eventDescription;
+    }
+    @Nullable String throwableString = Log.getThrowableString(throwable);
+    if (!TextUtils.isEmpty(throwableString)) {
+      eventString += "\n  " + throwableString.replace("\n", "\n  ") + '\n';
+    }
+    eventString += "]";
+    return eventString;
   }
 
   private String getEventTimeString(EventTime eventTime) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
index a29460b84c3..e5e6f88d4d9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
@@ -21,6 +21,7 @@
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.net.UnknownHostException;
 
 /** Wrapper around {@link android.util.Log} which allows to set the log level. */
 public final class Log {
@@ -69,7 +70,8 @@ public static void setLogLevel(@LogLevel int logLevel) {
   }
 
   /**
-   * Sets whether stack traces of {@link Throwable}s will be logged to logcat.
+   * Sets whether stack traces of {@link Throwable}s will be logged to logcat. Stack trace logging
+   * is enabled by default.
    *
    * @param logStackTraces Whether stack traces will be logged.
    */
@@ -86,11 +88,7 @@ public static void d(String tag, String message) {
 
   /** @see android.util.Log#d(String, String, Throwable) */
   public static void d(String tag, String message, @Nullable Throwable throwable) {
-    if (!logStackTraces) {
-      d(tag, appendThrowableMessage(message, throwable));
-    } else if (logLevel == LOG_LEVEL_ALL) {
-      android.util.Log.d(tag, message, throwable);
-    }
+    d(tag, appendThrowableString(message, throwable));
   }
 
   /** @see android.util.Log#i(String, String) */
@@ -102,11 +100,7 @@ public static void i(String tag, String message) {
 
   /** @see android.util.Log#i(String, String, Throwable) */
   public static void i(String tag, String message, @Nullable Throwable throwable) {
-    if (!logStackTraces) {
-      i(tag, appendThrowableMessage(message, throwable));
-    } else if (logLevel <= LOG_LEVEL_INFO) {
-      android.util.Log.i(tag, message, throwable);
-    }
+    i(tag, appendThrowableString(message, throwable));
   }
 
   /** @see android.util.Log#w(String, String) */
@@ -118,11 +112,7 @@ public static void w(String tag, String message) {
 
   /** @see android.util.Log#w(String, String, Throwable) */
   public static void w(String tag, String message, @Nullable Throwable throwable) {
-    if (!logStackTraces) {
-      w(tag, appendThrowableMessage(message, throwable));
-    } else if (logLevel <= LOG_LEVEL_WARNING) {
-      android.util.Log.w(tag, message, throwable);
-    }
+    w(tag, appendThrowableString(message, throwable));
   }
 
   /** @see android.util.Log#e(String, String) */
@@ -134,18 +124,54 @@ public static void e(String tag, String message) {
 
   /** @see android.util.Log#e(String, String, Throwable) */
   public static void e(String tag, String message, @Nullable Throwable throwable) {
-    if (!logStackTraces) {
-      e(tag, appendThrowableMessage(message, throwable));
-    } else if (logLevel <= LOG_LEVEL_ERROR) {
-      android.util.Log.e(tag, message, throwable);
-    }
+    e(tag, appendThrowableString(message, throwable));
   }
 
-  private static String appendThrowableMessage(String message, @Nullable Throwable throwable) {
+  /**
+   * Returns a string representation of a {@link Throwable} suitable for logging, taking into
+   * account whether {@link #setLogStackTraces(boolean)} stack trace logging} is enabled.
+   *
+   * <p>Stack trace logging may be unconditionally suppressed for some expected failure modes (e.g.,
+   * {@link Throwable Throwables} that are expected if the device doesn't have network connectivity)
+   * to avoid log spam.
+   *
+   * @param throwable The {@link Throwable}.
+   * @return The string representation of the {@link Throwable}.
+   */
+  @Nullable
+  public static String getThrowableString(@Nullable Throwable throwable) {
     if (throwable == null) {
-      return message;
+      return null;
+    } else if (isCausedByUnknownHostException(throwable)) {
+      // UnknownHostException implies the device doesn't have network connectivity.
+      // UnknownHostException.getMessage() may return a string that's more verbose than desired for
+      // logging an expected failure mode. Conversely, android.util.Log.getStackTraceString has
+      // special handling to return the empty string, which can result in logging that doesn't
+      // indicate the failure mode at all. Hence we special case this exception to always return a
+      // concise but useful message.
+      return "UnknownHostException (no network)";
+    } else if (!logStackTraces) {
+      return throwable.getMessage();
+    } else {
+      return android.util.Log.getStackTraceString(throwable).trim().replace("\t", "    ");
+    }
+  }
+
+  private static String appendThrowableString(String message, @Nullable Throwable throwable) {
+    @Nullable String throwableString = getThrowableString(throwable);
+    if (!TextUtils.isEmpty(throwableString)) {
+      message += "\n  " + throwableString.replace("\n", "\n  ") + '\n';
+    }
+    return message;
+  }
+
+  private static boolean isCausedByUnknownHostException(@Nullable Throwable throwable) {
+    while (throwable != null) {
+      if (throwable instanceof UnknownHostException) {
+        return true;
+      }
+      throwable = throwable.getCause();
     }
-    String throwableMessage = throwable.getMessage();
-    return TextUtils.isEmpty(throwableMessage) ? message : message + " - " + throwableMessage;
+    return false;
   }
 }

From b67d79d77585738939cc82020d50641fbe08d88a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 23 Mar 2020 02:16:49 +0000
Subject: [PATCH 21/59] Request storage permission if missing

PiperOrigin-RevId: 302345647
---
 .../demo/SampleChooserActivity.java           | 38 +++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
index cdce29aa5ea..f18d43094a7 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
@@ -17,6 +17,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -34,6 +35,7 @@
 import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.exoplayer2.ParserException;
@@ -63,6 +65,7 @@ public class SampleChooserActivity extends AppCompatActivity
 
   private static final String TAG = "SampleChooserActivity";
 
+  private String[] uris;
   private boolean useExtensionRenderers;
   private DownloadTracker downloadTracker;
   private SampleAdapter sampleAdapter;
@@ -81,7 +84,6 @@ public void onCreate(Bundle savedInstanceState) {
 
     Intent intent = getIntent();
     String dataUri = intent.getDataString();
-    String[] uris;
     if (dataUri != null) {
       uris = new String[] {dataUri};
     } else {
@@ -105,8 +107,7 @@ public void onCreate(Bundle savedInstanceState) {
     DemoApplication application = (DemoApplication) getApplication();
     useExtensionRenderers = application.useExtensionRenderers();
     downloadTracker = application.getDownloadTracker();
-    SampleListLoader loaderTask = new SampleListLoader();
-    loaderTask.execute(uris);
+    loadSample();
 
     // Start the download service if it should be running but it's not currently.
     // Starting the service in the foreground causes notification flicker if there is no scheduled
@@ -157,6 +158,37 @@ public void onDownloadsChanged() {
     sampleAdapter.notifyDataSetChanged();
   }
 
+  @Override
+  public void onRequestPermissionsResult(
+      int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    if (grantResults.length == 0) {
+      // Empty results are triggered if a permission is requested while another request was already
+      // pending and can be safely ignored in this case.
+      return;
+    }
+    if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+      loadSample();
+    } else {
+      Toast.makeText(getApplicationContext(), R.string.sample_list_load_error, Toast.LENGTH_LONG)
+          .show();
+      finish();
+    }
+  }
+
+  private void loadSample() {
+    Assertions.checkNotNull(uris);
+
+    for (int i = 0; i < uris.length; i++) {
+      Uri uri = Uri.parse(uris[i]);
+      if (Util.maybeRequestReadExternalStoragePermission(this, uri)) {
+        return;
+      }
+    }
+
+    SampleListLoader loaderTask = new SampleListLoader();
+    loaderTask.execute(uris);
+  }
+
   private void onSampleGroups(final List<SampleGroup> groups, boolean sawError) {
     if (sawError) {
       Toast.makeText(getApplicationContext(), R.string.sample_list_load_error, Toast.LENGTH_LONG)

From cac36be6ebf3af8bff9d8060413fb07159d8a46e Mon Sep 17 00:00:00 2001
From: krocard <krocard@google.com>
Date: Mon, 23 Mar 2020 11:09:19 +0000
Subject: [PATCH 22/59] Conserve ByteOrder when growingDecoderInputBuffer

#exo-offload

PiperOrigin-RevId: 302403507
---
 .../google/android/exoplayer2/decoder/DecoderInputBuffer.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
index 302ae0609f7..31dfa8f0202 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
@@ -137,6 +137,7 @@ public void ensureSpaceForWrite(int length) {
     }
     // Instantiate a new buffer if possible.
     ByteBuffer newData = createReplacementByteBuffer(requiredCapacity);
+    newData.order(data.order());
     // Copy data up to the current position from the old buffer to the new one.
     if (position > 0) {
       data.flip();

From d18292c9c9a998157ca38b8730fa22fb936ecbb8 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Mon, 23 Mar 2020 18:03:04 +0000
Subject: [PATCH 23/59] Allow missing hours in SubRip (.srt) subtitle timecodes

Add a test for this case, and extend the existing tests to ensure the
hour is parsed when it's present.

issue:#7122
PiperOrigin-RevId: 302472213
---
 RELEASENOTES.md                               |  9 ++++--
 .../exoplayer2/text/subrip/SubripDecoder.java |  5 ++-
 library/core/src/test/assets/subrip/typical   |  2 +-
 .../assets/subrip/typical_extra_blank_line    |  2 +-
 .../assets/subrip/typical_missing_sequence    |  2 +-
 .../assets/subrip/typical_missing_timecode    |  6 ++--
 .../assets/subrip/typical_negative_timestamps |  2 +-
 .../src/test/assets/subrip/typical_no_hours   | 12 +++++++
 .../subrip/typical_with_byte_order_mark       |  2 +-
 .../text/subrip/SubripDecoderTest.java        | 31 ++++++++++++++++---
 10 files changed, 56 insertions(+), 17 deletions(-)
 create mode 100644 library/core/src/test/assets/subrip/typical_no_hours

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index c9b986f7314..d9f0ac42748 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,9 +2,12 @@
 
 ### 2.11.4 (not yet released) ###
 
-* Text: Catch-and-log all fatal exceptions in `TextRenderer` instead of
-  re-throwing, allowing playback to continue even if subtitles fail
-  ([#6885](https://github.com/google/ExoPlayer/issues/6885)).
+* Text:
+  *  Catch-and-log all fatal exceptions in `TextRenderer` instead of
+    re-throwing, allowing playback to continue even if subtitles fail
+    ([#6885](https://github.com/google/ExoPlayer/issues/6885)).
+  * Allow missing hours in SubRip (.srt) timecodes
+    ([#7122](https://github.com/google/ExoPlayer/issues/7122)).
 * UI: Add an option to set whether to use the orientation sensor for rotation
   in spherical playbacks
   ([#6761](https://github.com/google/ExoPlayer/issues/6761)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
index 0c402ac018c..2b562ff8c77 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
@@ -41,10 +41,12 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
 
   private static final String TAG = "SubripDecoder";
 
+  // Some SRT files don't include hours in the timecode, so we use an optional group.
   private static final String SUBRIP_TIMECODE = "(?:(\\d+):)?(\\d+):(\\d+),(\\d+)";
   private static final Pattern SUBRIP_TIMING_LINE =
       Pattern.compile("\\s*(" + SUBRIP_TIMECODE + ")\\s*-->\\s*(" + SUBRIP_TIMECODE + ")\\s*");
 
+  // NOTE: Android Studio's suggestion to simplify '\\}' is incorrect [internal: b/144480183].
   private static final Pattern SUBRIP_TAG_PATTERN = Pattern.compile("\\{\\\\.*?\\}");
   private static final String SUBRIP_ALIGNMENT_TAG = "\\{\\\\an[1-9]\\}";
 
@@ -229,7 +231,8 @@ private Cue buildCue(Spanned text, @Nullable String alignmentTag) {
   }
 
   private static long parseTimecode(Matcher matcher, int groupOffset) {
-    long timestampMs = Long.parseLong(matcher.group(groupOffset + 1)) * 60 * 60 * 1000;
+    @Nullable String hours = matcher.group(groupOffset + 1);
+    long timestampMs = hours != null ? Long.parseLong(hours) * 60 * 60 * 1000 : 0;
     timestampMs += Long.parseLong(matcher.group(groupOffset + 2)) * 60 * 1000;
     timestampMs += Long.parseLong(matcher.group(groupOffset + 3)) * 1000;
     timestampMs += Long.parseLong(matcher.group(groupOffset + 4));
diff --git a/library/core/src/test/assets/subrip/typical b/library/core/src/test/assets/subrip/typical
index 1331f756519..cc9a3da8715 100644
--- a/library/core/src/test/assets/subrip/typical
+++ b/library/core/src/test/assets/subrip/typical
@@ -8,5 +8,5 @@ This is the second subtitle.
 Second subtitle with second line.
 
 3
-00:00:04,567 --> 00:00:08,901
+02:00:04,567 --> 02:00:08,901
 This is the third subtitle.
diff --git a/library/core/src/test/assets/subrip/typical_extra_blank_line b/library/core/src/test/assets/subrip/typical_extra_blank_line
index f5882a1d68d..392cb7e91cf 100644
--- a/library/core/src/test/assets/subrip/typical_extra_blank_line
+++ b/library/core/src/test/assets/subrip/typical_extra_blank_line
@@ -9,5 +9,5 @@ This is the second subtitle.
 Second subtitle with second line.
 
 3
-00:00:04,567 --> 00:00:08,901
+02:00:04,567 --> 02:00:08,901
 This is the third subtitle.
diff --git a/library/core/src/test/assets/subrip/typical_missing_sequence b/library/core/src/test/assets/subrip/typical_missing_sequence
index 56d49ac63c7..e75711d7a88 100644
--- a/library/core/src/test/assets/subrip/typical_missing_sequence
+++ b/library/core/src/test/assets/subrip/typical_missing_sequence
@@ -7,5 +7,5 @@ This is the second subtitle.
 Second subtitle with second line.
 
 3
-00:00:04,567 --> 00:00:08,901
+02:00:04,567 --> 02:00:08,901
 This is the third subtitle.
diff --git a/library/core/src/test/assets/subrip/typical_missing_timecode b/library/core/src/test/assets/subrip/typical_missing_timecode
index cd25ffca3b2..bce61a77f9a 100644
--- a/library/core/src/test/assets/subrip/typical_missing_timecode
+++ b/library/core/src/test/assets/subrip/typical_missing_timecode
@@ -7,13 +7,13 @@ This is the second subtitle.
 Second subtitle with second line.
 
 3
-00:00:04,567 --> 00:00:08,901
+02:00:04,567 --> 02:00:08,901
 This is the third subtitle.
 
 4
-             --> 00:00:10,901
+             --> 02:00:10,901
 This is the fourth subtitle.
 
 5
-00:00:12,901 -->
+02:00:12,901 -->
 This is the fifth subtitle.
diff --git a/library/core/src/test/assets/subrip/typical_negative_timestamps b/library/core/src/test/assets/subrip/typical_negative_timestamps
index 2a47c0993b3..1df7bf68e32 100644
--- a/library/core/src/test/assets/subrip/typical_negative_timestamps
+++ b/library/core/src/test/assets/subrip/typical_negative_timestamps
@@ -8,5 +8,5 @@ This is the second subtitle.
 Second subtitle with second line.
 
 3
-00:00:04,567 --> 00:00:08,901
+02:00:04,567 --> 02:00:08,901
 This is the third subtitle.
diff --git a/library/core/src/test/assets/subrip/typical_no_hours b/library/core/src/test/assets/subrip/typical_no_hours
new file mode 100644
index 00000000000..c4bf372a3c3
--- /dev/null
+++ b/library/core/src/test/assets/subrip/typical_no_hours
@@ -0,0 +1,12 @@
+1
+00:00,000 --> 00:01,234
+This is the first subtitle.
+
+2
+00:02,345 --> 00:03,456
+This is the second subtitle.
+Second subtitle with second line.
+
+3
+02:00:04,567 --> 02:00:08,901
+This is the third subtitle.
diff --git a/library/core/src/test/assets/subrip/typical_with_byte_order_mark b/library/core/src/test/assets/subrip/typical_with_byte_order_mark
index 4f5b32f4d79..050e1c02a6f 100644
--- a/library/core/src/test/assets/subrip/typical_with_byte_order_mark
+++ b/library/core/src/test/assets/subrip/typical_with_byte_order_mark
@@ -8,5 +8,5 @@ This is the second subtitle.
 Second subtitle with second line.
 
 3
-00:00:04,567 --> 00:00:08,901
+02:00:04,567 --> 02:00:08,901
 This is the third subtitle.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
index 9f66f65a569..1f292396071 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
@@ -39,6 +39,7 @@ public final class SubripDecoderTest {
   private static final String TYPICAL_NEGATIVE_TIMESTAMPS = "subrip/typical_negative_timestamps";
   private static final String TYPICAL_UNEXPECTED_END = "subrip/typical_unexpected_end";
   private static final String TYPICAL_WITH_TAGS = "subrip/typical_with_tags";
+  private static final String TYPICAL_NO_HOURS = "subrip/typical_no_hours";
 
   @Test
   public void testDecodeEmpty() throws IOException {
@@ -151,9 +152,14 @@ public void testDecodeCueWithTag() throws IOException {
         TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), TYPICAL_WITH_TAGS);
     Subtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
-    assertTypicalCue1(subtitle, 0);
-    assertTypicalCue2(subtitle, 2);
-    assertTypicalCue3(subtitle, 4);
+    assertThat(subtitle.getCues(subtitle.getEventTime(0)).get(0).text.toString())
+        .isEqualTo("This is the first subtitle.");
+
+    assertThat(subtitle.getCues(subtitle.getEventTime(2)).get(0).text.toString())
+        .isEqualTo("This is the second subtitle.\nSecond subtitle with second line.");
+
+    assertThat(subtitle.getCues(subtitle.getEventTime(4)).get(0).text.toString())
+        .isEqualTo("This is the third subtitle.");
 
     assertThat(subtitle.getCues(subtitle.getEventTime(6)).get(0).text.toString())
         .isEqualTo("This { \\an2} is not a valid tag due to the space after the opening bracket.");
@@ -172,6 +178,19 @@ public void testDecodeCueWithTag() throws IOException {
     assertAlignmentCue(subtitle, 26, Cue.ANCHOR_TYPE_START, Cue.ANCHOR_TYPE_END); // {/an9}
   }
 
+  @Test
+  public void decodeTypicalNoHours() throws IOException {
+    SubripDecoder decoder = new SubripDecoder();
+    byte[] bytes =
+        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), TYPICAL_NO_HOURS);
+    Subtitle subtitle = decoder.decode(bytes, bytes.length, false);
+
+    assertThat(subtitle.getEventTimeCount()).isEqualTo(6);
+    assertTypicalCue1(subtitle, 0);
+    assertTypicalCue2(subtitle, 2);
+    assertTypicalCue3(subtitle, 4);
+  }
+
   private static void assertTypicalCue1(Subtitle subtitle, int eventIndex) {
     assertThat(subtitle.getEventTime(eventIndex)).isEqualTo(0);
     assertThat(subtitle.getCues(subtitle.getEventTime(eventIndex)).get(0).text.toString())
@@ -187,10 +206,12 @@ private static void assertTypicalCue2(Subtitle subtitle, int eventIndex) {
   }
 
   private static void assertTypicalCue3(Subtitle subtitle, int eventIndex) {
-    assertThat(subtitle.getEventTime(eventIndex)).isEqualTo(4567000);
+    long expectedStartTimeUs = (((2L * 60L * 60L) + 4L) * 1000L + 567L) * 1000L;
+    assertThat(subtitle.getEventTime(eventIndex)).isEqualTo(expectedStartTimeUs);
     assertThat(subtitle.getCues(subtitle.getEventTime(eventIndex)).get(0).text.toString())
         .isEqualTo("This is the third subtitle.");
-    assertThat(subtitle.getEventTime(eventIndex + 1)).isEqualTo(8901000);
+    long expectedEndTimeUs = (((2L * 60L * 60L) + 8L) * 1000L + 901L) * 1000L;
+    assertThat(subtitle.getEventTime(eventIndex + 1)).isEqualTo(expectedEndTimeUs);
   }
 
   private static void assertAlignmentCue(

From 1d6bd0de15378c04c2fa624cb3d4c5c37f912ee1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 24 Mar 2020 11:31:19 +0000
Subject: [PATCH 24/59] MP4 edit lists: Use floor rather than ceil to find
 first sample

If the start time of the edit falls within a sample, start from that
sample rather than the next one. This ensures playback can start from
the correct point if the sample is a keyframe, rather than having to
start from the next one.

Issue: #7133
PiperOrigin-RevId: 302639115
---
 .../android/exoplayer2/extractor/mp4/AtomParsers.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
index d19999e9e59..17c541ce078 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
@@ -433,10 +433,15 @@ public static TrackSampleTable parseStbl(
         long editDuration =
             Util.scaleLargeTimestamp(
                 track.editListDurations[i], track.timescale, track.movieTimescale);
-        startIndices[i] = Util.binarySearchCeil(timestamps, editMediaTime, true, true);
+        startIndices[i] =
+            Util.binarySearchFloor(
+                timestamps, editMediaTime, /* inclusive= */ true, /* stayInBounds= */ true);
         endIndices[i] =
             Util.binarySearchCeil(
-                timestamps, editMediaTime + editDuration, omitClippedSample, false);
+                timestamps,
+                editMediaTime + editDuration,
+                /* inclusive= */ omitClippedSample,
+                /* stayInBounds= */ false);
         while (startIndices[i] < endIndices[i]
             && (flags[startIndices[i]] & C.BUFFER_FLAG_KEY_FRAME) == 0) {
           // Applying the edit correctly would require prerolling from the previous sync sample. In
@@ -474,7 +479,7 @@ public static TrackSampleTable parseStbl(
         long ptsUs = Util.scaleLargeTimestamp(pts, C.MICROS_PER_SECOND, track.movieTimescale);
         long timeInSegmentUs =
             Util.scaleLargeTimestamp(
-                timestamps[j] - editMediaTime, C.MICROS_PER_SECOND, track.timescale);
+                Math.max(0, timestamps[j] - editMediaTime), C.MICROS_PER_SECOND, track.timescale);
         editedTimestamps[sampleIndex] = ptsUs + timeInSegmentUs;
         if (copyMetadata && editedSizes[sampleIndex] > editedMaximumSize) {
           editedMaximumSize = sizes[j];

From 2094c7491b81554fa8c638cdecff2c978cfaffbb Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 24 Mar 2020 14:24:36 +0000
Subject: [PATCH 25/59] WAV: Don't read past data end position

Issue: #7129
PiperOrigin-RevId: 302660343
---
 RELEASENOTES.md                                 |   2 ++
 .../exoplayer2/extractor/wav/WavExtractor.java  |   8 ++++----
 .../assets/wav/sample_with_trailing_bytes.wav   | Bin 0 -> 88294 bytes
 .../extractor/wav/WavExtractorTest.java         |   3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 library/core/src/test/assets/wav/sample_with_trailing_bytes.wav

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index d9f0ac42748..6ae74edb129 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -8,6 +8,8 @@
     ([#6885](https://github.com/google/ExoPlayer/issues/6885)).
   * Allow missing hours in SubRip (.srt) timecodes
     ([#7122](https://github.com/google/ExoPlayer/issues/7122)).
+* WAV: Fix failure to play WAV files that contain trailing non-media bytes
+  ([#7129](https://github.com/google/ExoPlayer/issues/7129))
 * UI: Add an option to set whether to use the orientation sensor for rotation
   in spherical playbacks
   ([#6761](https://github.com/google/ExoPlayer/issues/6761)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java
index 45a8c24e673..dd27294246d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java
@@ -259,14 +259,14 @@ public void init(int dataStartPosition, long dataEndPosition) {
     public boolean sampleData(ExtractorInput input, long bytesLeft)
         throws IOException, InterruptedException {
       // Write sample data until we've reached the target sample size, or the end of the data.
-      boolean endOfSampleData = bytesLeft == 0;
-      while (!endOfSampleData && pendingOutputBytes < targetSampleSizeBytes) {
+      while (bytesLeft > 0 && pendingOutputBytes < targetSampleSizeBytes) {
         int bytesToRead = (int) Math.min(targetSampleSizeBytes - pendingOutputBytes, bytesLeft);
         int bytesAppended = trackOutput.sampleData(input, bytesToRead, true);
         if (bytesAppended == RESULT_END_OF_INPUT) {
-          endOfSampleData = true;
+          bytesLeft = 0;
         } else {
           pendingOutputBytes += bytesAppended;
+          bytesLeft -= bytesAppended;
         }
       }
 
@@ -288,7 +288,7 @@ public boolean sampleData(ExtractorInput input, long bytesLeft)
         pendingOutputBytes = offset;
       }
 
-      return endOfSampleData;
+      return bytesLeft <= 0;
     }
   }
 
diff --git a/library/core/src/test/assets/wav/sample_with_trailing_bytes.wav b/library/core/src/test/assets/wav/sample_with_trailing_bytes.wav
new file mode 100644
index 0000000000000000000000000000000000000000..0b06efcf0987a335396e199cb0115deadd9ead2f
GIT binary patch
literal 88294
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

literal 0
HcmV?d00001

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
index 7f9549ea756..0f4220c7f31 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.wav;
 
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import org.junit.Test;
@@ -30,7 +31,7 @@ public void testSample() throws Exception {
   }
 
   @Test
-  public void testSampleImaAdpcm() throws Exception {
+  public void sample_imaAdpcm() throws Exception {
     ExtractorAsserts.assertBehavior(WavExtractor::new, "wav/sample_ima_adpcm.wav");
   }
 }

From 54c608481b5abf2a5ff27ef3fa7b4528c4824793 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 24 Mar 2020 15:32:52 +0000
Subject: [PATCH 26/59] Support 32-bit FP to 16-bit Int audio resampling

This is a no-op for DefaultAudioSink for now, because DefaultAudioSink
currently disables processing anyway if the input uses ENCODING_PCM_FLOAT.

Issue: #7134
PiperOrigin-RevId: 302670534
---
 .../audio/ResamplingAudioProcessor.java       | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
index 7175b93614c..883f5bcb924 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
@@ -20,8 +20,17 @@
 import java.nio.ByteBuffer;
 
 /**
- * An {@link AudioProcessor} that converts 8-bit, 24-bit and 32-bit integer PCM audio to 16-bit
- * integer PCM audio.
+ * An {@link AudioProcessor} that converts different PCM audio encodings to 16-bit integer PCM. The
+ * following encodings are supported as input:
+ *
+ * <ul>
+ *   <li>{@link C#ENCODING_PCM_8BIT}
+ *   <li>{@link C#ENCODING_PCM_16BIT} ({@link #isActive()} will return {@code false})
+ *   <li>{@link C#ENCODING_PCM_16BIT_BIG_ENDIAN}
+ *   <li>{@link C#ENCODING_PCM_24BIT}
+ *   <li>{@link C#ENCODING_PCM_32BIT}
+ *   <li>{@link C#ENCODING_PCM_FLOAT}
+ * </ul>
  */
 /* package */ final class ResamplingAudioProcessor extends BaseAudioProcessor {
 
@@ -33,7 +42,8 @@ public AudioFormat onConfigure(AudioFormat inputAudioFormat)
         && encoding != C.ENCODING_PCM_16BIT
         && encoding != C.ENCODING_PCM_16BIT_BIG_ENDIAN
         && encoding != C.ENCODING_PCM_24BIT
-        && encoding != C.ENCODING_PCM_32BIT) {
+        && encoding != C.ENCODING_PCM_32BIT
+        && encoding != C.ENCODING_PCM_FLOAT) {
       throw new UnhandledAudioFormatException(inputAudioFormat);
     }
     return encoding != C.ENCODING_PCM_16BIT
@@ -60,10 +70,10 @@ public void queueInput(ByteBuffer inputBuffer) {
         resampledSize = (size / 3) * 2;
         break;
       case C.ENCODING_PCM_32BIT:
+      case C.ENCODING_PCM_FLOAT:
         resampledSize = size / 2;
         break;
       case C.ENCODING_PCM_16BIT:
-      case C.ENCODING_PCM_FLOAT:
       case C.ENCODING_INVALID:
       case Format.NO_VALUE:
       default:
@@ -101,8 +111,16 @@ public void queueInput(ByteBuffer inputBuffer) {
           buffer.put(inputBuffer.get(i + 3));
         }
         break;
-      case C.ENCODING_PCM_16BIT:
       case C.ENCODING_PCM_FLOAT:
+        // 32 bit floating point -> 16 bit resampling. Floating point values are in the range
+        // [-1.0, 1.0], so need to be scaled by Short.MAX_VALUE.
+        for (int i = position; i < limit; i += 4) {
+          short value = (short) (inputBuffer.getFloat(i) * Short.MAX_VALUE);
+          buffer.put((byte) (value & 0xFF));
+          buffer.put((byte) ((value >> 8) & 0xFF));
+        }
+        break;
+      case C.ENCODING_PCM_16BIT:
       case C.ENCODING_INVALID:
       case Format.NO_VALUE:
       default:

From ddc98334e03ec8ee97d21ca48cab3cf094ee0de8 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 24 Mar 2020 15:49:34 +0000
Subject: [PATCH 27/59] DefaultAudioSink: Fix issue if last processor is not
 active

It's incorrect to use an AudioFormat returned from AudioProcessor.configure
unless the AudioProcessor is active.

Issue: #7134
PiperOrigin-RevId: 302674132
---
 .../exoplayer2/audio/DefaultAudioSink.java      | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index 27abf486faa..1824303a570 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -437,22 +437,21 @@ && supportsOutput(inputChannelCount, C.ENCODING_PCM_FLOAT)
     if (processingEnabled) {
       trimmingAudioProcessor.setTrimFrameCount(trimStartFrames, trimEndFrames);
       channelMappingAudioProcessor.setChannelMap(outputChannels);
-      AudioProcessor.AudioFormat inputAudioFormat =
+      AudioProcessor.AudioFormat outputFormat =
           new AudioProcessor.AudioFormat(sampleRate, channelCount, encoding);
-      AudioProcessor.AudioFormat outputAudioFormat = inputAudioFormat;
       for (AudioProcessor audioProcessor : availableAudioProcessors) {
         try {
-          outputAudioFormat = audioProcessor.configure(inputAudioFormat);
+          AudioProcessor.AudioFormat nextFormat = audioProcessor.configure(outputFormat);
+          if (audioProcessor.isActive()) {
+            outputFormat = nextFormat;
+          }
         } catch (UnhandledAudioFormatException e) {
           throw new ConfigurationException(e);
         }
-        if (audioProcessor.isActive()) {
-          inputAudioFormat = outputAudioFormat;
-        }
       }
-      sampleRate = outputAudioFormat.sampleRate;
-      channelCount = outputAudioFormat.channelCount;
-      encoding = outputAudioFormat.encoding;
+      sampleRate = outputFormat.sampleRate;
+      channelCount = outputFormat.channelCount;
+      encoding = outputFormat.encoding;
     }
 
     int outputChannelConfig = getChannelConfig(channelCount, isInputPcm);

From a038346ecc6f3d8a30b0a955fb25f8092919adad Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 25 Mar 2020 12:50:03 +0000
Subject: [PATCH 28/59] Resample float audio to 16-bit by default to enable
 audio processing

This is less confusing than having audio processing functionality (e.g., playback
speed adjustment) just "not work" for some pieces of media.

If this change is merged, I will update #6749 to also track making DefaultAudioSink
intelligently enable/disable float output depending on how the audio processors are
configured.

Issue: #7134
PiperOrigin-RevId: 302871568
---
 RELEASENOTES.md                               | 16 +++--
 .../exoplayer2/audio/DefaultAudioSink.java    | 45 ++++++------
 .../audio/FloatResamplingAudioProcessor.java  | 70 ++++++++++++-------
 .../google/android/exoplayer2/util/Util.java  | 10 +--
 4 files changed, 81 insertions(+), 60 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6ae74edb129..dca91883202 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -8,15 +8,21 @@
     ([#6885](https://github.com/google/ExoPlayer/issues/6885)).
   * Allow missing hours in SubRip (.srt) timecodes
     ([#7122](https://github.com/google/ExoPlayer/issues/7122)).
-* WAV: Fix failure to play WAV files that contain trailing non-media bytes
-  ([#7129](https://github.com/google/ExoPlayer/issues/7129))
-* UI: Add an option to set whether to use the orientation sensor for rotation
-  in spherical playbacks
-  ([#6761](https://github.com/google/ExoPlayer/issues/6761)).
+* Audio:
+  * Enable playback speed adjustment and silence skipping for floating point PCM
+    audio, via resampling to 16-bit integer PCM. To output the original floating
+    point audio without adjustment, pass `enableFloatOutput=true` to the
+    `DefaultAudioSink` constructor
+    ([#7134](https://github.com/google/ExoPlayer/issues/7134)).
+  * Fix failure to play WAV files that contain trailing non-media bytes
+    ([#7129](https://github.com/google/ExoPlayer/issues/7129))
 * DASH: 
     * Update the manifest URI to avoid repeated HTTP redirects
       ([#6907](https://github.com/google/ExoPlayer/issues/6907)).
     * Parse period `AssetIdentifier` elements.
+* UI: Add an option to set whether to use the orientation sensor for rotation
+  in spherical playbacks
+  ([#6761](https://github.com/google/ExoPlayer/issues/6761)).
 * FFmpeg extension: Add support for x86_64.
 
 ### 2.11.3 (2020-02-19) ###
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index 1824303a570..ba31c118e7c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -238,7 +238,7 @@ public long getSkippedOutputFrameCount() {
 
   @Nullable private final AudioCapabilities audioCapabilities;
   private final AudioProcessorChain audioProcessorChain;
-  private final boolean enableConvertHighResIntPcmToFloat;
+  private final boolean enableFloatOutput;
   private final ChannelMappingAudioProcessor channelMappingAudioProcessor;
   private final TrimmingAudioProcessor trimmingAudioProcessor;
   private final AudioProcessor[] toIntPcmAvailableAudioProcessors;
@@ -299,7 +299,7 @@ public long getSkippedOutputFrameCount() {
    */
   public DefaultAudioSink(
       @Nullable AudioCapabilities audioCapabilities, AudioProcessor[] audioProcessors) {
-    this(audioCapabilities, audioProcessors, /* enableConvertHighResIntPcmToFloat= */ false);
+    this(audioCapabilities, audioProcessors, /* enableFloatOutput= */ false);
   }
 
   /**
@@ -309,19 +309,16 @@ public DefaultAudioSink(
    *     default capabilities (no encoded audio passthrough support) should be assumed.
    * @param audioProcessors An array of {@link AudioProcessor}s that will process PCM audio before
    *     output. May be empty.
-   * @param enableConvertHighResIntPcmToFloat Whether to enable conversion of high resolution
-   *     integer PCM to 32-bit float for output, if possible. Functionality that uses 16-bit integer
-   *     audio processing (for example, speed and pitch adjustment) will not be available when float
-   *     output is in use.
+   * @param enableFloatOutput Whether to enable 32-bit float output. Where possible, 32-bit float
+   *     output will be used if the input is 32-bit float, and also if the input is high resolution
+   *     (24-bit or 32-bit) integer PCM. Audio processing (for example, speed adjustment) will not
+   *     be available when float output is in use.
    */
   public DefaultAudioSink(
       @Nullable AudioCapabilities audioCapabilities,
       AudioProcessor[] audioProcessors,
-      boolean enableConvertHighResIntPcmToFloat) {
-    this(
-        audioCapabilities,
-        new DefaultAudioProcessorChain(audioProcessors),
-        enableConvertHighResIntPcmToFloat);
+      boolean enableFloatOutput) {
+    this(audioCapabilities, new DefaultAudioProcessorChain(audioProcessors), enableFloatOutput);
   }
 
   /**
@@ -332,18 +329,18 @@ public DefaultAudioSink(
    *     default capabilities (no encoded audio passthrough support) should be assumed.
    * @param audioProcessorChain An {@link AudioProcessorChain} which is used to apply playback
    *     parameters adjustments. The instance passed in must not be reused in other sinks.
-   * @param enableConvertHighResIntPcmToFloat Whether to enable conversion of high resolution
-   *     integer PCM to 32-bit float for output, if possible. Functionality that uses 16-bit integer
-   *     audio processing (for example, speed and pitch adjustment) will not be available when float
-   *     output is in use.
+   * @param enableFloatOutput Whether to enable 32-bit float output. Where possible, 32-bit float
+   *     output will be used if the input is 32-bit float, and also if the input is high resolution
+   *     (24-bit or 32-bit) integer PCM. Audio processing (for example, speed adjustment) will not
+   *     be available when float output is in use.
    */
   public DefaultAudioSink(
       @Nullable AudioCapabilities audioCapabilities,
       AudioProcessorChain audioProcessorChain,
-      boolean enableConvertHighResIntPcmToFloat) {
+      boolean enableFloatOutput) {
     this.audioCapabilities = audioCapabilities;
     this.audioProcessorChain = Assertions.checkNotNull(audioProcessorChain);
-    this.enableConvertHighResIntPcmToFloat = enableConvertHighResIntPcmToFloat;
+    this.enableFloatOutput = enableFloatOutput;
     releasingConditionVariable = new ConditionVariable(true);
     audioTrackPositionTracker = new AudioTrackPositionTracker(new PositionTrackerListener());
     channelMappingAudioProcessor = new ChannelMappingAudioProcessor();
@@ -422,18 +419,16 @@ public void configure(
     }
 
     boolean isInputPcm = Util.isEncodingLinearPcm(inputEncoding);
-    boolean processingEnabled = isInputPcm && inputEncoding != C.ENCODING_PCM_FLOAT;
+    boolean processingEnabled = isInputPcm;
     int sampleRate = inputSampleRate;
     int channelCount = inputChannelCount;
     @C.Encoding int encoding = inputEncoding;
-    boolean shouldConvertHighResIntPcmToFloat =
-        enableConvertHighResIntPcmToFloat
+    boolean useFloatOutput =
+        enableFloatOutput
             && supportsOutput(inputChannelCount, C.ENCODING_PCM_FLOAT)
-            && Util.isEncodingHighResolutionIntegerPcm(inputEncoding);
+            && Util.isEncodingHighResolutionPcm(inputEncoding);
     AudioProcessor[] availableAudioProcessors =
-        shouldConvertHighResIntPcmToFloat
-            ? toFloatPcmAvailableAudioProcessors
-            : toIntPcmAvailableAudioProcessors;
+        useFloatOutput ? toFloatPcmAvailableAudioProcessors : toIntPcmAvailableAudioProcessors;
     if (processingEnabled) {
       trimmingAudioProcessor.setTrimFrameCount(trimStartFrames, trimEndFrames);
       channelMappingAudioProcessor.setChannelMap(outputChannels);
@@ -463,7 +458,7 @@ && supportsOutput(inputChannelCount, C.ENCODING_PCM_FLOAT)
         isInputPcm ? Util.getPcmFrameSize(inputEncoding, inputChannelCount) : C.LENGTH_UNSET;
     int outputPcmFrameSize =
         isInputPcm ? Util.getPcmFrameSize(encoding, channelCount) : C.LENGTH_UNSET;
-    boolean canApplyPlaybackParameters = processingEnabled && !shouldConvertHighResIntPcmToFloat;
+    boolean canApplyPlaybackParameters = processingEnabled && !useFloatOutput;
     Configuration pendingConfiguration =
         new Configuration(
             isInputPcm,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
index a75e675e6e0..ca6b4f3f138 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
@@ -16,13 +16,19 @@
 package com.google.android.exoplayer2.audio;
 
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.Util;
 import java.nio.ByteBuffer;
 
 /**
- * An {@link AudioProcessor} that converts 24-bit and 32-bit integer PCM audio to 32-bit float PCM
- * audio.
+ * An {@link AudioProcessor} that converts high resolution PCM audio to 32-bit float. The following
+ * encodings are supported as input:
+ *
+ * <ul>
+ *   <li>{@link C#ENCODING_PCM_24BIT}
+ *   <li>{@link C#ENCODING_PCM_32BIT}
+ *   <li>{@link C#ENCODING_PCM_FLOAT} ({@link #isActive()} will return {@code false})
+ * </ul>
  */
 /* package */ final class FloatResamplingAudioProcessor extends BaseAudioProcessor {
 
@@ -32,10 +38,11 @@
   @Override
   public AudioFormat onConfigure(AudioFormat inputAudioFormat)
       throws UnhandledAudioFormatException {
-    if (!Util.isEncodingHighResolutionIntegerPcm(inputAudioFormat.encoding)) {
+    @C.PcmEncoding int encoding = inputAudioFormat.encoding;
+    if (!Util.isEncodingHighResolutionPcm(encoding)) {
       throw new UnhandledAudioFormatException(inputAudioFormat);
     }
-    return Util.isEncodingHighResolutionIntegerPcm(inputAudioFormat.encoding)
+    return encoding != C.ENCODING_PCM_FLOAT
         ? new AudioFormat(
             inputAudioFormat.sampleRate, inputAudioFormat.channelCount, C.ENCODING_PCM_FLOAT)
         : AudioFormat.NOT_SET;
@@ -43,31 +50,42 @@ public AudioFormat onConfigure(AudioFormat inputAudioFormat)
 
   @Override
   public void queueInput(ByteBuffer inputBuffer) {
-    Assertions.checkState(Util.isEncodingHighResolutionIntegerPcm(inputAudioFormat.encoding));
-    boolean isInput32Bit = inputAudioFormat.encoding == C.ENCODING_PCM_32BIT;
     int position = inputBuffer.position();
     int limit = inputBuffer.limit();
     int size = limit - position;
 
-    int resampledSize = isInput32Bit ? size : (size / 3) * 4;
-    ByteBuffer buffer = replaceOutputBuffer(resampledSize);
-    if (isInput32Bit) {
-      for (int i = position; i < limit; i += 4) {
-        int pcm32BitInteger =
-            (inputBuffer.get(i) & 0xFF)
-                | ((inputBuffer.get(i + 1) & 0xFF) << 8)
-                | ((inputBuffer.get(i + 2) & 0xFF) << 16)
-                | ((inputBuffer.get(i + 3) & 0xFF) << 24);
-        writePcm32BitFloat(pcm32BitInteger, buffer);
-      }
-    } else { // Input is 24-bit PCM.
-      for (int i = position; i < limit; i += 3) {
-        int pcm32BitInteger =
-            ((inputBuffer.get(i) & 0xFF) << 8)
-                | ((inputBuffer.get(i + 1) & 0xFF) << 16)
-                | ((inputBuffer.get(i + 2) & 0xFF) << 24);
-        writePcm32BitFloat(pcm32BitInteger, buffer);
-      }
+    ByteBuffer buffer;
+    switch (inputAudioFormat.encoding) {
+      case C.ENCODING_PCM_24BIT:
+        buffer = replaceOutputBuffer((size / 3) * 4);
+        for (int i = position; i < limit; i += 3) {
+          int pcm32BitInteger =
+              ((inputBuffer.get(i) & 0xFF) << 8)
+                  | ((inputBuffer.get(i + 1) & 0xFF) << 16)
+                  | ((inputBuffer.get(i + 2) & 0xFF) << 24);
+          writePcm32BitFloat(pcm32BitInteger, buffer);
+        }
+        break;
+      case C.ENCODING_PCM_32BIT:
+        buffer = replaceOutputBuffer(size);
+        for (int i = position; i < limit; i += 4) {
+          int pcm32BitInteger =
+              (inputBuffer.get(i) & 0xFF)
+                  | ((inputBuffer.get(i + 1) & 0xFF) << 8)
+                  | ((inputBuffer.get(i + 2) & 0xFF) << 16)
+                  | ((inputBuffer.get(i + 3) & 0xFF) << 24);
+          writePcm32BitFloat(pcm32BitInteger, buffer);
+        }
+        break;
+      case C.ENCODING_PCM_8BIT:
+      case C.ENCODING_PCM_16BIT:
+      case C.ENCODING_PCM_16BIT_BIG_ENDIAN:
+      case C.ENCODING_PCM_FLOAT:
+      case C.ENCODING_INVALID:
+      case Format.NO_VALUE:
+      default:
+        // Never happens.
+        throw new IllegalStateException();
     }
 
     inputBuffer.position(inputBuffer.limit());
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
index 5518eeaf36f..ea43ee7bb36 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -1360,13 +1360,15 @@ public static boolean isEncodingLinearPcm(@C.Encoding int encoding) {
   }
 
   /**
-   * Returns whether {@code encoding} is high resolution (&gt; 16-bit) integer PCM.
+   * Returns whether {@code encoding} is high resolution (&gt; 16-bit) PCM.
    *
    * @param encoding The encoding of the audio data.
-   * @return Whether the encoding is high resolution integer PCM.
+   * @return Whether the encoding is high resolution PCM.
    */
-  public static boolean isEncodingHighResolutionIntegerPcm(@C.PcmEncoding int encoding) {
-    return encoding == C.ENCODING_PCM_24BIT || encoding == C.ENCODING_PCM_32BIT;
+  public static boolean isEncodingHighResolutionPcm(@C.PcmEncoding int encoding) {
+    return encoding == C.ENCODING_PCM_24BIT
+        || encoding == C.ENCODING_PCM_32BIT
+        || encoding == C.ENCODING_PCM_FLOAT;
   }
 
   /**

From c9f28086db2ce93db78e62159c49248621cbd40a Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Thu, 26 Mar 2020 18:17:57 +0000
Subject: [PATCH 29/59] Make milliseconds optional in SubRip (SRT) subtitles

issue:#7122
PiperOrigin-RevId: 303154493
---
 RELEASENOTES.md                                        |  6 +++---
 .../android/exoplayer2/text/subrip/SubripDecoder.java  |  9 ++++++---
 .../{typical_no_hours => typical_no_hours_and_millis}  |  2 +-
 .../exoplayer2/text/subrip/SubripDecoderTest.java      | 10 ++++++----
 4 files changed, 16 insertions(+), 11 deletions(-)
 rename library/core/src/test/assets/subrip/{typical_no_hours => typical_no_hours_and_millis} (88%)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index dca91883202..404597fb13d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -3,10 +3,10 @@
 ### 2.11.4 (not yet released) ###
 
 * Text:
-  *  Catch-and-log all fatal exceptions in `TextRenderer` instead of
-    re-throwing, allowing playback to continue even if subtitles fail
+  * Catch-and-log all fatal exceptions in `TextRenderer` instead of re-throwing,
+    allowing playback to continue even if subtitles fail
     ([#6885](https://github.com/google/ExoPlayer/issues/6885)).
-  * Allow missing hours in SubRip (.srt) timecodes
+  * Allow missing hours and milliseconds in SubRip (.srt) timecodes
     ([#7122](https://github.com/google/ExoPlayer/issues/7122)).
 * Audio:
   * Enable playback speed adjustment and silence skipping for floating point PCM
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
index 2b562ff8c77..cef7e3f53f4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
@@ -41,8 +41,8 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
 
   private static final String TAG = "SubripDecoder";
 
-  // Some SRT files don't include hours in the timecode, so we use an optional group.
-  private static final String SUBRIP_TIMECODE = "(?:(\\d+):)?(\\d+):(\\d+),(\\d+)";
+  // Some SRT files don't include hours or milliseconds in the timecode, so we use optional groups.
+  private static final String SUBRIP_TIMECODE = "(?:(\\d+):)?(\\d+):(\\d+)(?:,(\\d+))?";
   private static final Pattern SUBRIP_TIMING_LINE =
       Pattern.compile("\\s*(" + SUBRIP_TIMECODE + ")\\s*-->\\s*(" + SUBRIP_TIMECODE + ")\\s*");
 
@@ -235,7 +235,10 @@ private static long parseTimecode(Matcher matcher, int groupOffset) {
     long timestampMs = hours != null ? Long.parseLong(hours) * 60 * 60 * 1000 : 0;
     timestampMs += Long.parseLong(matcher.group(groupOffset + 2)) * 60 * 1000;
     timestampMs += Long.parseLong(matcher.group(groupOffset + 3)) * 1000;
-    timestampMs += Long.parseLong(matcher.group(groupOffset + 4));
+    @Nullable String millis = matcher.group(groupOffset + 4);
+    if (millis != null) {
+      timestampMs += Long.parseLong(millis);
+    }
     return timestampMs * 1000;
   }
 
diff --git a/library/core/src/test/assets/subrip/typical_no_hours b/library/core/src/test/assets/subrip/typical_no_hours_and_millis
similarity index 88%
rename from library/core/src/test/assets/subrip/typical_no_hours
rename to library/core/src/test/assets/subrip/typical_no_hours_and_millis
index c4bf372a3c3..5340fc72c25 100644
--- a/library/core/src/test/assets/subrip/typical_no_hours
+++ b/library/core/src/test/assets/subrip/typical_no_hours_and_millis
@@ -3,7 +3,7 @@
 This is the first subtitle.
 
 2
-00:02,345 --> 00:03,456
+00:00:02 --> 00:00:03
 This is the second subtitle.
 Second subtitle with second line.
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
index 1f292396071..dec7a255239 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
@@ -39,7 +39,7 @@ public final class SubripDecoderTest {
   private static final String TYPICAL_NEGATIVE_TIMESTAMPS = "subrip/typical_negative_timestamps";
   private static final String TYPICAL_UNEXPECTED_END = "subrip/typical_unexpected_end";
   private static final String TYPICAL_WITH_TAGS = "subrip/typical_with_tags";
-  private static final String TYPICAL_NO_HOURS = "subrip/typical_no_hours";
+  private static final String TYPICAL_NO_HOURS_AND_MILLIS = "subrip/typical_no_hours_and_millis";
 
   @Test
   public void testDecodeEmpty() throws IOException {
@@ -179,15 +179,17 @@ public void testDecodeCueWithTag() throws IOException {
   }
 
   @Test
-  public void decodeTypicalNoHours() throws IOException {
+  public void decodeTypicalNoHoursAndMillis() throws IOException {
     SubripDecoder decoder = new SubripDecoder();
     byte[] bytes =
-        TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), TYPICAL_NO_HOURS);
+        TestUtil.getByteArray(
+            ApplicationProvider.getApplicationContext(), TYPICAL_NO_HOURS_AND_MILLIS);
     Subtitle subtitle = decoder.decode(bytes, bytes.length, false);
 
     assertThat(subtitle.getEventTimeCount()).isEqualTo(6);
     assertTypicalCue1(subtitle, 0);
-    assertTypicalCue2(subtitle, 2);
+    assertThat(subtitle.getEventTime(2)).isEqualTo(2_000_000);
+    assertThat(subtitle.getEventTime(3)).isEqualTo(3_000_000);
     assertTypicalCue3(subtitle, 4);
   }
 

From 3fd7d214cded8fc7fdad73d41791db452f330502 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 27 Mar 2020 13:27:06 +0000
Subject: [PATCH 30/59] Consistency fixes for FFmpeg extension instructions

PiperOrigin-RevId: 303316976
---
 extensions/ffmpeg/README.md                    | 14 +++++++-------
 extensions/ffmpeg/src/main/jni/build_ffmpeg.sh |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extensions/ffmpeg/README.md b/extensions/ffmpeg/README.md
index 1b2db8f0f4b..f6e39445728 100644
--- a/extensions/ffmpeg/README.md
+++ b/extensions/ffmpeg/README.md
@@ -35,22 +35,22 @@ FFMPEG_EXT_PATH="$(pwd)/extensions/ffmpeg/src/main/jni"
 NDK_PATH="<path to Android NDK>"
 ```
 
-* Set up host platform ("darwin-x86_64" for Mac OS X):
+* Set the host platform (use "darwin-x86_64" for Mac OS X):
 
 ```
 HOST_PLATFORM="linux-x86_64"
 ```
 
-* Configure the formats supported by adapting the following variable if needed
-  and by setting it. See the [Supported formats][] page for more details of the
-  formats.
+* Configure the decoders to include. See the [Supported formats][] page for
+  details of the available decoders, and which formats they support.
 
 ```
 ENABLED_DECODERS=(vorbis opus flac)
 ```
 
-* Fetch and build FFmpeg. For example, executing script `build_ffmpeg.sh` will
-  fetch and build FFmpeg release 4.2 for armeabi-v7a, arm64-v8a and x86:
+* Fetch and build FFmpeg. Executing `build_ffmpeg.sh` will fetch and build
+  FFmpeg 4.2 for `armeabi-v7a`, `arm64-v8a`, `x86` and `x86_64`. The script can
+  be edited if you need to build for different architectures.
 
 ```
 cd "${FFMPEG_EXT_PATH}" && \
@@ -63,7 +63,7 @@ cd "${FFMPEG_EXT_PATH}" && \
 
 ```
 cd "${FFMPEG_EXT_PATH}" && \
-${NDK_PATH}/ndk-build APP_ABI="armeabi-v7a arm64-v8a x86" -j4
+${NDK_PATH}/ndk-build APP_ABI="armeabi-v7a arm64-v8a x86 x86_64" -j4
 ```
 
 ## Build instructions (Windows) ##
diff --git a/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh b/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh
index b7d8f0eb7fe..833ea189b23 100755
--- a/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh
+++ b/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh
@@ -85,7 +85,7 @@ make clean
     --libdir=android-libs/x86_64 \
     --arch=x86_64 \
     --cpu=x86_64 \
-    --cross-prefix="${TOOLCHAIN_PREFIX}/x86_64-linux-android16-" \
+    --cross-prefix="${TOOLCHAIN_PREFIX}/x86_64-linux-android21-" \
     --nm="${TOOLCHAIN_PREFIX}/x86_64-linux-android-nm" \
     --strip="${TOOLCHAIN_PREFIX}/x86_64-linux-android-strip" \
     --disable-asm \

From 0a5a3cbf463cd7cd4eb310e8048f66979426065a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 27 Mar 2020 15:28:36 +0000
Subject: [PATCH 31/59] Handle orientation changes in GL demo

Issue: #7141
PiperOrigin-RevId: 303334072
---
 demos/gl/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demos/gl/src/main/AndroidManifest.xml b/demos/gl/src/main/AndroidManifest.xml
index de47da531ed..4c95d1ec2f5 100644
--- a/demos/gl/src/main/AndroidManifest.xml
+++ b/demos/gl/src/main/AndroidManifest.xml
@@ -28,6 +28,7 @@
 
     <activity
         android:name=".MainActivity"
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
         android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>

From a9cbbf91c3e5104741845284a4fa9e6b5103f2c4 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 27 Mar 2020 16:45:09 +0000
Subject: [PATCH 32/59] Skip aliases of other codecs

- They are always listed with their canonical names
- Considering aliases means that blacklisting a decoder can end up
  not actually blacklisting it, since it may still be accessible
  via an alias. It also means that our decoder fallback logic can
  end up falling back to a decoder that we've already tried!

PiperOrigin-RevId: 303348297
---
 .../exoplayer2/mediacodec/MediaCodecUtil.java | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index bb6c52d253e..2b8dcc0a559 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -25,6 +25,7 @@
 import android.util.SparseIntArray;
 import androidx.annotation.CheckResult;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.Log;
@@ -289,9 +290,16 @@ private static ArrayList<MediaCodecInfo> getDecoderInfosInternal(
       // Note: MediaCodecList is sorted by the framework such that the best decoders come first.
       for (int i = 0; i < numberOfCodecs; i++) {
         android.media.MediaCodecInfo codecInfo = mediaCodecList.getCodecInfoAt(i);
+        if (isAlias(codecInfo)) {
+          // Skip aliases of other codecs, since they will also be listed under their canonical
+          // names.
+          continue;
+        }
         String name = codecInfo.getName();
-        @Nullable
-        String codecMimeType = getCodecMimeType(codecInfo, name, secureDecodersExplicit, mimeType);
+        if (!isCodecUsableDecoder(codecInfo, name, secureDecodersExplicit, mimeType)) {
+          continue;
+        }
+        @Nullable String codecMimeType = getCodecMimeType(codecInfo, name, mimeType);
         if (codecMimeType == null) {
           continue;
         }
@@ -373,7 +381,6 @@ private static ArrayList<MediaCodecInfo> getDecoderInfosInternal(
    *
    * @param info The codec information.
    * @param name The name of the codec
-   * @param secureDecodersExplicit Whether secure decoders were explicitly listed, if present.
    * @param mimeType The MIME type.
    * @return The codec's supported MIME type for media of type {@code mimeType}, or {@code null} if
    *     the codec can't be used. If non-null, the returned type will be equal to {@code mimeType}
@@ -383,12 +390,7 @@ private static ArrayList<MediaCodecInfo> getDecoderInfosInternal(
   private static String getCodecMimeType(
       android.media.MediaCodecInfo info,
       String name,
-      boolean secureDecodersExplicit,
       String mimeType) {
-    if (!isCodecUsableDecoder(info, name, secureDecodersExplicit, mimeType)) {
-      return null;
-    }
-
     String[] supportedTypes = info.getSupportedTypes();
     for (String supportedType : supportedTypes) {
       if (supportedType.equalsIgnoreCase(mimeType)) {
@@ -591,6 +593,15 @@ private static void applyWorkarounds(String mimeType, List<MediaCodecInfo> decod
     }
   }
 
+  private static boolean isAlias(android.media.MediaCodecInfo info) {
+    return Util.SDK_INT >= 29 && isAliasV29(info);
+  }
+
+  @RequiresApi(29)
+  private static boolean isAliasV29(android.media.MediaCodecInfo info) {
+    return info.isAlias();
+  }
+
   /**
    * The result of {@link android.media.MediaCodecInfo#isHardwareAccelerated()} for API levels 29+,
    * or a best-effort approximation for lower levels.

From 69ca534935d60d7b7e8661627633240df0858070 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 27 Mar 2020 17:15:49 +0000
Subject: [PATCH 33/59] Parse opus gain correctly as a signed value

Issue: #7046
PiperOrigin-RevId: 303354941
---
 RELEASENOTES.md                                 |   2 ++
 .../assets/bear-opus-negative-gain.mka          | Bin 0 -> 25717 bytes
 .../assets/{bear-opus.webm => bear-opus.mka}    | Bin
 .../exoplayer2/ext/opus/OpusPlaybackTest.java   |   9 ++++++++-
 .../exoplayer2/ext/opus/OpusDecoder.java        |  10 +++++++---
 5 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 extensions/opus/src/androidTest/assets/bear-opus-negative-gain.mka
 rename extensions/opus/src/androidTest/assets/{bear-opus.webm => bear-opus.mka} (100%)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 404597fb13d..1bc43e60fcc 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -24,6 +24,8 @@
   in spherical playbacks
   ([#6761](https://github.com/google/ExoPlayer/issues/6761)).
 * FFmpeg extension: Add support for x86_64.
+* Opus extension: Fix parsing of negative gain values
+  ([#7046](https://github.com/google/ExoPlayer/issues/7046)).
 
 ### 2.11.3 (2020-02-19) ###
 
diff --git a/extensions/opus/src/androidTest/assets/bear-opus-negative-gain.mka b/extensions/opus/src/androidTest/assets/bear-opus-negative-gain.mka
new file mode 100644
index 0000000000000000000000000000000000000000..3ee21adfd3011dcad531140331b0b6f24b713c13
GIT binary patch
literal 25717
zcmdSA^;cWp^F54vvEuGpq_`8jxI4v)Q`|j4ixhWvr??e&*W&I@ahH74*ZcF!^Cvu6
zD_OZ~C1=f@GqY#Uo^y$$HVdGk{(F&&hk~HRA0Y2*5S;i82uVCJ*u&h^PCN{983KYK
zPzPH6@26%WSc)0008+)aNcD<fT-h=U^-9pDVp|mC3Qyygt$Jl3H2c~AEnEM;)&GC>
z`R|tg&wMGS#o8bYaeyN5r-F&Q1vfV<Cok(~_Rrd4|KDqu!dTU8ZJz7e;TCy@g2bG)
z&<V-#AAlm8|8D%BSN?B7(_jDhMRySd?J@v@&ICbGHD(66*_(xiiWw=ZXsT<K2YqAB
z)oKfd>u-Px0>Nzm-#@T&KroFz0EdqMt!Zio!u*z>pzP@8^2OZ53>t<H8rTK}1qMTr
zOEkIt?=Pl_haji|F&_{V6!6uBoS^~@mA5q}lBN2kzzG?*O@C{>`qkv4^{f;Vg@b~w
zJd%hEmmtHXVE2?fHRpIZ+`1ghb)FABH&W%$jo^4lX$6K)WI6vG#+w%@$`6l5<fP3`
zhe2c8^_%YxS#_4i@gX*nsQ%&T=wxVC-q!YW_i>0_c<lU*$*UJfh;ku?3&t`m&r6z!
zqBPN*Ye=_xwJ~By2vVwte_Z)<s2%FzIa+4momggkt3OXu>))aYWF(eX+v}6KxE|UG
z%%&!T_0Wzx@xXdeJF1JL<|R6n!i}4@OYveC8mnKkK~u!fQp&s>=_U^6@+v=RjIzrk
zR?`lQ^er4SzPO|%d2#J)?qsW2i1L|b#}If6iyDq@LsKl3ZtYhmtIJh3HJ+<#U5b;1
z8F%sDKrcBpM%la*6n+x>p*?U~eoFG4!;TOQ5d0!ip=~^DO)WVeK7=+jmfGtq)o?c{
zKFOikUdDq-sw_yL<5Pt7t{C5J>i*UQmKCpfYb*eCfuL}KuVOwuMaOlkVV;#34hlpq
z$s`I^D~mQ{Yh!<50#w5E7lHA=Fs;-_e9k2ZqFU-7h!E^u!tsnA4P~0$NtWuFK!MBk
z>bJX-SjTQ9Cw~lnOOoSzWji-o4?pT{#gi>GUddD&lIRTm)mTf4yu$oMW;RaBipHTh
zl7|b5i98>tO&dBm)`Ma0uPCAr27MT(T5O&2k=MiJi%D`;s~@t%N>aAfC(=EMXW5jf
zpge}26@B7~Uom<{5rVHS0Mvt^7=f=Jt8;pOjiWHh>%%EKE94VB(9wy8-AQvCqaE3k
zAis}Tt%VX%p}!&%46E0k>>1vL*OkM-!>7lX1i2B=YnTM5Zn!iZf6*wM6M{()3&1>_
zB|q@ykOd|YDN|pyE7yCi08pn5PykLCW_$eVG}dvJ>s_Vt2<w1P(0z;_9BC5QDM*aS
zD=%j4^cEdgVcAfSc18hxO@Eh5r1<_$hgfYzgmDJlpEpVAY3jk|suTc<K~TcLSNz4f
z^iIX&OWE&6UxBcV=@;SwX3p3E<ocv-0B@XyTjQ_k37q=Dz%dNJ&nA}sCychLE?ys0
zRy@1&sSy!3>awnJ8jz8l4-h1N$ouLBT9sZU>wJPMf~7esRwpfxGu6-b8l9QiVHSj^
zBl6eaX2D0#_1_!Jq&b+XGhJ(#GRn7qu>NBnTCP-86<I(}C|l@)VQ$v6)V=C(4!*;{
zz_=^`lz^aAA?~f|8Lg;#`l%D&y_y7y{urGZRxFgAIZ4G$scTPK#|nQ>LSbxw^J4s2
zl@Y~<uIXMgL@7fi+&qS0xa%nPLg6PuP3oxR6kE)YX+F&23o@IOsZ{L|@I2^}!$-QI
zmpMS?_svenB^uOju1p*NkkNH?lIs!D-FD+2<Bce}DE&&6dS-|;yJaMfP&JMo>1aIx
zho@^)HP7-^7jOs0xE#kQ5Mu;EnFC)PQ5;+)PQC_7s<wvBmLdm7I~+l$J=sfUaOF^r
zoo~hSo7gC?PsvrSiVvkY`3%+$&LG5%s`p|HztAjvjxLIC%<P<<%XevS>G>&j_(4XW
zX`svLcZyLl&shJw;HltICB4h@HkS%!7eir=oLDIwi5TO-<A|g_O!*q^3DueP`|^B9
zPn|8<%<K6S+L6l_&t$m<pr&^zTHld+li8?nAr0#9yFt_SVZONYn0$14yU8h|+#j0k
zm2y9_(Ty9t!w`8+;(AVBeGlRb8ZWq&{R=uWNVI<jVb4dia;hwHN5_lZ!y`vhG0Rt}
zXK7Yvl1o(%6YV_zYAEynlGl!Y%hZAJNSKP5y+0~p;-!tC4E!{LKAb`d^_qN7+Xa3$
z(z{bJDgYFMpuB*u;(SlFo2__uf9ou2-_DnUaApT@-I557@N0*gWii^Lk;q{!wn_@~
zd@&8PkOCA^hTB5l?>yPT2am19zEadIwkB!>2_e;p2Y0n~4SkxJHp~R}XZk++iZ(cd
zue1(ggEYw;V@fx3nbX7Dj%e+@tXj=r*J1rBH?1@m(s`B`hKL_JJ^BMAqbg>z%nE;)
zQ6`Cs(!xa(&Yv+ftI;t2%aWgvEK#19E4*;P8@44?BhTjNLoWSd<N$5srd!8V%tzx-
zyz07v3QaV)rAYMo<x{kATY-V=GhSUPsiXKSXSA^?hGfr#DwsJ)wfdF>=GnK!;}Mn0
zw#W95tCRf%Geu0z^!HavZulKcH(tp(SPN@1;J26W%-1kyr`1HV2=QRi5_UCR#?14l
zP7jkkD+?@zE3B?AL{W2J`6p}|CLm1A9ZCV96a<wAF;wOJ&E<rpqjGdMvq3Gzk7JVp
z+QQ%Fm)E<1i11n)jJ?T#m~@H3_Q7*0W~c5Y)^IM_PKF25TTm8#kD%R#s!kbE014bC
zMV8r+GK%nnw;PSsS=0KRyFL8l`4?E>!C#M*>dVgcS&SkGLvTj{3dBNl@T%}=5p$TR
z6ImNfsMp7bvlRgO7VeMB*KSlNrI$098m^BFaobR`O{?&CxoF+x1%N6LR3q@Ur%DHx
zF0lVj{+Pf8;B^PO9Jsg%qJ8Hbx#u&F<E=Yw=8L7+ao7=4ts3bEAM!U6?q@g7=lr?_
z6D69X&L`!>X~SeUWD&S^S$%!LnEob6SIzF!*C|Oe)5onRgz<y+n4mw!_uLyk=UVYg
zN7WFSInwA?SQ(sZB<l+xt}Rf1G~N=pViGfgiuCu|hDUxumVcQ)YLv-lL84>v3^m~G
zH-_Hb>j_A#08j>k8iCkbfE=E@|BGSUnk6O$>E>3ua6OE~#nvqR^Z~ZP%>i*X^)mzG
zd{W_)G@EfN045{;_*$GKlhRYV^3UJ!4h9WzjAZmmId=NzS&Mp(U4|rnX44eJ`CnW`
zcPrS*M=Goslx%q|CkURV*ekS!*sp%21dkd61S&^ln4TQ3)0xgh-mxFugxNBq;=|A~
zx9=vOOY6#|9Gp<TJt4nO=N9FH=Y-`80L>t%b>M3^LEBJ6@02f(GEW)0$d(2$GS{;;
zdKtDRgJVMHl1A{Aw0moX(T~KMe;;oW-Q94B-+MsO{VW-3sSDXWHIDp~hSSVV@-&s5
zgAKxqfLv_mbS-vpjJu&JP=Q>i)~MF2*pA)#a3*BY%<th)H33RlyHkK2!L~EP?xtg}
zmdlMLiw1PPjy`GD?hb7oHt)4S%JD_z;)fTr16Jeq`cK|!#S33Veq_;Qx*nVIM3GWx
z)dD~z2<i&r<x3q+c*j!Erofld?_4p`!m*?GemOQ>?@vqK*F8ytVXnv#=NVC{z>AGv
z!np~qfJIIpjDX0|Y>pb^LMF_rd#qnhNSb@MjK2?QpHWn<Iqs5sIN>%e(DYa}hK0vd
znx}euOQG$BcSeGmZojjYEZU2EI|0vialxi%QZd=ZYpN*BuUooMSnNtoSn1(D_<{EH
zJ9oC<8uv_Qr-@;0iZJwUgsqkT0RuEVq$*{<DYFh$8*g)O4=Kiia?Sj6gx{YW+a#9!
zqOqk1ss1Ru`|1`smNiK{UtBz$lwj5Z5^MFa^^~R;?BoUqlQXXVk~cHSX6<w@v*-Sx
z9W4K)@-aGLx*2fQ1M-ew=lpU)4a;xaNjN_A7_6qrY@l8L-T#iFbWM%)m2*#8wLz{q
zCB;il97u3Tz|Ib9qytSzPY$}O1YaVr1RZNi+`<26C?W6_2dcVJ)6&Ul$En)u1gwJx
z0|rCOcxxcek{uPRL{CPVx2qv;KADu8hRH1C@O6v*H8m9GbNUtT<x+lY%|FwBsXeAh
zo?0Q^)7ne0((=2iMPgsB!Rz(yjvzdALAdrPz)NDP-VrT@_1z_cOgs8+uXqCRs9R32
z78OVzupA__c;fX_n!VkT<qwraglWLSBYc)H1%421n{1q>?JF9JUICy81kD0`#hv+X
zNhtPJh1L*FS|bTtUu*7dIDTjn6XOU$WGns;Q5M4;;>Sb!Ff0ECnXg@~Ja&7Tya~!k
ztU~n#3*^(Yh?Xmk2$X{~?L1hg5(kdKiAD^(qU6MRL8|P6ZT35j&GY2RSzI1>t@3%P
z`O`jjanwr&CX|W&LEl1kk(5B@aT&NzXVs5`*%Wj**CcpJ!~(~flf*R*2z%f+G4Xb8
z2z){86oc&iGsZryQ_)p*&Gq*YlJ8_uoOe3KgGe+V>^%d+Ldx43BBwb&(Awx(O-b(x
ze~dEMwATuKn*(}d4J}6ApkZwxi#Vg#dP;8V{Ehx7;>ueJt+V3k)%<5iM5x)0{_z^o
z>^`rp>ceir=8~e>9M<qlwO^Jrct0}TVScE2F6r`><B0Oj@%*cqSs<T&Ia%<d$QMq6
zMGYD{al1P(q{)Glt}+m`Cd8jBJ+fQ*jIjFzTc$eqyQ^vYk)2ANMgyY+t5+^+R7O_4
zwzGfq$yISYPj563(TjyVC1vvs%R-dv%S3tXP%q(=AF;@aLQ)3LLYS{Czu`FKb1M)T
z{}F{_p-?B98Xh2m-pSWx^<S!VJo;42h0?>8Bf7<yNKB9!Uv2Rv&NX%^3r9euIq(){
z$pEkV;+XdVvqoI<B^a^!D-Rt&6b!z+>ANccl!KtHAweqIHTOR62)AkOJ&I!BMv~3b
zkibxv?LshgnW^lCChWJo#J`+m_xpo=8eXCanMt+!0pWd|;6?h^JyCaSBo&~#J0-He
z&f%-_ab~ef%)O^Zs4X9DKL&1Ez42xl<utUJ2DWU6TqCRvF?1H&^+sq3{#X|&uQPh9
z{jl7*3YlQ{$1g1gz07#%&;_=Ccs|NW-A^jYEcka$gSuwrZHjVL`pW;8QGUQzXg<-i
z){lbiz$&>81Tv+X`8WT*=h)%kpq%W&E&BS42&CT!m#ZO#S5SDDAF=>Ycg=2-Wr!x_
z*N>IBgxRyQnG3<elXBd`<}N8t%j%p6w_zFbSY+7UlH777m_F7Dd!w%adrPmZ?}0d)
z#Hr_U%83k7OX0AH`lDU)v-=O8e}AO#rW5(KfRK7NdCiX62(GY@)tqd3<N%@=MHnjG
zQ2#|h9Hh0fc-mz#1=jmU>1)fc;ZXhE%Gpl#5B^4iK5fT3CM3_m8a0lT#E=f$=7~zp
ze1@Ak!!f$&q7$5x9ScA+hbO>~ys@D{$BA`oQSm8anp;PH+ZHJR%i-IGa>*FWIX%$`
zRM>EnKf=ScBrM2ee0TlDBkQ#KAls3H4g=f*ytla<68BAK5<J*Z-E9igqjf=z=mxH*
ztbC&V_(UA{8(e<bhXLV(kZ3Iez9xk>!b&Hl1s5bqR`SDcW}qjog8sDYeZjeU`7_pS
zQzyj5WO&knof`ixMyj|XwkY*dl_-Bn{G}X$<o8%lzj6DnXfr+3UhZa^TK#_c_0_I(
zNdELT%U+&~Mb8e$4EXN^3!&|Kre{OpicEvQY`h9*E*@{NJ{0{=#1oGekM)owCHB;$
zJ+9yII_jG}cGFL`yZw6GO5%Hs%(BhLnwl;sm!bt?upsDG;H!I<Xy`)6JoHjefmIx#
zkl+eHV${wE4^x=G&}as>XR^VHb~mJ)4?XzPa^ZE6zwCY_tuGY7$ab0Tov;xr(Rwa}
zN4Od%o9u7WXAq=`ey0J1qdbOGTc91*ofcn=R@(i5#xo>8pG-AB+dec$Q2ffi*VOE%
zo{;&Ybx9F((U>=J<0J{)@)Y3GnreSUJ5cU+jWxf(mt1*oYt?@F$qSD~FCFifq3@et
zgd#|`qTKCop;!z6Eb{sDufnrB+026YRCtddzCm5W1p@{G%2lo3o(9(&GMj9KdrU$s
znj5iob5qN;9=8c|EUw|h9-|Vl^mc_ySs9l`Mw-={|LxcWB)axjBX}D3e-n<dNcI@N
zRRNskRj<-p&B@W`aU5?~JJ8>A)lMkFJ=h;RbNtP-WKRXKUie%G2BSaxxNp8dX6il+
zjD4d?qca_ssTl{QU`*52mrz{l6d)?@_K9)Wffn%j<DiJ?(Ru{vo@zE_hG=^+Q3C&{
z8dC0V_hYI?=y{GKUP!Mco+mWJAj&z}{$Wj8oSnxlYTqt=%?g(T;-A!ji~g}==xqpQ
zKYBHtD^b#RE}S(q-@Js>!!_GFeq@YiLsLp^5Jaz!me%<hSi!2X__|~fZ*QbycUV`_
z*71q_Ymi;P^r9-1(6rzT;-BwY@F`Bss*f)cmb3;6zxoNB!owu1sU%m$kX3?&#m8`)
zi9aqQdmwle8X=@(bZv>~6YlUm6JqAe53P&om9h4PT8VvXDw`gzV(YV%H?Pa#pN72#
z#0AX3v=2ZMp#%hd2Z8NXv@exUSv1p5U6tC{6I;f{--(H0ww|af2C9>prt&C?bDEsR
zpn({=Ya*mUEM-~Vyu>z5=~FecLk1NutOyMWsm%>xb}M1laxdYASb}fq+l2D5Z+Z?%
zF{c-f(Vx~kh-NUr#LM3Mnz$NvU#u=1j)z{&iS)x2SaIcvQB&l~BA)qiB-{@}Mu1qo
z-a(jDw;`09vyo5;-SQBosSJh`!gdf0@;|3eF0Q+dhQw%OB4ejM<=VpSQ)#N|5N}eV
z2Df&crTwf-X$nJ8TMQ-gA%?XlGT>ZRT9&0w6Dpiyabamp#=B1en;^$(xx5jp!~LMd
zoOfQBo|TiliW$(AU0|1E6wSk%WxQ^>4|D&77qq$Py|q&79y=WnY?p#qOjCV7yNbc3
zW`;YOi~JqOK(<a5A%B3w!QAkL@LFu8om}wBQ9aly_)YYCx6cgF{CGpMX+_RR593Df
zKNyE01-`=Q$cKp-nVPwLnS$@K{>1T8bad=HC>oV!%&~mL;mpUziS`~grfO57bH*N?
zK8}mdx`y#d&a=A<%uy%lwT|kYiB)%P^+qbS#_E!NV$rT)|5Jl$`+VTo7Z$k`$Yka1
zuj{~*W25Sk^?IE+L7*!WTBL|G*NXz+wNyq0$a+-Y5~t~$s9ja)Q=<W+f*2@tEO{Pa
z3yB-)x>1U%jbQ&%YG6M9M>wwIM;ujp&z_dC+%&A&;Vn)-7!l7H*f0->qr(bksqeZ=
zj|PY31h6rmQ?z&~ASH2+Ln9YXPZA6aESOY0$>rW7GOX0t;#&Xt`KfOckRS|YVEtW*
z*8C%rsV!Y$3l@2|13ZHpa*+gDj$P`cpynHPu#WKc(#c08gX2aR6dZCDtiaIXo>V71
zr<ee54KFjI-0#0w931v8tE<)fa{q-cj1;5?UFlj9)*48(dzZ(OhCdT6NV&K?mUn2u
zrY6>{jeSYS^YA-$D-6?Gb8a=bTQ>ljh&+?dA-$m({o+|7l(c}Gs45=)MSiqmJ$R>9
zDDndDB1?8F5=;a9z27c&8c%NHguo|r@c<Vllxh*W>K0D#wT4#(T?>S#IAw68*D^;b
zDKbh%aCykFf9U&o?^e%;ihqzS4f20&NP~LsOvFJG1^;KME`)DD!$|QcK+9V;a^c^Z
z7{8I~FRml@N&nTH{z7o7o^SzOP8evoZmjP?$Z&M;;}3Rdhh6{LOSUTO={<Y34nr%U
zb;6pzIA+g{fM$}iT|n6%U?2$Z71&Q0f0tQwN^)sA^P3?3tE53FL0NlCLDST+&KCjG
z<>hvu8~fgJs>J&kdtmI~5Kc_#yalPSjG`6GmG?wHPkh4?!YZ`2riSPMN`V+02*wVg
zDY5HlbL6P{9sRV}N1`@lnz?~Hmqut&y5r>UdlwdP&Tc;p)`O2SNcKBqxOt)~Bsf@^
zR8qHBWncCquGM>@&<&9KqLmuqD9PaeH>gE>l+f_t*TJOQa^9P)Xgab`L}?bH;y~ML
znKJG3)Mu9?iZ9p4Db{N(Lyiv}fHjhi+%Ytxw1*1r4yV?T5nQO_`6!n8OxVo@!=g!F
z`uz2Daeg#Z*{+798{fMsm4m9JWeZ9i4xG*F1Z9!T3zLt4GS_IRqHcE4;xDRBzm&9`
z|H#D(I>-ePG`3H`z+8XaUe&MF=2!3$`T0RKps8hSD5RMZ_7zoaDVF8#@)G3^LJ%K8
zFd&E<5DdStuo;Wh`rRsP1|-AITEmLyZN7Pp;kgFI=2n&dq_1df+T>76c!>$l{oR84
zI}|@?QT6UM$F@p;Xd}yes!VNH?XBqKLX@{qIOdBMt=GefBuv&mrW;f+cN?JsW(NLM
z^5}zuFNKU?z+yQ1hlcY76E3rjQ~XDSly-wVQqG=2v6WYucT0~63C<W0s*<8GDwfQ|
zC?VBJ2X(|aa)7L$C<~SO>$A74xEpt-eF~niNem&8DG|P(+BFIFgap^j?z4id!(e}m
zQveWdt{ciage!VV7l1Ct%`C4L#g9`GmB-0cm|$1fR36yQXbZXZVh~KyzdAcGU9fSr
z<XmU}WWYKP`fz3Nk!Z_rI16>~#t>?QrPNh39NX;1$cj{{Rk#bYsWNNwHEk@m(1`b2
z|DK7|O0#>&{(7uhFH6v}WInS6U>n&P+sa!agdH7vsA{|IB@U7HvG)*A-W2rtZRo5N
zBhLa|^rN+M6N|o8g#vGyfHobxpSk@Gk2=d|*01}bF=z`dI+2q8tMLGuYLz04zW*gv
z8SoVksZ_Nbe)Q}iu}q!g4*Pxx1E9wYYl3`O%eP9Om#Wqd{ap_KRAx-d#DXfe1-$=Z
z3=zR0LFRMTQO11faV-maj!J+;l!}{5*C0?47xigpAYfc+s|{7Rqv+kq{4X(SG~3}}
zn|kvE=^Qbw=1=!%ZZ9vLZER^)C750o76xW}NvyPAhTX1`h1$#xa+Stdz{yn5O3N|L
z`+A0^%ALVDgt|b0ssmDEXHNpYVIOiZG4#Qb<pdhTeuTF_lvtXD`3z=a8@m)G5qV8c
zYd-*StnlRfuDKHYRn$?k;h#+xArOy0EOW4C?p&!mV<vpcGau*}>vLOM5d_IEmuy{^
zJ%t4K7F@NFnV?73MY6I+U;`p7%q*(9Y%BI?9l4Ax3a{8ur@!|<#r;Ss@T7cEqM%hZ
z_a#|^0e;B0X?3t>iE9Xl(ln}^g3K05K`=A_YHT>;3vH`wc~?ot?_uB0y#zgh=Y|KT
zi{zS=$|`nEhuF{ReU?MyI53}4&$fU$pMbD9nst+#@~Zf*+)${q^}~vv=Z=4`2P0bw
zzv$bs!gQ$X*Hp$AiD7;AGraceN=I<&VCnt34+WMj$vVg~!7hXu3I<#Ud|sN1m`*S1
z?jSHRa=WCsT6wTK{gQ?)o<BT}P?lwKgc+MW`^wag2NZ?WQ;4biz*i_9EfO?v=MLh=
zO$+7=dw7K>%>EJmBqw@1j^bA?L+9psY-n4uz)>o8D!m0#?VpX7*7efVbs6lRXmjyt
zKUi1r3N82_VT?4rB#@2Z>}a^7m1rahS>C{vey%w|{t>j<gjX*O*f<>N?4%_jvhrti
zcFE0nm^93?p5Pnv`!Z~8jW|(aRR)X3dp)c{E)ZKWJ{MGnn1%iaM&2$Cz-R?~_rHqz
z1o3LV)y~&0SaRCCjmzrJ<>I|CkdZAxg@Bz`aJo(?2k%V&L@B&lREt0q(thWJMFefj
z?o3!xIS@LoG-eE~hrY!zt$|BkNcw@Ozl(XwX#z@SE!PwAQ@!lhIur5!G|J@YZIgj>
z%|J6*aj87rCqKclB#XAJ_zYPAxjqxuzE4@jaEDADZz%HqD#gd~v%W<et3QOZ*3Rh`
z?#qoX(KsR7Uj%~v@J|zQ*mCL}R<MHa@JvIQ_5Gj~T}e)bC(y1uxYi|2W%=RcUP}S_
z(>;}sGv<<M`lw)8tZB7X^FDEq4@{qZ(OkLiuAMQTk-cqKj4_*~wYG}@M(dRQ%FT|J
z9M>E)3J)y1Ae}PY4c)?;y}8?AipGjF=9UTJ<m-E<_16OKwzS9aMnSwfI9+i#R@92I
zUy~xLEcb2!qVg~LD)5)p;Qt&7O9^R-6_&;8*)`QFYjCU01AvdKc{9VMv|ja~7-8iL
z>5Sp)A28dzEo`~F`+vs6PX`%t-XwPg$PY<it#w33uz!5i`4Z^3q%_`(CL_djv1$?F
z#qjOW-M;uoUAx|4YZ*e~U*@aL0O)brBW^y#3UXMD_HSQ&o(?WV)*Txg3?wRnJYVw*
z5K=L;i3S!=DUOZHCu;ePKbla3<E3X&F3T}EAuVwU2$uWb*r8-}=NXmTYn|}Nqvq?i
zoL+Ve^+)GlXzDdMayFD*Vk4x+!x7&JHb*^Y&{_c&F8gvtd+b$C-=KYxDdNTsRPz<x
zIR+g*y@wqT$<|zkz65c0@<#9z)+8V!8lPfM^Z$uAMwP%87g>T*(zu4x;eHYMJANEP
z@H51QX)Ey)s;dm6!{J;qM*7^dUvL)n5lLzuzgk{uCKNIaU3ns-FA7AyDFwmGLR>0u
z)M`+t!GJw3<TK%<?<JuP?A;*Wo*mkaWM|>*LN|UK&XE0EuvX8@c!YA6D=!-ztG?V&
zRW1chGV?8M5arQK@OT%*1d<I@m87qTTPY$to-%=^y=m-~TV=rtjzzCDJ2_fJRm>)=
zt1WvjOgqsQGNIndDuxzZ>8430x@Uy7g=rQ~XS(Gl4e9Os1+&hc`TZkrILPQ--rXML
zXZtDu*?ovpze0c?AxfadA(+7#Wyf}bXW}*{vtd>qF)?^KkC|Tw^W9dUUft<Ob_{T-
zZ#|+Tz@z^WT7s!+WIWUAxjmZc%r$MQG777cNq^eH5oJ&3M!`O!aoEgK!xx1^#jtOK
zo`r;*CVjc@k2H@>8eUfZ&<w2#Ou<I=gi1qW4|Ca3v}d_7Z$z%)=;)FiM>1Y;XYQ2a
zZK7*_v=G4?vp)T4kC+5I1o(?VuulJ|H1y2UFP8IA!r});Q%#*X@3`H_o2xFutxRa(
zQ8ZJ`+P?Ys4Wq25x3vvaNwd5d?>8ZeiUi%?s7r9h<zy#A+ykP1vR_q-ie6oF1LGQ`
zH-vdt>7k_(CRjJS??(>{*w!uCmK*IhX)9bvkYg{{u6Uwzz?H8J#r0%eDZLDs7n}v@
zP-=6#Cbq6JsJ-i)A@Ao(7M|eM7XY~W`SqV10&!``KbNk$El{44PZFsk1_kZ#lfjqy
zv!T<y71F9R|Mj21_yeznwZNd-;7o!y^}{=n@*Sh1j=7L@7%Gwyz=X*till&bWqBW<
zP?6ndEmwxlSzh(>qXeo@v%-uDqty36-UZTMxXhC05)YiAsz&0USY+n8ArnhhPP-i1
z)1kKV$%>{C_bb)4nA(;c)kGTSC-i7_JkfODzNWFn3I{Cqu|psV;?lH#wRElF_fwed
z$i~Gd>ezt^sPPP$5)Bm)ylN7nL2=}ewSY5BnanT8y>@ef_+-nyROOzpk5V<<4(s{4
zL(K{+O$X<DcCfVfFOs2tsmJRo*27~1c1kg5W`Ck7dW;ci(#bL59a`6S4!@Bug;ziM
z?g!KI5!{yq8iD<t-CNbS`Og4zF-p`-JrqKen25G&gp5~8XhXa_5Iyu6489qM7&-`o
zt@`IuSBd9d+goPfWH%k+o5Rma(>r(+nz`~xB}U748%zHEcI(ngfsIqE3%B6#U~y|*
zlqwbT?MNIZ=&UO(es<bY*7nR@%%0&;dA4KG!58@3<7-v~j<~kIZRkuxF#)20fS_p#
zA`b*k130lw=fdQ}zClY6f7;bMW~gesa?`VnM2)SD13yy$V_OlOMe|+`XQ(!rWVS2p
z+R^ZwL#@N1Pdi9wo@=mtZ`_3IcRuP55pd?2xc)1`D+|~NO7A~01GeX%LV*1lsoJ7P
z*oB#(`y8gVd6Y1-C|229VYbDH?7^N{H<2AUUlc+N#Ue}UsKI<NhWu?k6)P0aZEkSR
z;g2~2xS4G2)XHZ+C9;^%@U4I#ZpE0JTG6(cs8(Q#h#|EL?CQc5x0xf<)w#cA>+Xug
zH&}g$qplp}5^}H@MJj^#6Dp|1326`Bne4tf-F&AMjUyu5u$!E(GLFhluB#g#JoO(X
zgq{C4eCROJc`Ey0n#JlhHg+gM$@ulvJNyeFZO<G$RC!>tB;#w(2M5D@n?#H%)3XG}
z_>S(HE6!>*Ngi9J)GQ-Rr9S+Y+$`K-PCP*Gn~=DUp5B-MHTiU`Z<~&RqMI$KgR^sZ
zYGzu?#9%8sFQ3n?+LF)uur9V;ucJWZcH6rK!!~*A;^gTt?N6EIOnmyVSjx{Y&I3@s
zqOqv%&nS25m;b}C<9}M|t($uK<AC+c*Pq#KrDL%<P&Zmstq1x)>qU<)Rs8#qSEO@j
z6XMiAmSg9+(q7_I>og9H!+)Y0u`_P*1|>40bo7{_wmMck<QYLlE5YK^WtO>EwyhPU
z*G||Rc}Z`&NczEilpj%L#%9{Jre}Au1H12}{=MPQ+|(i)=$QWjKlYw)e;;iPMOvGx
z<XFn)b6TCCrBV%R*A!pTBhe=ciDO7%c>5<m&y&>irB~vFzZ<<J&7f5bh!|a6A_o7)
zLIZp7*d^Dw&C0HNcUZU>pdU5s)Gg|sJPVK8yBE@=x<-eki!nXHM;ZqV_ISRiJ>>A;
zOT-~R-y*o%!zL5a=ta}I8FGS92OT-r_x*+-lf?7CMIVwsEv_bngHb4oeMDhU)9<^p
zL&8gGvbX0qf4KStNlOJGHuPPqu5I*oFMVjz!_dpUgp71bKyX+PxXo!2cx@KRY!Y8J
zsC91@s(0+19E$fpq?_rL=WB>*JVLSvXr|U|Dp0sw0qH4i4EmC^?PfnG=XB}CgY!OF
zF~_`PN4aHK`*Pr9S1>d3c!{<4hl73K*F>$pyPO)-z>A`Zi-y(dEmLZ)xz=0Mg>v1J
zu(>kc8%mjAR01bfKg^X25cjz=-V)|mD97^r>~1CvK%(8ucxyWUE|LiC(hZR=8bNTh
z5b_Fr3KZt4rE~s<HrQ`&$pFnKGW+JjM+8-;U6@xYlcc01L!P7fx8dyWASU0B_aHjW
zkI6j%JZ6TwJVg|y=M49mEm{;wNK|Te#5z~0GTjh3mFw(TIlrc3C>^<!!r3npqH0(Y
zQ^w$X7&S*0u&0~(y?kHWTr+w))o%#SoDKUV0tS<m?WjxrLlrm>Jf{IbiJMLhl&FLO
zhavrSk2X(;JK?QKzW<J5q<47<^`D3Z#}7%cPi`n!ejA$!(dIDsVYp=2g)tMwHAVr+
zJT(*1sf-)^Q^xjZcg5Drpt9_u6?-ddD*{wxxszI<N`$<!4*_Gj1sTbxy08V~Y;hzz
z{ZMhy<fh|xjRtU+WD&i#^!0~c8qJrTZ^~S`b4*-^1FrG)#<5A&Xwl&rv?pv>h;~tf
z36EYhtGI#9Q?baos&F&{o_V)6RL@Z07x$vO=YqcHe`+zD;=fR69+^YKyJVL+wk$35
zn#0TcV|${2)-lTe%@|7bRJ<H}?)%fPaZZ>9nDqAg5V}dGl56L5Kjo_;ZMa`t@2wjo
zai`P;mbq^@yg8LvUWk@vcJtO+!La&Xuji`FwmZ4z(ZD2IICQ{+`|z1?5Utak=J53C
z&%gZX-|~hwxkoP>sob}(`SoV-XgR~c88;nKXhRnz_g&g9tILcuU<`Ppf3}u_;7tCp
z1cZ8S@yDdGNbh%7Xay_THDfnboQ;!O%Rjn;FJ5S>(S$lwSc9(WR$R*50y#&<pYLvG
zqE8JU&`iMoWlaf%gh3d!iR_Blyp0yK_u3e<_}A%w*wl7PMp}yVIbFo$c#naZJ->Ng
zLa1Gz5QanUWOJd&zWX~klb4#g=4u^HeH|;{AUW`@%E;9sI-I=P$iLNsKA$*TT4q*z
z^Dj@5z<`)~0)lgcj3Q!zVL19>p9TcVvtaM0^nTtZsH<u>Giy#h)uT}r{w`zdV)Lmm
zGczd92jx+C{D~6VP;zVvZLeUkEfMQGM{O%mfpnt*Md8z^qWmVdYB@8DT<ye>ZJXcm
z3f*^n7FLSYwPBA&B2ON*B42}A8njgBT4kd5P8PBoVz72q9cL}u>|G;93tY3<<<j@H
zTIQK@CTnyiPrcq=Dc#R-WlMj4^*%|r1qxMqNm|xa%q))B5P$iENcqF*jHY@YNI<aP
zR80R8Y{%1AIz>Q^9xm$Ltc5>*E~p^Gu`mm3&8VpiIkom*l7>StIy8j%oXtTC6?=+;
zQ=D>knaF)D;6Z<n2zAYyV^c5N2Df;}yQT&O?@ROLlW87T#%Bb?x3U5<JeV{(pm>@h
z7P9s7&&;Sf=CltBNqT>KZQvA)xN8-XGMxu9*_s|kP|v0JT(=hcQnWi-I%G9)*+cyU
z-|%m%bKb5a$96tmHXEDZ+U#j2WpeoKfm5-Q2kzm`U6!CPlD@N8__7M^QBl63;<4S|
zFV|F;LtW}Y5W5Hjmj%&9KR;GBc(jb&aC9~c+Z;5_@8)Fp>(vbdzE;Gk^>$(05}mZN
zj_rNBKi-NWdzA>>g_jBK66XncW^lA@fbKZYg>O=oZDFu*CG_MK@FKPhC<9CQj_Q96
zedc{w@Z31yd1+rPKlgg8tsy0Ao`qu%@fIG;Ua+;N!)EyAauS|WBOi<M`KGb&<v<5p
z<I*$iQv}VfH!2UkHTES+QRO8BOdxjFLgGIAHRqM8sv`AD6^o=vG<eYKrYt!*y)RGu
zuTUx4kKUfphZApTUbff*+hxptVV)*VH))>0gygbx)QJI<-)adXkkgY?y=G|jFliL0
zYIa=$YX}lsxaN(A)ib4-^2=xf+EYZ)HlZI@FS$Tm3kJ7#6IzLF#Apn{tqvrNsg{hu
zqQ$Iq!)2VZl?jG{s#G(ocKFYNw2VB>y``eBC=gZw$<G0Zoz)S@Y$HaZ<}(155TV;F
z!hj(C{du~-g(lbb%JdnnABpbRN=M_VBJWs?O#`Cf141b<%g*i@K$1UU$S~5)77I&H
zZ8=5zG1HBO!W@-@%ZvBnRgPh$l8&2oB-C6Ha;FU8hO8S?K7SV~EJvO>&^>!xTFYRh
zR<j(e;^VKCW@ZO(OcG%-{fd2AkLp4>_%-$Ur4ps^Fz2nK&<+5_=<*ENdPoIahM1a*
zcIT0#JRW?!_be#BUt5U-Jw(CYjlpO%v-|~bUp(`s4JuLSPfPJv(PjbHwaM{Rx6gn1
zXpC$09NJ4P@TZ>7zD&3tTT7@ro_*^^30E@mQN92U!WVdjDE1toV<Z253~x9>|JIQl
zo3}_B-M9rPRy+Rqm{00dza!NomU?wdI)in>PJ_OKj(72hNkjRgS3?YzU0;T7nJ3OB
z5he<P(f^!!{txtEHZ%A$_+1jW1bb;cvM^OWSXs|^P;s{E%VME_uIujpZG2Uco0^YG
z?SD2bAD+c{lN5qu#@o~}>J%1R9zfb%L5iL|%iE;5{#^|MM_V0IhwY5EN;3J}-8Db?
zq*le4tXZSB`Q_{O=nZ}Tz<l2=ZmM95Ytt%&&_6sM;?g9BbJSz=e19Y4Nu#%r>Vt!g
zKOg65^8FMBASx^IUJ4}u>Een&@X-HbK*fj-UEQG`PVQ?ocPQnE8_;K~=lP4<;i(}{
zpm?2GjP6-Y*v>w!Bg?8|VT(9ecWXtIV;(q>7*wiS1PYI^@Z>62T$`9M3N$L#@I~{<
ztJ`uc-B$)Mxpwq2usgKdu}M-C?f0jssJpM{dw7jZ=f*z%KVwa;93>q`>c_*+5_8iy
z<S-~SPn1SY4V~E!L`FzgS6}ooz$&mp5K>VLg2#o}sdY6FwaQ&>7)lxZ@k1<)V2(u`
zO;FvWhDW+06Am^0KzHvRJ~NREX{oCkm1sGeO>(`&A+9JZXjV|?b|U|wRec5qb#llG
zm<RtEk6IBi6%E>)c{;3`TJDj#pc}6Nk);OZ^c}hR_$$`7QULV_xs=fne!iP!ovz#z
zUKB4G7eH!|n<YgZ#kV-bp>nd+K*p7$wZM_?<`=tMluLtu<hKk2&-hQdEw)}|8bDlI
zR{a=+eUT%@rG+aBFylEJqix)ejc)mC&-K)hlS%4i<^!b~zYpic%e9=<<UDgG!O#(Y
zpdUw-Ej)b7NjNnWG==rR3N$elQDmB(-3{>zKRy6OUu$XqY%?dlptyYW_zU=rRA=L&
z`?8^4N%$8}yn9RP1EsPX%2(8y;?ClBCh0gPJ<UW?x$B+d`~2I2Lwd7}H}Q(zAc4z&
z83iv4>3&u!S=9=YHWp6Z6F!GBsMaiET6nWq3iMQ8sZaU}Cl=b$x;vEjq_Hp%Qj<Q4
z4ioC!v(fc$l;1nMkS|&&<u-_%TfPh7Oy>XI$g=R&HLS#HTqA`u`BZu#*^V`*4@B=G
zB@6XXx*AdZ7H^C)<XRbr@Xmc?LZ8+87dft5rAcAbc$#qav(UHWx7P?=l7KIr{@YZj
z2W&9PBe5bCr<Ved9v-s&s*sGzAuo$<q`gq!<fc@d*wInOzFq|j8N)O)93WKLz&nt=
zY<uYTdW(Bo)G6EKc;IRvOds@jp#hJr-Gb)}VaIK~-_LNU#9r^-e*Cz{Z_qUB=fDKi
zw%Stc9(M~YNuVXXRf(o7?J?E<X|$mDw$ya8RY-+VW@`C4qKbNB<h|X6(W}M}kU@EG
zHJqS`Y2@BXK3G6U4u+YgdGqfC{&yg=6a;S$iBp9Uq2EcwdoO3%sYCDn4NoD3rRVtY
zE-qcIMrMMNkuIJkd_=^FP#?K+w?-V)QxdFqtdr3=yx6Y2L>_{@TdE^$T^%|~y8J7z
zgi$Yn-X-GTy^fa(L4*pyXX)J80PMfnSWi>0fm3s$FpJ}E;i%E^baTY20mEOpn?79Z
zQHb_ngtV{SLwADew=2oE^~pbw&Dnj^eu1T%b^juIgaa$8S0E+?g7^BzcYH%mU{UEt
zQ%Bh32rJo>s#?JW(NQMC&*QnjJ|}=_gY1h@tY1u+&^`OK_ZDqQ77A0)=~O7fsgO9M
zGUbCK;)EsYRx$O%<@7!z4t8fJI&kI3%GR>V_HP!ta>ywTj;d?^9ZA`<VQfHn7*ur+
z9B59uCw4&ZMMa=Z4TV-{h}y*}N+Bp2B+C1ePhQNW7x$5tdU;&+Yy;UP^E_a5BbQQ>
zm)Wy+Tw{{EOTMfsG#Qq}lo+$ECPqGtEN_9^M>TH#JpGmNEqW_(=9g?3m4aL|EXwPT
zOKkeHE}w)t7!}GM&-e98KA-BZ?}@24Une?jI*^`!6S(F-peny|g*EXPd<>ii6=UPn
zkbFDZyrJ#@;p%B4p2~%b{v`D~$t}f<BJYe&1{X>Ko6Uf7fbs@L%>ajgAP@iZ--NbV
zy{$du)=qxB^3AAP@s%f+p2+DFnXCrm3fkaMb0{LR^QA+c9=^Ml08y`fY>Cvj6j(Qg
z&au<C*M6zQ{GdiP$tdI?XB@OI?{E!FoW@@yFDW=B!mCx;3&z(51#`a~iF}+t@wQ}}
z*f6Bt^pECE{|-QRq~$29^rxU#3dy|f+e?>D3*O>e*agaEaBZ)aNU=pceVj(PcNhT|
zU4kzmW3LJjd>-&M8SDeoGs7x1J}0FyrFHT<xW9NH;FwS#0+#*H3!~T1U-SGKD~3!?
z-?=?3i^dg^ZG_7wZghVJGg}4?NHvrXCRjhnya1zw;BDkFF2k=~eC1<+y}D8v`#o;@
z@_dWXT-2N;VNTEjyEVVQe*tgmy<P{%aEM~2g&^t1k166#$BP0JlU1g%qazQpZPEL;
zcHm1RxNdI=;!Ymqjj`pD%ahxuFnIrSY~w#oMudR?S29iv8%;I|Rkr#jD)k4&hx=?6
zYC{|k#e0e$gT*#v_#a5M4bcoDT`Qd%gBDj+ctO%#C3)3nUHi{`p;Chm_eC>Xg32l&
z8K`GWj^=ZjvQF?H>;f1?B7&V)LMD{E=}>^iGO+OLfQb_yt_Lkc@L?qh(Mwk>XT96`
zMEsY+p!luGpB;&_w9wP>F}XV;!dkh9G;kU8bFg#l|5^qJ*pEQ6U2uf|B}Vm7I5Xxo
z;1IBj^z-M6o>de!GHtvC-%-MJ&RF0J!V1YCG=nse>U2&ahFQX)HVg7de|Pd@>Ms~p
z8JS(VF$bTySwugy2<+fTQbig-<T4Dmbn$>q^qTvTgPRk6DB-|oV$v=uDp@d@nqC=W
zl#%Zerhit3CBQo`0wscYgf=&r?3Xe=Up1+6j_Vc5HrMpdTI6?B!0M|=An<>x4E*{(
zu&+7ansn(FY3He2xlRjY(F~HR(LPv56@k%d4CjPjg3O|L-4;wgP&YY`=sFZX*1{d!
z-QMshoa_Qf3DT?4m|wGN@3a>e?k4(tT)qv&sUy2l`bdE%d0!FTmk@cFI9y+ioPv<e
z_e>3WwQ-V3e10sXi|?Ne8jx%S`H!`xk$sB^1!H{_J&m=SL=M#WvZVH0vf5T33j+Wj
z2|@d!{70YQul{io!m?(x;&I}m9*Ptpw7G^j`A)km@6-3K-~KJ?Ae96W@^M(kXceBG
z2jV9S`jbSl!2BH9HtlTptRR7}3?858OR>9C+;f{@sdZ5g1pFs9Z#%C~i<1^cydo^K
z)4Rm}T6y9qT0%v5$g*?+n%zRO)_#SO=P00UuPMdV`kuZZuV2S#?{pYLdr*FhC(zSc
zLUZ-(B?ugY0YK5f1a|oTI~G_9LV$-He9^v?Sr|yxfam=#l*jxz{1?(A$h?Hmn?&;F
zSL3qUfq4QI*lZ1b>7A8ZE`bWv@LHqOK>j?6C*#3}TCjP16xD{axSNi$ro$fXDQGzZ
z|FhwlK7k2wm>~D(jPl4RvE-Y<bC79AfpANtkL4vvAF=IC<1_q2y*vT_P5M|*C~qMF
zYNvHh-zt_+!>2*)u^|5!XGG%$-J|>X^}=e5a`h<)2o!-32>-8y7ACmR?cb2)K0hiE
z<FlJtb}xbz?~Yh!FU-wIi<SqliQ#F^4i$BJpe=#v<jrjQojT>zz|R#F0MDVaiuDVU
z`{T2j=<Y2q%e)qwe$~}#$tV)6I~#XwT1(M4K{~k!taV(QsY(@g`#rdf>P<hlQX+VU
zxDx{z8c!6QaSu*p>A&!~Dqg<q3UTj=u|JHCJ)pbJzcW=F3H^Jdp%{d~0<p7Z^6#jC
z<dqQ#-=`Ckuy5+*t6O=$*i$`7o6JwZK*@59#y482LM0KHqr18Y(%#~y^-n2{3vDN3
z1R4ePZuHC>aKMGkPAPna2yl|{Bg2Xlepf|_mai{{l@m)cK)`jQ8R<(`Vka48Rb*`3
zEz#B~R^t$9b1-z)@5Q>KEIQ0<gdhPAd=GDp+ziUz?}A5E={pSyM{lh(b{a4s7jBII
z94ZEBp>0Do9~sEkI1h%9d=V~AH2cC%p=OyDay|9x68hNdaU^sO2o54?^?C)29j(*a
zQg@cr*P!FM%FS#WtJVq-&q--X`Vp(ze`_Qu%704?-Nh&fDeirj_GiP{5DiuR2xn)k
zCwn0+hwz!Bt}gz_XWSz_$z;ui=(m9~eM364Bg+Y4nnytbw6yP1TBX7Ia7}3vS49e)
zEK7XXu_gc>Tp%V0LeK=h`oQC`LLJ^XCvpd7jTA|VBJzxw*-jHSAoaXn7-_)!%9GVf
zX>67=F)jQ4aFZos4~jmWP@P(sVQ1;mY0dgEcIKq0Tghzg7dwC5kziz`qARMivynpf
zGCL>L1s>A*Es}XJ^3iN^(Hhsd6nrfiSdJI3I4dHoPNtJWG*1d^=DR~%M+YqeTHHma
z$M{>2$r>ak*16}8A}s87f5mIFY1Jg5@?aRmGiCqYGcw&mq<TsOcE6E#8V!}bR|@^=
zLX^w%hYy2hm@C-15Ow%l<n#+D?Aye>j>}c2QkU>l*H&)y%vh#EZ^?(f{yTny*lDD1
zD!hC9%wvb{t)k;NnqqLgbWH~Dl8)(2n=hg5jwkaEsL_Tw(<c5$@#9=hC%db3phbpd
zD7nAN-LP*>_CP4yfZpi>zyS!s`rm_S1DaXnQ3`<HNh4{`rklQ3wt@9(2@fqP=(xv$
z(2cC3yvy8MQR!0gdedPRq|^dvava}za8C;@yOV^x`K1*Qj9DmaIuVTg`{0&oi}x&6
z3dLzP_=<lM(nGzc*s(xoZH?pncKC2vy$-O}>s-EBPRJuzJRog}U!QQ5SyFHBNgI*w
zs8?-(ZLcOQ5yENbjXWza$b(-!*>peERL?E=z5W=w_o5-;duv(_r>>pkHZ^BucoB@D
zk96LqN#v=u;7n^jQ}OvE=C0l$;Mn3KnH+;JbQYQhNQ0N0a+2KiuNgq_gM_o!GeXnm
z{h^N&O!7<aZ*;FfM*ek7dZQ$=9xCAuw{q(j7_lIwdRK=ZVyX4}r$NZ$=c@hHV}d8{
zjw>0~1Q^g}flGg{@7BY|2I+a7&G5sx5i0!1?f&efq&np(z;N7{*J|J&F(Q5~;P_OY
z&$DN_`ZaBFH-OWdAkX$NN0=aPX9Y@VlZ={FZIJ{{^d})pRC`KIBEupyvwNJx>AcIo
z(-9C$;~@1x-V{mVgRsSejuu5ia0g#9f4#UXwuW}4HHiTI$H^h4JS_aU-{0=z9~!{C
zyiv8=E82CMfzmpzYp3VDa!<y=#(xXWM+KX4jN%gr#F~1(u~R`ML5{u|X;0InBC^-8
z4&kt!-aidfNc>Qqa{2+kq&E1YiM9X4spRURNFb%sA{Z(7t&-PDK_l<L$VOvl*zQs#
z9Xm)L)|jTb2OzA>{a-VPPz1rU$MLTVjyw#*x$R-QXLu~gogMTJK-idvEZSsfpmhCh
zykdcah2#`JK8afbW?T?Mhj`$Qewp7WLNu&|j`~zKdUwJnqLwOpO7V<gN+paZsKirv
zo*kr2V}(&=l)8;i6lOc$i3KrtJRU!pXm~z_|9IZ*%+SLd>QGohJRNBdo-N7qtXojo
zl4>|6K_IRxbMsLTl}sW-dRb=Vp%Li>Io?4OL5Npd|5aV_9c)j`7yfoRd-301`5@%w
zww-bBw!i02umRt)M1F|96a5JbpZ>X2yceUheO)RVY|gSsmu$i+7AT~kD@7Z;qI^2P
z7Oc#yTt4pFR>m=<yFJQ>ZW$}$gzWfjry<X6xXY884z0<Jx=JM2#K0#*kre&iW)cyQ
zkuO$7*TuV^;s6UYqUk&l#-cirdnPT&p`&rEN`SRBTLHp$v;U9DAWZz5J|^=7viVr$
zjfOcRi;+D0)Fz1HUuE$``QiE}f9KDMQd&I1g;|~!L^(UCio__Squ31LLI^x*@V>-h
zT%IIkmfHnGOAZ{JtD7j#<HfH1Ec<9x4W>2kkR$4J(tVn5<jbJ90BPe|bODXjolw8y
zx=03947Fl?U8Ff!F4+<2Z$&g{(Y!~EmOK)9^0d*Cx>#Bij~w@aZZk{hX6m|xhm040
zfe^O;J&Q3+mctewdrJv3G^xU#)bfF#m#q<@?h1{(ABvH=H6(s)o!d2REVd5K1y_j-
zuBQ0h*);x!2i1Zt_3#sJ5u8KReWVTY<mcf}G=Hl3%}*0<UgglTJ+9o$0w+wUK3os<
zi%tne7xZv1!cRLesR`^M4?T5kOz%u{@jk-53Nr7@`3ks19PXJ`O%Gy4)-*T^Ds=Nw
zkcyy+%8yX})7aj$N?~8|AvFzBeD5FuoBi4orE{UDH9g^u@a@6L>vJx-Qp1Oi(oOq|
zhsPO=o_S?Q?-e5?GiPr}rFu`@_(r|fRl>N;2LMaXG<IyOnfrBD(_=KYn~EKxSnUL5
z`v?bsFkk?Hei{nbtLjb*ODx+9KWRp0&M#ihY4Z7_&Y=IM02wE3Loo_fqJ}Wb$P!P)
zlX~(px3?QoribG5mFmq>h<1B-{CfDMk;;D$la_)Iks&S3`#2V&>tVZdpilHCyK1bs
zZbyWr_?eqr@O+HXSZoO=K8=P`C`{o;ub;3%m-pT|$awci#_TSkyYnoOUo#~AdCIM`
z3`*>A7Co{&z3~E=QC89Vj5y(ok$iNSD;i{z(x;Bl%<fZ3+%6w<|6f&C9TkNataquU
zmkw#^kOt{gx&;KJyFsKu*rijtyIZ7NK)R$;QjjhsBzNE9@0|C}+q38FzcY8fnfYe!
z%-zI4&p$hBF*vn!IPlFw{D4PEe4HEX9!{exr_ZX`9T<A;1--IXa0fK6^N`fxPPW9_
ze0P}QPmTqmdg=)IW~deU2&RM`ZKnKzD*q6weqKQ`y6UuwB`JH%iEhrw<4<wMm6~|7
zbYsw`3a=Eb)>p$)KmK6S>?j`HR`4Lf!4kK%p~4ODY$b!IUdctc?3@%BmhhvN5(Nr>
z#uXAh8z6Nt8)~^|XT|>B{a*C<5AeH{R201XLek$%ESHt~LdgYg(?$Zsm4*B|X+eRk
zxj$2I;mEMH=11KwnTET6O*RnEe<ea8n;1MzvCFkK&32V5yEwX&u)^o_W&r^Km7kK2
z@=3hxmusLTe7JDy@iN&Zo3@}j)r*jgGS<pPOiEBQ`Iam)qEB(hhCyH2&kZ+>8mC&=
zIm$(#{4A_}aH<_W0q>hJbt0gw-|6n-^{wu+BK~XpHe|vUnuH40x~o%DTio-_DHgcM
z)RJ{|g60q3^-C{h3x>z;9R)UsnAjD<uS%hy*H0M$tYG(bjNlUXCz*Hfr<Xs~Ai-Gy
zc`LgF$|;Y_>(V8VtJRM9T6i)2kxGR>p%NEn0OO7R%@rZf<~!xgwLi=0?)XCcowAP3
z*fRQ1Vr>t<vNHRz0j+H2H-^;0%d-s4KW4)<8Mr@E&ZLBU!Q;wKdPF&p<tKk+f#6_W
z*+a5l*~{7V2U~Inf%x^r>blf&`4Xt#d9M)@r{EGDWcYt4s{iCq7ey<>!m`s0mo6QP
zDOQ2#{T|cn%!fnF^rhPPy+wBn`J8W&C!2E2`Qz$-KL2a{80Wh#eu*k>&Hc;Vd5oZf
zE;uKZnx<f5_t9h7me!?tWH1!hiCZW|vXD2>P<$=UGDL$3&Y#;J`dn>#QI<k2gC-L5
zdc!CoT2R{HP6x`keJ~eJPU<vf=8wUvKeUC%wK1(CSthA$nU!BzY50I}d<00H5T>8j
zq>RPAmJ`>A`>4P#$vK5QQu)|0c5)R>`HBD%naz^zq@kBT5!OvpRn3!T>b*hCBR|e^
z<^_3|*GpP;U`^QFB^t(7?%$xql6Yk+7V1s1kEb1LlUD5|;r=7P;eE15OUv~rVSbX~
z<GU$u>xl?!uJxF!BdT(OqB!%>>%Xloiid5t{I-`dOMwC}S5;R4vEc(uhi_qulE{Y@
z_T6Aa9fPnv^xu&d%4Fy17kbck3gSU{J3dO(3$FfUN7)!%v_aA@sn^=#=1|P!j(Fob
zg+qaYnb<~RdAICp%5Mcth<Cdm(cwBbJ3Wby6tL`3D^{wqbL>pRbU2jh`0l-r?>rp8
zkxjCem6i03CEIzPD7V$vk|)k2#D2rIR;cTCf01^5uYDuOE$nJ}r^$lgTE>?w2z<k-
zWE#xJ*j2*}tI&}Z_(xMfDF{LDfb&3ZR~D0fzmsmF(isq#^rz#gfpGB6{j66rDyl*O
z)9Jjs#k7O)CR4y(R0TXcYo~zWbJT8|29cM07L5c&!%8f23--5Qs?34Gc7|~x6~quI
zUx59HVy8}V%di|)f6}@qDYmEnyQGc2*sq1*4}TR5MM*-74>(wOtYc%kU7nTqI#}*)
zMBj2WUfQ2CkMB=Yxu?u9#AE0H;Q849CZs?WPkvt~FsRz|xvper5mmmJ|G2qaHSvth
z@R6$&-Mu2N-PveXCjf8S&Or$2l{bKch4GwS_<q>4zLPspBbYns?VJ<R?hC4^7yO1v
z-%#uJ_!7D1C7lFZ;oqcYzYU~Cq%r~7=}*-s>uPBDBt@#HSg+cB`*U+0e;6{n$F$=K
z=^Nzo0H;{UlA>sFc9EORXUZ&?EYXzsF!eBYXo1fG8t{MDRiLgXm^!gORDqdm)|WNH
zam0E8-)?I9*?Cl~X!`G<`<Au1xDKa7<AFg%F|kDHXWT^^>5QA*p+z&lwXd)nSz2Kg
z1)+nw#l!Lf6YgC1N}0K<E1qf$tI~iVpxvL>o50#Pl=6!@kGePmNe^4k)O#tGzNOCH
zVzyPy{do3;A3ZwdE%^xLK{}YRX4Ee$HsIjpzGA8t?YlPfH!$@bN911n&N~G6D}jQh
zpIAzaNKfOq>s#T@)XG0IHHnZQ6YNP;ErKPrygHQi;!(!J7Ng8{IgPqW)KViZ)7{LG
zBQ8&jy~Q`lZA5)GN%Oz!NMEC&O=>fR$J-l<PGzk*UPC+sT^rxtQmDS&Bu_MliD(22
zhc0E65u|u$wEl8R$58BgKG`q!ovZ$gaTb5Hvzqdus8vL;?s_O-@I940pr@p}C+Xf2
zfLfB@hlr(!O#16-cSqqRP9c2;t@^0fh)_phHb0+c$zU_{DCqios=wD4vM?2scti3+
zz@FO67n;@|)22#wi&#G8h06$JTD+{BQ;%plnq9+?sLn4w%BP`GKHX`zz!#+pKUr0V
zW>1BX$r8`C+@x@ryfYdlJJ!8y_9X(YyGv8IHV8rRRZl!$y2VA<t|^}2>VY-AOCx1P
z5{CU00?t3#Z6GO1Dt%3sh>=9N{xKAEi>SpEBn`rlC`9x81|z+(<4kYz2(-UrlB^Ot
zIe^mh;8>N9HorpjYa;56ryoVtGZ!AGd!^$0#dc9G#<wu8?|ac+QlQtjY&}Q+XxNBa
zQ2gxANR~K7rx`$+)62+-^JAlBzm^5#=4ilvfx-<J>1TD;ja1RSzxLyDV3gpyTI7<D
z2!6Mb;%suE$pMEn-c90oOrpJq7aPr@pnNxd4eML#r0qzNa|0CJxf%L?IppReHS=qV
z1aUn{f+;rRu2@U4+V{^PuSK#un9Ai7N}Y$u@(H|+Owlf_(b|huBVFJ#@N;mj4gx`C
zP;?vw*cT^Q*B^Yo)G!C|E{;cGFG>;qJ((^n#UkykWg97X`UK)w%xTbAWwmBcTK2tE
zDmjWlTBsj0G~TXp$=K19vM`VupF_8`X`)rr=!E|1i)uB9-Z?1GD|;vSC8Aot`X>Dh
zvySzWBX4J9l&~<HVdjWRVT!O%;8=CsUKZx}bC$`;q;KnQE}lTrx~)H77%YuiRsJs}
z;c~~jCMog2p7Zm6lG6PbKx}-~v^KTk^-<|_a$ndOEL-(QkgwoCy^2%;f6b8$?9ygL
z!H<#G;(=}UE-WRZ%=UwCQamb1+?CFyH$%MWR=z?`)8mfo_^wOEK(9~T&l7BhL&^5i
zVU$=Y#g#8q&514yHs2-oWn2vwEcT1XRb3`N-_gO6Yu#*7cXzR*nOwxl*c>CLgoSpw
z<(3Y(Gi}GX&@e5(P(JL^Q33x8%IE_Bs+_^1<@}N*?W}f{^PmRd=jAs<GBpqZrpF}8
zSJ9vwde1CQ^Rrf^gZ{^_Ro-VH?qR-E!ef>|HiI$IpRTXuW=E{4ELnLmrADK$JV!t8
zhlUEfEU)#u<ahcox942Zb-nQ*B4OQf4NDvTCL+yGRdMs$RD1lUs-GYdmF$Fch?IlO
zH)*W?rPPoCjWG3**3H4vln|4MWD>jw3@*u^L|DHRimv#?aZFlgu!d-@8eD%$Th9w@
z{#?z<qLR1~0f&+;*0*`YDrt`e>q+9PGJDnuVeMr~1mI)F#im-B;KtvR6}Jkk&+nM*
zFsI4}28wyqMdgob6>h9JNUX&tC<ltz&Q+pTqTv*o-HN_oRU;^!)&9nw{%#?Dcj0-v
zJ>Hn-=g5;ZhI0>tlz@*N0l7WjX)?|q8OC%i9p2giyJ{X~VJRvC2;(CJH9`m~T0m4F
zcbjuRAkAccmd~qgsPZbQ#=FzVmO&=9Vil@F(}LBC6ZU<M_H@*ujtTGb1?4%{ou|um
zqBAW|PEx}<eC<(M+cySvePmZ3T$*H4AbeHegag4YUm8@}+O(<AM&??ZduMXSy-x$>
zt9aiqMhlPrR{bcuR_wl|G`#yYhf!YF2ocw2+t$5`hUbTXCo`V3H*n`=293&+>i;I|
z(cdFF9HGXm1hAf#JyO$%hcoiFhp***uKCh!^Oq<&Tbv4o<9~Ol8d8Ww@g_k1FBBli
z1MXXQE2FGr*c*n@y$-|SgFVGTSM<PaBl#u$f%*%Q_d&o?S9)VN$MA`evqV1&8$SEm
z6GoEAYd9=k$%ppDfB!4BjblO|X`JpJdyc;Ov-;RSkq#a>)IT?ZG6U1U-o>b2<XGiD
zHeV|`EI=f=G5@(!D1teBnH%B2IZ0Cd1nUEc2-z{b`$lqC&p2HUh+^Zn8oYXy&43+u
zz~(l9l0fRnx$M@b$y4N6JXiP0&rR@?B_C~$sx<3&Ocqu&!kZfOvuZW%lHrkx#V?Mn
z#G}k#=$rb`s!%7}9XBqbqHpqM1N<s00GGd$cqd+km}&ZDT3fknFU;c_38YchRQ4xj
zvBL~V#qDGCWXKkgRI?h{kLFdb5Y5^OD0&9u0Xm1B!tPW?vzYUkC{2!4)00lEA)3eR
zQQN1N=fkRw^>MqRx+1lkHmxnq?5{%)R)o+>EcfM(h4<I#W#E0ff++P7Y8oDpTkwsI
z&!#YGA{~tYv)NwbY4ky;INn;EoUflUpH=ROiEoL_?6VQf^GJ5(G;pbqm)F2LoCeCz
zV7CGEsW@edd&Uv7TIBEhRVS7;A?x?-)bzni2TurqtsE5I^wh~iuR&xF`7VBFM8Gyz
z=w&r6_tm745fkW7oQWdamW|G6o7@+%Jr|l43678C;n23OdbIcYVjV9qoEF;Y&G1YF
zPdkWFW9uzv*TyacuIO+aCtOW4c|X+cMsRm3vn}i?ymkFXAhtx998Gi?s`sG#sep?X
zl{JF@%C!P}Akm>I=m2>s()s*Gx;hbMtaUig*gRw7&3SD*`BAcCu_g1W5AT@o^TP<N
z+LLPd9ucq<;wzcvR`YAb=_P&(JsSGd?>R@<TRS_}kMxppe}=A98R>3wxGk^6A9?^Q
zb2ZMX744W$??E9PviE7WD_IKj;N#-Wn__A&sfg{?@S~oSEgAg)@&?d|#PMqnii`$W
zig91}D_6O&-uu810g1%h&UeH9#Fj%NguQe(is=3`E?tcuV$5WBnR$2BvpEln?2TM}
z?~#r_8n3#_l<iKo*Iu$Qe%=?<)yCm@zYAa7W*Sk<bVSxB=9iwG8fo{_=tb>MAUf!1
z8wThk7Alis<;Y(v)=QmN8q_|`yO%)G=bxxN;^CL-`Wx+x=Z+*;T~-gCllAbw)M(z*
zGI-V$de5;<e@o_@P`~~xOd@;G^xBNJ@x0jJh2;IU3GN$`+rz`Xrk{;H_mX1n>Zs?7
zvpuME)JpV+L~7C9A`&vU2Z^e8_=*6$9@$u34iQn2*;&u^zH{T9gXg!oKgXAjQ1HQ7
zB{^H4mzXa6NlU5&b@Ekr-mff`T`;o0V+yK-s-GiJj!47@PwQB!2mAwSZe|$(y=iJ0
zXNb-EeIZ<jjD<hex_uLyOdVJX`{m?eW}gy2A1NQVKf+mGLe98fBRwm$*U{4DEJG}*
zK~qj1Ol;Fa__1W_ckhywcrv~(-qj81@%loi3}5Fy(c%Q3hYgNj^w_#7N&tlc<0vKS
zIq%i$AP2IO@6&UQ)t$j}T6De+VSjQ6ZjDm)EKUXM{bA}O39_(G0P26S_z}@?;vV42
zWNYCa8Ysfdts6aniur$cy_hPyCpsIsLz%s^-Sh=-`so}X&8rL!bgezCf1$|Ovsp(H
z!quc&((uIMxUEktil)Ke>~@bC#ZX$&P3|tw!od^Xx#DD9q<nvqH%Zy5_M0Bp(Mx>7
z@-H%3rnBV^?0Dhq*PhNR$&P~tn3`bAjif*|C(Y`Jv+b@AoOKrt(VRqDD|VEGRZXHI
zF3u{T82FF}iw_spy@JU&KCY1o6&;G4t+1eX8!QHv-7^~2FA}m&Wzy#7(S1sCUCB<>
zuC&_m?j>S5g?;{V+zovjQInSjFx9C8h(7pBedliY<EzuXOXp5@8Rc#;s_h{}TWgZJ
z$y(#1-@up_7-GD)xpQS(q+==T6xDpJVq6E&LH%m?rD-%Wf=UDaV45XmrH1jxzcDoT
z_Yqph6~oIP4qDEgB%ORB2+mLf#b89hv{tLmBdDHqe8Nf5L?_8khNecHY?fdZ|Ad)H
zm-KsRwQWy$_Pm%Px(D5>Gx?R;Q)(X0ZodWa`qx))StG(TFwByF!ko<<)p1Zi&ZvaG
znp^R9$iQnbSoIZ8)|EcDrX0u&euj*Of5J;L-Dey93+H)Irx1N0U-?b|$Ri-PS;eia
z-Zv>lkOMw)nM?0fQeC~SGhF-FRnsy@{1*N+BvS^(5Jt#Zv|Gr_xOcP+lGP#P{i7t@
zcZ}WaJI$}~K;poi-1vd;?M$CELr&V#6yD=Rj@K1RD02J<gW=;^NgXm(^9)xz9dY~1
zz{sYSOM_2?>>FIS>XBIx;2@I#`y}_UBd#2VlBvNyHTIUU*C55t2;3u)Wc}ME^{MEL
zmfFRoKZ#=-`CNXvJf8{&6;)54N+iqI_aPHRY_(w6#td_hxWhR&!us7%4ArLuXGHgc
zzLt4UyE9y!3Cl9SFee>(^>0;~yBhByiPf<hpG;{gS)6{O=fo7w*O?+8CbM*t{%ZCn
z$oYia&n-aJTGNNThmERX+pz5+8Wxd7_P63*t<J^kx_DvG2)r^an7}PJEO4)VQ)p0G
z_t!K~4?h~?Bf~*bemO|)<)ANDWUyyvGt7W3LRZB8;_tri!QSPoasRlkn?w{#3jJ14
z=%u-MPw!hb&G|2zn?+r;f{*R_=e2$3h!l;$gc(AEJeo@P3YD$`G7jhX?9+m^TpcDD
z67j>~I?YGwbNOtAD7j$0jSqA(z4e=;ugDI(CPn}_6#7%jwhb_DS>L6N&CAiAo7VoK
z;557;15CyEHcaImCFCigJ$bG0NL{)Uk61}{U&qTaZ~Or}8NOy^gVASdk)*oRymo@F
zWWSgnGKBffH9f=vGT-iM;$1xdnFL-Iq6c=*BuF8pO`an#fsoVViJ8~5@bHj`Z<ayz
z#{ib$_uq0oU*`=+A)!l;{&92sP$WPRfNtAnt8g)l;-ORJ6`Um1s@|A89Ws?n)P=m~
zGU~Y=DNAxJa;8DrMc{H+IZL!Tp3+e4*;}bVO%QzJ)q{6vC;q$VvVuQjdRKw!m)Om5
zr6}-L%EkiFk=Z4+Xh2J(bZ7p)hOnPU-z!t&)-DKZg@+B^0zUy5+!=EJ>px*cKJoH-
z%IS19AX0K4(%E2V)o01TbP8|U?+h(_02~PZ-9q#N-Aiqg+jc8P?tI}d4TA%_xu=|h
zLg(G?(>n+Fwga)3;~=>s&l5uH-b0pT1~MD1Jyo2Kf<$~2qY-Dg<ThS{niW-^vOIGB
zxb-M$#Up>GA#r;qgZ(>TP<sIuX{+Avu3&Phk(WzYZ>U#DqXwI76CKzSz%bPs=VWA9
z%)mchj*;`!f<PCMes0H-7k7LN8w2kNue(|thAVDszWlYvK%YJ=f?*07(7>aT-ey5@
z+BtbNBm^^VrRK|f*gJZ%iZF+*p4Ryj(hgLR_Ux90M=Gcq(*zS-${do#-Ugo?4yf-*
zTKyLJQ{7(AjO@%ak$^vhQ^yp}YuLXPYc`0y^n&>de;Vo6q}WvWu9Kb%&BmJF^&OQu
zXWrz9i}i^PD)^0L{y)>#{a2LPN`jbbHf$-|@KUN5KK%G(e=!flXFpolwthYD<TkJ&
zJ#j>qb^zG<-PEEd|AxYVmphK)fg$A2d;mOL6bUEdYo49nCJR<j2tR>uA_NDdIy_$X
z%VGXjq;@J3cW+$Ue>fRKxO{;e@<v3OVuG-Ddir@QgN@16aOkC%Rv)&RVtajg9lCq}
zpz+Vl)FN6E4=`NWDNCp14vdT#_do=Lfu}}^KZ<*&(BwNH>c}T<rpe8TZt@pJ!>ISu
z&&9~Fj+{oacjqekOZ5WwPJ8oEv#A6MRYDZeUU+MNRcw`GQEkskovt6}W))8>JtED=
z5U*X%#xClyNsiMLp`ti!Dz;p%Ew1nzKeuL;!GK}pfMkYZcV>0dCY2crS*x*LZ&T;3
zpG0=u8?%|RdtU2FM0wy2D1Nr!o9}bux16jCM*HEsOStw6$@-BejkBs}rwoUdB5|rj
zN2gB%!DC7hw`5P7up#vvV}RKzd$C@=8x5JAepQDhiT&%0O22U+_{89(e2XjGiDg6W
z@t)(iNE3<YZPcX%k~e!`6mklIPxFa5rs$Cl#`UvMc2B1JjwQ>b_tjQPJSMj-mmGup
z7<3nFAEgiG&set0Gx~CZyp^JkF_a?FG-BY|TXuxeG15BbeEzGA%$Td8iO}@3C9<HI
zf%n86>;*lISyEt)%G!tjGQ`QhUeAx0wTB>mH%j^0_)zG%kRtk4UWx31kL9)~t|0?%
zO;Cf4DDbLd`V~POn+PpUiss~8{-EOrLuAmxdF3|49|N7-yMc6%!B?C0kdL98EEJS3
zGXwave>niryrb_R(&0ttkJ5Y?`dTjwsn4Ci;(Jh#4kP3Hw#(YC=VW4=wlJ9~uf0KQ
z4)<-3tCoQ727A_i$SzJpl96hXMT}-Yy;NHQ#RMYaYwkteqT3o7;72D5(pSf>NC*a3
zHKzb8PxEp4+x){=x6+i$cqhKjmI@`xL9s6fk3&JXL|$2opdZ@1k?;bW=(4_6exfU@
z6cyG4Z?SU<B4&Z{@ZxtxDv`qW$uNBGM*DOY;PM-efvnye)P?<=1vj!G8<K%s(R-4h
zv}u*sly5`6*nE*6^fJ*Wk_IS@jLmq^+r^HwJaz-}^Q)hhhRUFr#7~zyK~m^6cx(Gr
z2YcdS?4Tad{;j$Sir3tcgBK+Ec?-GW^{(dko2~j+LT^Lf)JQnasoU23HP|`CVH|Oy
zJo=99wWzcWU^z`PG;EWcr?%W~-O`VHTFc8lTPRpX;ss-M*2x~5L{8T>b{fTFFpQaz
zrlq4SC^WNOgtZS0IsMQhc;m`fu2e7Y@DT{@^By?}rnqLU^?8T1fp}`q0oHjAFOoWe
zVzNRW+@_~t&4Wx@BsXyveWC@$rAQ&QRhD6@L`zju*C;|>9sQAQugS5(4tgMlvIqC2
zRF8f55F9WpWVk*jNBdXGZ=XXw?DXo<KA8;7>}MZx!S^BqFL}DZ7cCwX*}+_5y;3p_
zeEn$6ci7DYQi&Gs?#ec6w=X8E2e&HR3)@C{#biIk&<p9i8GDT!%~>DDw6l)54}Z$U
z5B7QEtjOnt(ZqFnA&wWNF}^)LoM3A1_Q(~1@?cWxikkHhT%1K`?-sCs+jqNtYvBNs
z4=?7tCrVZ)8K;^XN1l4@B^0#;a-9IqD>dMV3=M-~ibEcv3KALSe=V)(y?(YX^vth(
z1Bmk}yyGutUpQ?)pt~9v)98L>42&%2cb=iMU{M==y*@->$6QXQ;40l!Fm+VlbMZ?t
zgG313mF#MM+L1vJZ;f^&Xw@2Az2~KGM0&z+D&SCQHLA!mm2zp2Cu^T>l(IrgbEd<A
z_{MYgK}(f-+*-+zm3T_Xe&9rQK=4h1S_k}Q*w^#m=u=ni{*V5TzA%Dd-vIeD`s<j(
zWg^`pSNN1~Dq}?J!H?_t6Qcz!F=_Zq+-9pID$F}N@t+*UKdwBGO}}U`d7E!7nwWT8
zS11~uI~qt@_5hwfsEstru+>C>X_3?e6jKxO(4=M|8q2th{<dCn_70c!d4R|Ach4{A
zY8)Ju%Tg!;fBK{OjgA_nEKE)X!-Z!>l4kyzFpf;Q>^#%?^;;6@0;F<G+lghsYf??q
zxwc7<L1fq`K+LuCqW$HEiK`KuK!>KGdtLf%%4{7$0SB2l1#CA6B`}V8h9Y5=veS@n
zNG@;5aBic(C*N1Dis~ZSbQ|v3ZV{f3i42e;oVz~{!1+Xs*s@T-`w?U2;__nQi?SXP
zfH}bFClDas5|xCG1Q5R*GA)6C0TfCqFMS;WD*y^zOyg(e5X^jl4v31*i@80Mcydx4
z9T3^!7z?F0Q!0?&(gubVN!>#+tq|&K5Pw*UelOUUb(|ZE+Q^1A3w-<CRqzd8udW^+
zOnGGK6NA&e*^nJKuvP2#X8f1m8hQsRVW+{K`Vsq!?f4mVmd8RwG_o;dK2Fxw9pAOJ
z{<Z=ojCQ^&I+B)qfyCBYZ>{dZ9EQ1zOjRn2&A<<VrQWV+Vj+ftAXm5FuAomjC!ya}
z??^L2#rD7rVL4pMzYh6Q%sm?DNM3sZ;NH4#MRf~7tQ7BKUYw*47!oW1AQ&52-ViCU
zzg+P*00jK;WQo-jx#xei*CF|T+EdZF;;$>IpaZpm%`=3J(O1fsSgTkF?Qfu%J_zlJ
zxxk!FRQ1(3e80s>v-+7))iG49?J+E&GGB%mvV};<KO~$Elv6l58mZBAhlHI34rBSO
z!D_ysN;ohw23b}FX{H9zcTlE(=UogGKFN!qIRl&e=F=UC|6)lt*yX1yKP^rF38v^7
zwy@m^M*|K?{lRx#G90uhGo=>s>gX1Jxo>PsolrUC|BFm0msgX2A%tve9{^#lxJ!Sa
zpkx!JvVC6ALato>fvhUXpobRho4ZbnhrEGbaSS;}-thCp)B|qfl!#}I?f@GBl^jH!
z5*q*=08%-ob*&o)7LsUU5)#0gtr&Ej1fMC_3W8OI6-fi2n6U`eH6`;es2))jJ4fsp
z_CE2=`!zh!i0F$&m9V`EXDFnwTiRMX%O4ZaVQ1NsvTCqnV|p`@hjsXxSQ11MYVz5o
ztm!})qicByjRAV0mHp5^L94P4yx+ssq4r&4M1k=Nr4U;N9GmRm(7LTtyNs)nA;sHp
z-~y&BM{{fsmW*ErZx^W_vmcama`A%|3xv+Hi$H|v8-$eN01Xxtpy)+6XcOz1&>lQL
z`nKnNXjk(HqvM1WIw0q^c?t!v=v2axkN7#y?M(v+02t>IYgt%;oB)$+?61#arLZ1=
zMC>Q$&B=2ZT2i1QEWHVMQ$3+0^s?aS>Q(?P|G&Rv00Il1U{HWK3oRT{uu@Fs6@R;8
zexh(G^$M(;K%4G?Hkf!Z^;)gpZg3zi9xI^1nLflMl=LTkRnmdN3~AgACF3HM`$s>(
z^DF#F+07|dbZXY$nC?0DLBr#h5B6Y2Qu-Zg1=bpC3%_pjb(6-aPsSN${bYZ54GLDw
z?Ur0UzptNeG5m9WS!Z7KXtLMvwa<<J2Z5U>2+*sT$J4cthjuj;aRvGHc!R=aAC^!6
ze=i(#0b*z~^P$ZUWLwO9%+ViGNaZLR%`0f^6@Vxrtjm%q9a^IgW<(Cg%gzhvIE(G$
X3KR-xb2OJk)GE1Q9)-b3(OCZjb{Qt0

literal 0
HcmV?d00001

diff --git a/extensions/opus/src/androidTest/assets/bear-opus.webm b/extensions/opus/src/androidTest/assets/bear-opus.mka
similarity index 100%
rename from extensions/opus/src/androidTest/assets/bear-opus.webm
rename to extensions/opus/src/androidTest/assets/bear-opus.mka
diff --git a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
index b3d5b525d5d..582ca997df7 100644
--- a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
+++ b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
@@ -37,7 +37,9 @@
 @RunWith(AndroidJUnit4.class)
 public class OpusPlaybackTest {
 
-  private static final String BEAR_OPUS_URI = "asset:///bear-opus.webm";
+  private static final String BEAR_OPUS_URI = "asset:///bear-opus.mka";
+  private static final String BEAR_OPUS_NEGATIVE_GAIN_URI =
+      "asset:///bear-opus-negative-gain.mka";
 
   @Before
   public void setUp() {
@@ -51,6 +53,11 @@ public void testBasicPlayback() throws Exception {
     playUri(BEAR_OPUS_URI);
   }
 
+  @Test
+  public void basicPlaybackNegativeGain() throws Exception {
+    playUri(BEAR_OPUS_NEGATIVE_GAIN_URI);
+  }
+
   private void playUri(String uri) throws Exception {
     TestPlaybackRunnable testPlaybackRunnable =
         new TestPlaybackRunnable(Uri.parse(uri), ApplicationProvider.getApplicationContext());
diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java
index f0e993e3b98..5b880cbb71c 100644
--- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java
+++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java
@@ -90,8 +90,8 @@ public OpusDecoder(
     if (channelCount > 8) {
       throw new OpusDecoderException("Invalid channel count: " + channelCount);
     }
-    int preskip = readLittleEndian16(headerBytes, 10);
-    int gain = readLittleEndian16(headerBytes, 16);
+    int preskip = readUnsignedLittleEndian16(headerBytes, 10);
+    int gain = readSignedLittleEndian16(headerBytes, 16);
 
     byte[] streamMap = new byte[8];
     int numStreams;
@@ -228,12 +228,16 @@ private static int nsToSamples(long ns) {
     return (int) (ns * SAMPLE_RATE / 1000000000);
   }
 
-  private static int readLittleEndian16(byte[] input, int offset) {
+  private static int readUnsignedLittleEndian16(byte[] input, int offset) {
     int value = input[offset] & 0xFF;
     value |= (input[offset + 1] & 0xFF) << 8;
     return value;
   }
 
+  private static int readSignedLittleEndian16(byte[] input, int offset) {
+    return (short) readUnsignedLittleEndian16(input, offset);
+  }
+
   private native long opusInit(int sampleRate, int channelCount, int numStreams, int numCoupled,
       int gain, byte[] streamMap);
   private native int opusDecode(long decoder, long timeUs, ByteBuffer inputBuffer, int inputSize,

From f0e734d33e3ac693de9664393215739b96390747 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 27 Mar 2020 18:01:16 +0000
Subject: [PATCH 34/59] Workaround C2 AAC decoder flush problem on Android 10

Issue: #6671
PiperOrigin-RevId: 303364788
---
 RELEASENOTES.md                               |  2 ++
 .../mediacodec/MediaCodecRenderer.java        | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 1bc43e60fcc..9a45664a14e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -9,6 +9,8 @@
   * Allow missing hours and milliseconds in SubRip (.srt) timecodes
     ([#7122](https://github.com/google/ExoPlayer/issues/7122)).
 * Audio:
+  * Workaround issue that could cause slower than realtime playback of AAC on
+    Android 10 ([#6671](https://github.com/google/ExoPlayer/issues/6671).
   * Enable playback speed adjustment and silence skipping for floating point PCM
     audio, via resampling to 16-bit integer PCM. To output the original floating
     point audio without adjustment, pass `enableFloatOutput=true` to the
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 4830b787605..e1026ed1963 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
@@ -344,6 +344,7 @@ private static String getDiagnosticInfoV21(Throwable cause) {
   private boolean codecNeedsReconfigureWorkaround;
   private boolean codecNeedsDiscardToSpsWorkaround;
   private boolean codecNeedsFlushWorkaround;
+  private boolean codecNeedsSosFlushWorkaround;
   private boolean codecNeedsEosFlushWorkaround;
   private boolean codecNeedsEosOutputExceptionWorkaround;
   private boolean codecNeedsMonoChannelCountWorkaround;
@@ -364,6 +365,7 @@ private static String getDiagnosticInfoV21(Throwable cause) {
   @DrainAction private int codecDrainAction;
   private boolean codecReceivedBuffers;
   private boolean codecReceivedEos;
+  private boolean codecHasOutputMediaFormat;
   private long largestQueuedPresentationTimeUs;
   private long lastBufferInStreamPresentationTimeUs;
   private boolean inputStreamEnded;
@@ -652,6 +654,7 @@ protected void releaseCodec() {
     availableCodecInfos = null;
     codecInfo = null;
     codecFormat = null;
+    codecHasOutputMediaFormat = false;
     resetInputBuffer();
     resetOutputBuffer();
     resetCodecBuffers();
@@ -765,6 +768,7 @@ protected boolean flushOrReleaseCodec() {
     }
     if (codecDrainAction == DRAIN_ACTION_REINITIALIZE
         || codecNeedsFlushWorkaround
+        || (codecNeedsSosFlushWorkaround && !codecHasOutputMediaFormat)
         || (codecNeedsEosFlushWorkaround && codecReceivedEos)) {
       releaseCodec();
       return true;
@@ -944,6 +948,7 @@ private void initCodec(MediaCodecInfo codecInfo, MediaCrypto crypto) throws Exce
     codecNeedsReconfigureWorkaround = codecNeedsReconfigureWorkaround(codecName);
     codecNeedsDiscardToSpsWorkaround = codecNeedsDiscardToSpsWorkaround(codecName, codecFormat);
     codecNeedsFlushWorkaround = codecNeedsFlushWorkaround(codecName);
+    codecNeedsSosFlushWorkaround = codecNeedsSosFlushWorkaround(codecName);
     codecNeedsEosFlushWorkaround = codecNeedsEosFlushWorkaround(codecName);
     codecNeedsEosOutputExceptionWorkaround = codecNeedsEosOutputExceptionWorkaround(codecName);
     codecNeedsMonoChannelCountWorkaround =
@@ -1610,6 +1615,7 @@ private boolean drainOutputBuffer(long positionUs, long elapsedRealtimeUs)
 
   /** Processes a new output {@link MediaFormat}. */
   private void processOutputFormat() throws ExoPlaybackException {
+    codecHasOutputMediaFormat = true;
     MediaFormat mediaFormat = codec.getOutputFormat();
     if (codecAdaptationWorkaroundMode != ADAPTATION_WORKAROUND_MODE_NEVER
         && mediaFormat.getInteger(MediaFormat.KEY_WIDTH) == ADAPTATION_WORKAROUND_SLICE_WIDTH_HEIGHT
@@ -1989,4 +1995,20 @@ private static boolean codecNeedsMonoChannelCountWorkaround(String name, Format
         && "OMX.MTK.AUDIO.DECODER.MP3".equals(name);
   }
 
+  /**
+   * Returns whether the decoder is known to behave incorrectly if flushed prior to having output a
+   * {@link MediaFormat}.
+   *
+   * <p>If true is returned, the renderer will work around the issue by instantiating a new decoder
+   * when this case occurs.
+   *
+   * <p>See [Internal: b/141097367].
+   *
+   * @param name The name of the decoder.
+   * @return True if the decoder is known to behave incorrectly if flushed prior to having output a
+   *     {@link MediaFormat}. False otherwise.
+   */
+  private static boolean codecNeedsSosFlushWorkaround(String name) {
+    return Util.SDK_INT == 29 && "c2.android.aac.decoder".equals(name);
+  }
 }

From 94ca84ff296813d6c1cdebd78a5a24ae2f578de5 Mon Sep 17 00:00:00 2001
From: jaewan <jaewan@google.com>
Date: Mon, 30 Mar 2020 14:59:57 +0100
Subject: [PATCH 35/59] Allow developers to specify CharSequence for
 Notification strings

CharSequence is used by Notification builders and allows to set Spannable text.
It's the base interface of the String class, so apps wouldn't be break after
the update.

PiperOrigin-RevId: 303731890
---
 .../android/exoplayer2/ui/PlayerNotificationManager.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
index 047041dd602..cf8fd2e3ee5 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
@@ -140,7 +140,7 @@ public interface MediaDescriptionAdapter {
      *
      * @param player The {@link Player} for which a notification is being built.
      */
-    String getCurrentContentTitle(Player player);
+    CharSequence getCurrentContentTitle(Player player);
 
     /**
      * Creates a content intent for the current media item.
@@ -160,7 +160,7 @@ public interface MediaDescriptionAdapter {
      * @param player The {@link Player} for which a notification is being built.
      */
     @Nullable
-    String getCurrentContentText(Player player);
+    CharSequence getCurrentContentText(Player player);
 
     /**
      * Gets the content sub text for the current media item.
@@ -170,7 +170,7 @@ public interface MediaDescriptionAdapter {
      * @param player The {@link Player} for which a notification is being built.
      */
     @Nullable
-    default String getCurrentSubText(Player player) {
+    default CharSequence getCurrentSubText(Player player) {
       return null;
     }
 

From fea0acd41a111cfa96d844bf6f183717b13c0c40 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 30 Mar 2020 16:38:15 +0100
Subject: [PATCH 36/59] Fix PlaybackStatsListener behavior when not keeping
 history

issue:#7160
PiperOrigin-RevId: 303747338
---
 RELEASENOTES.md                               |  2 +
 .../analytics/PlaybackStatsListener.java      |  5 +-
 .../analytics/PlaybackStatsListenerTest.java  | 74 +++++++++++++++++++
 3 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/analytics/PlaybackStatsListenerTest.java

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 9a45664a14e..b22fd1a3157 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -25,6 +25,8 @@
 * UI: Add an option to set whether to use the orientation sensor for rotation
   in spherical playbacks
   ([#6761](https://github.com/google/ExoPlayer/issues/6761)).
+* Analytics: Fix `PlaybackStatsListener` behavior when not keeping history
+  ([#7160](https://github.com/google/ExoPlayer/issues/7160)).
 * FFmpeg extension: Add support for x86_64.
 * Opus extension: Fix parsing of negative gain values
   ([#7046](https://github.com/google/ExoPlayer/issues/7046)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java
index 3430bfc1dde..a9fd9d86419 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java
@@ -50,7 +50,7 @@
  * <p>For accurate measurements, the listener should be added to the player before loading media,
  * i.e., {@link Player#getPlaybackState()} should be {@link Player#STATE_IDLE}.
  *
- * <p>Playback stats are gathered separately for all playback session, i.e. each window in the
+ * <p>Playback stats are gathered separately for each playback session, i.e. each window in the
  * {@link Timeline} and each single ad.
  */
 public final class PlaybackStatsListener
@@ -931,6 +931,9 @@ private void maybeUpdateMaxRebufferTimeMs(long nowMs) {
     }
 
     private void maybeUpdateMediaTimeHistory(long realtimeMs, long mediaTimeMs) {
+      if (!keepHistory) {
+        return;
+      }
       if (currentPlaybackState != PlaybackStats.PLAYBACK_STATE_PLAYING) {
         if (mediaTimeMs == C.TIME_UNSET) {
           return;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/PlaybackStatsListenerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/analytics/PlaybackStatsListenerTest.java
new file mode 100644
index 00000000000..10122d36ecb
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/PlaybackStatsListenerTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.analytics;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.annotation.Nullable;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.Timeline;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Unit test for {@link PlaybackStatsListener}. */
+@RunWith(AndroidJUnit4.class)
+public final class PlaybackStatsListenerTest {
+
+  private static final AnalyticsListener.EventTime TEST_EVENT_TIME =
+      new AnalyticsListener.EventTime(
+          /* realtimeMs= */ 500,
+          Timeline.EMPTY,
+          /* windowIndex= */ 0,
+          /* mediaPeriodId= */ null,
+          /* eventPlaybackPositionMs= */ 0,
+          /* currentPlaybackPositionMs= */ 0,
+          /* totalBufferedDurationMs= */ 0);
+
+  @Test
+  public void playback_withKeepHistory_updatesStats() {
+    PlaybackStatsListener playbackStatsListener =
+        new PlaybackStatsListener(/* keepHistory= */ true, /* callback= */ null);
+
+    playbackStatsListener.onPlayerStateChanged(
+        TEST_EVENT_TIME, /* playWhenReady= */ true, Player.STATE_BUFFERING);
+    playbackStatsListener.onPlayerStateChanged(
+        TEST_EVENT_TIME, /* playWhenReady= */ true, Player.STATE_READY);
+    playbackStatsListener.onPlayerStateChanged(
+        TEST_EVENT_TIME, /* playWhenReady= */ true, Player.STATE_ENDED);
+
+    @Nullable PlaybackStats playbackStats = playbackStatsListener.getPlaybackStats();
+    assertThat(playbackStats).isNotNull();
+    assertThat(playbackStats.endedCount).isEqualTo(1);
+  }
+
+  @Test
+  public void playback_withoutKeepHistory_updatesStats() {
+    PlaybackStatsListener playbackStatsListener =
+        new PlaybackStatsListener(/* keepHistory= */ false, /* callback= */ null);
+
+    playbackStatsListener.onPlayerStateChanged(
+        TEST_EVENT_TIME, /* playWhenReady= */ true, Player.STATE_BUFFERING);
+    playbackStatsListener.onPlayerStateChanged(
+        TEST_EVENT_TIME, /* playWhenReady= */ true, Player.STATE_READY);
+    playbackStatsListener.onPlayerStateChanged(
+        TEST_EVENT_TIME, /* playWhenReady= */ true, Player.STATE_ENDED);
+
+    @Nullable PlaybackStats playbackStats = playbackStatsListener.getPlaybackStats();
+    assertThat(playbackStats).isNotNull();
+    assertThat(playbackStats.endedCount).isEqualTo(1);
+  }
+}

From 1f44a4db4b4a5f8d4f797d9dff7cc16966b21711 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 30 Mar 2020 18:57:24 +0100
Subject: [PATCH 37/59] Bump version to 2.11.4

PiperOrigin-RevId: 303776645
---
 RELEASENOTES.md                                        | 10 +++++-----
 constants.gradle                                       |  4 ++--
 .../android/exoplayer2/ExoPlayerLibraryInfo.java       |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b22fd1a3157..023bec98f1e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,10 +1,10 @@
 # Release notes #
 
-### 2.11.4 (not yet released) ###
+### 2.11.4 (2020-04-01) ###
 
 * Text:
-  * Catch-and-log all fatal exceptions in `TextRenderer` instead of re-throwing,
-    allowing playback to continue even if subtitles fail
+  * Catch and log exceptions in `TextRenderer` rather than re-throwing. This
+    allows playback to continue even if subtitle decoding fails
     ([#6885](https://github.com/google/ExoPlayer/issues/6885)).
   * Allow missing hours and milliseconds in SubRip (.srt) timecodes
     ([#7122](https://github.com/google/ExoPlayer/issues/7122)).
@@ -18,7 +18,7 @@
     ([#7134](https://github.com/google/ExoPlayer/issues/7134)).
   * Fix failure to play WAV files that contain trailing non-media bytes
     ([#7129](https://github.com/google/ExoPlayer/issues/7129))
-* DASH: 
+* DASH:
     * Update the manifest URI to avoid repeated HTTP redirects
       ([#6907](https://github.com/google/ExoPlayer/issues/6907)).
     * Parse period `AssetIdentifier` elements.
@@ -27,7 +27,7 @@
   ([#6761](https://github.com/google/ExoPlayer/issues/6761)).
 * Analytics: Fix `PlaybackStatsListener` behavior when not keeping history
   ([#7160](https://github.com/google/ExoPlayer/issues/7160)).
-* FFmpeg extension: Add support for x86_64.
+* FFmpeg extension: Add support for `x86_64` architecture.
 * Opus extension: Fix parsing of negative gain values
   ([#7046](https://github.com/google/ExoPlayer/issues/7046)).
 
diff --git a/constants.gradle b/constants.gradle
index e29e5cb7c89..c79130cacbc 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.11.3'
-    releaseVersionCode = 2011003
+    releaseVersion = '2.11.4'
+    releaseVersionCode = 2011004
     minSdkVersion = 16
     appTargetSdkVersion = 29
     targetSdkVersion = 28 // TODO: Bump once b/143232359 is resolved
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index 51d077270a1..06743732e70 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -29,11 +29,11 @@ public final class ExoPlayerLibraryInfo {
 
   /** The version of the library expressed as a string, for example "1.2.3". */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
-  public static final String VERSION = "2.11.3";
+  public static final String VERSION = "2.11.4";
 
   /** The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}. */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final String VERSION_SLASHY = "ExoPlayerLib/2.11.3";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.11.4";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -43,7 +43,7 @@ public final class ExoPlayerLibraryInfo {
    * integer version 123045006 (123-045-006).
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final int VERSION_INT = 2011003;
+  public static final int VERSION_INT = 2011004;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}

From c75f3f77ffc9d5cf8c2973fa02d1c43071ede76e Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 31 Mar 2020 12:35:44 +0100
Subject: [PATCH 38/59] Merge pull request #7099 from
 matamegger:feature/fix_pssh_v1_on_firetv

PiperOrigin-RevId: 303937576
---
 RELEASENOTES.md                                    | 10 +++++++---
 .../android/exoplayer2/drm/FrameworkMediaDrm.java  | 14 ++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 023bec98f1e..2036b157273 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -18,10 +18,14 @@
     ([#7134](https://github.com/google/ExoPlayer/issues/7134)).
   * Fix failure to play WAV files that contain trailing non-media bytes
     ([#7129](https://github.com/google/ExoPlayer/issues/7129))
+* DRM:
+  * Fix playback of Widevine protected content that only provides V1 PSSH atoms
+    on API levels 21 and 22.
+  * Fix playback of PlayReady content on Fire TV Stick (Gen 2).
 * DASH:
-    * Update the manifest URI to avoid repeated HTTP redirects
-      ([#6907](https://github.com/google/ExoPlayer/issues/6907)).
-    * Parse period `AssetIdentifier` elements.
+  * Update the manifest URI to avoid repeated HTTP redirects
+    ([#6907](https://github.com/google/ExoPlayer/issues/6907)).
+  * Parse period `AssetIdentifier` elements.
 * UI: Add an option to set whether to use the orientation sensor for rotation
   in spherical playbacks
   ([#6761](https://github.com/google/ExoPlayer/issues/6761)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
index 8ac92b093c2..56d1aeea4bb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
@@ -341,14 +341,20 @@ private static byte[] adjustRequestInitData(UUID uuid, byte[] initData) {
               C.PLAYREADY_UUID, addLaUrlAttributeIfMissing(schemeSpecificData));
     }
 
-    // Prior to L the Widevine CDM required data to be extracted from the PSSH atom. Some Amazon
-    // devices also required data to be extracted from the PSSH atom for PlayReady.
-    if ((Util.SDK_INT < 21 && C.WIDEVINE_UUID.equals(uuid))
+    // Prior to API level 21, the Widevine CDM required scheme specific data to be extracted from
+    // the PSSH atom. We also extract the data on API levels 21 and 22 because these API levels
+    // don't handle V1 PSSH atoms, but do handle scheme specific data regardless of whether it's
+    // extracted from a V0 or a V1 PSSH atom. Hence extracting the data allows us to support content
+    // that only provides V1 PSSH atoms. API levels 23 and above understand V0 and V1 PSSH atoms,
+    // and so we do not extract the data.
+    // Some Amazon devices also require data to be extracted from the PSSH atom for PlayReady.
+    if ((Util.SDK_INT < 23 && C.WIDEVINE_UUID.equals(uuid))
         || (C.PLAYREADY_UUID.equals(uuid)
             && "Amazon".equals(Util.MANUFACTURER)
             && ("AFTB".equals(Util.MODEL) // Fire TV Gen 1
                 || "AFTS".equals(Util.MODEL) // Fire TV Gen 2
-                || "AFTM".equals(Util.MODEL)))) { // Fire TV Stick Gen 1
+                || "AFTM".equals(Util.MODEL) // Fire TV Stick Gen 1
+                || "AFTT".equals(Util.MODEL)))) { // Fire TV Stick Gen 2
       byte[] psshData = PsshAtomUtil.parseSchemeSpecificData(initData, uuid);
       if (psshData != null) {
         // Extraction succeeded, so return the extracted data.

From a9c4d2f9cff42d8a231ea12ff3379533ff0f75d1 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Wed, 1 Apr 2020 09:29:56 +0100
Subject: [PATCH 39/59] Ensure javadoc fix applies to Android links with
 anchors

This means is-external=true is removed and target=_top is
set on the <a> tag.

Without this, javadoc links to framework docs with anchors are
currently broken when viewed in the "frame view" on
exoplayer.dev/doc/reference/

Before this change:
https://developer.android.com/reference/android/media/MediaDrm.html?is-external=true#getKeyRequest-byte:A-byte:A-java.lang.String-int-java.util.HashMap-

With this change:
https://developer.android.com/reference/android/media/MediaDrm.html#getKeyRequest-byte:A-byte:A-java.lang.String-int-java.util.HashMap-

PiperOrigin-RevId: 304136858
---
 javadoc_util.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/javadoc_util.gradle b/javadoc_util.gradle
index d5b1f56720f..6019a7a3e3e 100644
--- a/javadoc_util.gradle
+++ b/javadoc_util.gradle
@@ -15,8 +15,8 @@ ext.fixJavadoc = {
   def javadocPath = "${project.buildDir}/docs/javadoc"
   // Fix external Android links to target the top frame.
   def androidRoot = "https://developer.android.com/reference/"
-  def androidLink = "<a href=\"(${androidRoot}.*?)\\?is-external=true\""
-  def androidFixed = "<a href=\"\\1\" target=\"_top\""
+  def androidLink = "<a href=\"(${androidRoot}.*?)\\?is-external=true(.*)\""
+  def androidFixed = "<a href=\"\\1\\2\" target=\"_top\""
   ant.replaceregexp(match:androidLink, replace:androidFixed, flags:'g') {
     fileset(dir: "${javadocPath}", includes: "**/*.html")
   }

From d466b8c5d59893b13a3ddc50310d3fb3fcaac84e Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Wed, 1 Apr 2020 09:31:17 +0100
Subject: [PATCH 40/59] Make javadoc links point to Android docs for java.*
 classes

Before:
https://docs.oracle.com/javase/7/docs/api/index.html?java/lang/String.html

After:
https://developer.android.com/reference/java/lang/String.html
PiperOrigin-RevId: 304137011
---
 javadoc_combined.gradle | 3 +--
 javadoc_library.gradle  | 4 +---
 javadoc_util.gradle     | 7 -------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/javadoc_combined.gradle b/javadoc_combined.gradle
index d2fa241a816..3b482910ae5 100644
--- a/javadoc_combined.gradle
+++ b/javadoc_combined.gradle
@@ -29,8 +29,7 @@ class CombinedJavadocPlugin implements Plugin<Project> {
           classpath = project.files([])
           destinationDir = project.file("$project.buildDir/docs/javadoc")
           options {
-            links "https://docs.oracle.com/javase/7/docs/api/",
-                "https://developer.android.com/reference"
+            links "https://developer.android.com/reference"
             encoding = "UTF-8"
           }
           exclude "**/BuildConfig.java"
diff --git a/javadoc_library.gradle b/javadoc_library.gradle
index 74fcc3dd6c3..dd508a17814 100644
--- a/javadoc_library.gradle
+++ b/javadoc_library.gradle
@@ -26,9 +26,7 @@ android.libraryVariants.all { variant ->
         title = "ExoPlayer ${javadocTitle}"
         source = allSourceDirs
         options {
-            links "http://docs.oracle.com/javase/7/docs/api/"
-            linksOffline "https://developer.android.com/reference",
-                "${android.sdkDirectory}/docs/reference"
+            links "https://developer.android.com/reference"
             encoding = "UTF-8"
         }
         exclude "**/BuildConfig.java"
diff --git a/javadoc_util.gradle b/javadoc_util.gradle
index 6019a7a3e3e..b9962d33a94 100644
--- a/javadoc_util.gradle
+++ b/javadoc_util.gradle
@@ -20,13 +20,6 @@ ext.fixJavadoc = {
   ant.replaceregexp(match:androidLink, replace:androidFixed, flags:'g') {
     fileset(dir: "${javadocPath}", includes: "**/*.html")
   }
-  // Fix external Oracle links to use frames and target the top frame.
-  def oracleRoot = "https://docs.oracle.com/javase/7/docs/api/"
-  def oracleLink = "<a href=\"(${oracleRoot})(.*?)\\?is-external=true\""
-  def oracleFixed = "<a href=\"\\1index.html\\?\\2\" target=\"_top\""
-  ant.replaceregexp(match:oracleLink, replace:oracleFixed, flags:'g') {
-    fileset(dir: "${javadocPath}", includes: "**/*.html")
-  }
   // Add favicon to each page
   def headTag = "<head>"
   def headTagWithFavicon = "<head>" +

From 38f282800c42591dfc5390491347a9a88a90fd38 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 1 Apr 2020 15:57:01 +0100
Subject: [PATCH 41/59] Fix ADTS extraction with mid-stream ID3

PiperOrigin-RevId: 304184650
---
 RELEASENOTES.md                               |   3 +
 .../exoplayer2/extractor/ts/AdtsReader.java   |  78 ++-
 .../src/test/assets/ts/sample_with_id3.adts   | Bin 0 -> 31946 bytes
 .../assets/ts/sample_with_id3.adts.0.dump     | 607 ++++++++++++++++++
 .../sample_with_id3.adts.unknown_length.dump  | 607 ++++++++++++++++++
 .../extractor/ts/AdtsExtractorTest.java       |   5 +
 6 files changed, 1275 insertions(+), 25 deletions(-)
 create mode 100644 library/core/src/test/assets/ts/sample_with_id3.adts
 create mode 100644 library/core/src/test/assets/ts/sample_with_id3.adts.0.dump
 create mode 100644 library/core/src/test/assets/ts/sample_with_id3.adts.unknown_length.dump

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2036b157273..0a8c82ffa79 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -22,6 +22,9 @@
   * Fix playback of Widevine protected content that only provides V1 PSSH atoms
     on API levels 21 and 22.
   * Fix playback of PlayReady content on Fire TV Stick (Gen 2).
+  * Fix playback of WAV files with trailing non-media bytes
+    ([#7129](https://github.com/google/ExoPlayer/issues/7129)).
+  * Fix playback of ADTS files with mid-stream ID3 metadata.
 * DASH:
   * Update the manifest URI to avoid repeated HTTP redirects
     ([#6907](https://github.com/google/ExoPlayer/issues/6907)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java
index 589b543170a..bde575f39af 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java
@@ -345,42 +345,44 @@ private void checkAdtsHeader(ParsableByteArray buffer) {
   }
 
   /**
-   * Returns whether the given syncPositionCandidate is a real SYNC word.
-   *
-   * <p>SYNC word pattern can occur within AAC data, so we perform a few checks to make sure this is
-   * really a SYNC word. This includes:
+   * Checks whether a candidate SYNC word position is likely to be the position of a real SYNC word.
+   * The caller must check that the first byte of the SYNC word is 0xFF before calling this method.
+   * This method performs the following checks:
    *
    * <ul>
-   *   <li>Checking if MPEG version of this frame matches the first detected version.
-   *   <li>Checking if the sample rate index of this frame matches the first detected sample rate
-   *       index.
-   *   <li>Checking if the bytes immediately after the current package also match a SYNC-word.
+   *   <li>The MPEG version of this frame must match the previously detected version.
+   *   <li>The sample rate index of this frame must match the previously detected sample rate index.
+   *   <li>The frame size must be at least 7 bytes
+   *   <li>The bytes following the frame must be either another SYNC word with the same MPEG
+   *       version, or the start of an ID3 header.
    * </ul>
    *
-   * If the buffer runs out of data for any check, optimistically skip that check, because
-   * AdtsReader consumes each buffer as a whole. We will still run a header validity check later.
+   * With the exception of the first check, if there is insufficient data in the buffer then checks
+   * are optimistically skipped and {@code true} is returned.
+   *
+   * @param pesBuffer The buffer containing at data to check.
+   * @param syncPositionCandidate The candidate SYNC word position. May be -1 if the first byte of
+   *     the candidate was the last byte of the previously consumed buffer.
+   * @return True if all checks were passed or skipped, indicating the position is likely to be the
+   *     position of a real SYNC word. False otherwise.
    */
   private boolean checkSyncPositionValid(ParsableByteArray pesBuffer, int syncPositionCandidate) {
-    // The SYNC word contains 2 bytes, and the first byte may be in the previously consumed buffer.
-    // Hence the second byte of the SYNC word may be byte 0 of this buffer, and
-    // syncPositionCandidate (which indicates position of the first byte of the SYNC word) may be
-    // -1.
-    // Since the first byte of the SYNC word is always FF, which does not contain any informational
-    // bits, we set the byte position to be the second byte in the SYNC word to ensure it's always
-    // within this buffer.
     pesBuffer.setPosition(syncPositionCandidate + 1);
     if (!tryRead(pesBuffer, adtsScratch.data, 1)) {
       return false;
     }
 
+    // The MPEG version of this frame must match the previously detected version.
     adtsScratch.setPosition(4);
     int currentFrameVersion = adtsScratch.readBits(1);
     if (firstFrameVersion != VERSION_UNSET && currentFrameVersion != firstFrameVersion) {
       return false;
     }
 
+    // The sample rate index of this frame must match the previously detected sample rate index.
     if (firstFrameSampleRateIndex != C.INDEX_UNSET) {
       if (!tryRead(pesBuffer, adtsScratch.data, 1)) {
+        // Insufficient data for further checks.
         return true;
       }
       adtsScratch.setPosition(2);
@@ -391,24 +393,50 @@ private boolean checkSyncPositionValid(ParsableByteArray pesBuffer, int syncPosi
       pesBuffer.setPosition(syncPositionCandidate + 2);
     }
 
-    // Optionally check the byte after this frame matches SYNC word.
-
+    // The frame size must be at least 7 bytes.
     if (!tryRead(pesBuffer, adtsScratch.data, 4)) {
+      // Insufficient data for further checks.
       return true;
     }
     adtsScratch.setPosition(14);
     int frameSize = adtsScratch.readBits(13);
-    if (frameSize <= 6) {
-      // Not a frame.
+    if (frameSize < 7) {
       return false;
     }
+
+    // The bytes following the frame must be either another SYNC word with the same MPEG version, or
+    // the start of an ID3 header.
+    byte[] data = pesBuffer.data;
+    int dataLimit = pesBuffer.limit();
     int nextSyncPosition = syncPositionCandidate + frameSize;
-    if (nextSyncPosition + 1 >= pesBuffer.limit()) {
+    if (nextSyncPosition >= dataLimit) {
+      // Insufficient data for further checks.
       return true;
     }
-    return (isAdtsSyncBytes(pesBuffer.data[nextSyncPosition], pesBuffer.data[nextSyncPosition + 1])
-        && (firstFrameVersion == VERSION_UNSET
-            || ((pesBuffer.data[nextSyncPosition + 1] & 0x8) >> 3) == currentFrameVersion));
+    if (data[nextSyncPosition] == (byte) 0xFF) {
+      if (nextSyncPosition + 1 == dataLimit) {
+        // Insufficient data for further checks.
+        return true;
+      }
+      return isAdtsSyncBytes((byte) 0xFF, data[nextSyncPosition + 1])
+          && ((data[nextSyncPosition + 1] & 0x8) >> 3) == currentFrameVersion;
+    } else {
+      if (data[nextSyncPosition] != 'I') {
+        return false;
+      }
+      if (nextSyncPosition + 1 == dataLimit) {
+        // Insufficient data for further checks.
+        return true;
+      }
+      if (data[nextSyncPosition + 1] != 'D') {
+        return false;
+      }
+      if (nextSyncPosition + 2 == dataLimit) {
+        // Insufficient data for further checks.
+        return true;
+      }
+      return data[nextSyncPosition + 2] == '3';
+    }
   }
 
   private boolean isAdtsSyncBytes(byte firstByte, byte secondByte) {
diff --git a/library/core/src/test/assets/ts/sample_with_id3.adts b/library/core/src/test/assets/ts/sample_with_id3.adts
new file mode 100644
index 0000000000000000000000000000000000000000..690fe90bd0ab0e2bd8849ad95a44a1341523a08a
GIT binary patch
literal 31946
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
SC+zUM>slez<an^K?*BjT>68ut

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/ts/sample_with_id3.adts.0.dump b/library/core/src/test/assets/ts/sample_with_id3.adts.0.dump
new file mode 100644
index 00000000000..1f5d510b2e7
--- /dev/null
+++ b/library/core/src/test/assets/ts/sample_with_id3.adts.0.dump
@@ -0,0 +1,607 @@
+seekMap:
+  isSeekable = false
+  duration = UNSET TIME
+  getPosition(0) = [[timeUs=0, position=0]]
+numberOfTracks = 2
+track 0:
+  total output bytes = 30797
+  sample count = 144
+  format 0:
+    id = 0
+    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
+    channelCount = 1
+    sampleRate = 44100
+    initializationData:
+      data = length 2, hash 5F7
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 23, hash 47DE9131
+  sample 1:
+    time = 23219
+    flags = 1
+    data = length 6, hash 31CF3A46
+  sample 2:
+    time = 46438
+    flags = 1
+    data = length 6, hash 31CF3A46
+  sample 3:
+    time = 69657
+    flags = 1
+    data = length 6, hash 31CF3A46
+  sample 4:
+    time = 92876
+    flags = 1
+    data = length 6, hash 31EC5206
+  sample 5:
+    time = 116095
+    flags = 1
+    data = length 171, hash 4F6478F6
+  sample 6:
+    time = 139314
+    flags = 1
+    data = length 202, hash AF4068A3
+  sample 7:
+    time = 162533
+    flags = 1
+    data = length 210, hash E4C10618
+  sample 8:
+    time = 185752
+    flags = 1
+    data = length 217, hash 9ECCD0D9
+  sample 9:
+    time = 208971
+    flags = 1
+    data = length 212, hash 6BAC2CD9
+  sample 10:
+    time = 232190
+    flags = 1
+    data = length 223, hash 188B6010
+  sample 11:
+    time = 255409
+    flags = 1
+    data = length 222, hash C1A04D0C
+  sample 12:
+    time = 278628
+    flags = 1
+    data = length 220, hash D65F9768
+  sample 13:
+    time = 301847
+    flags = 1
+    data = length 227, hash B96C9E14
+  sample 14:
+    time = 325066
+    flags = 1
+    data = length 229, hash 9FB09972
+  sample 15:
+    time = 348285
+    flags = 1
+    data = length 220, hash 2271F053
+  sample 16:
+    time = 371504
+    flags = 1
+    data = length 226, hash 5EDD2F4F
+  sample 17:
+    time = 394723
+    flags = 1
+    data = length 239, hash 957510E0
+  sample 18:
+    time = 417942
+    flags = 1
+    data = length 224, hash 718A8F47
+  sample 19:
+    time = 441161
+    flags = 1
+    data = length 225, hash 5E11E293
+  sample 20:
+    time = 464380
+    flags = 1
+    data = length 227, hash FCE50D27
+  sample 21:
+    time = 487599
+    flags = 1
+    data = length 212, hash 77908C40
+  sample 22:
+    time = 510818
+    flags = 1
+    data = length 227, hash 34C4EB32
+  sample 23:
+    time = 534037
+    flags = 1
+    data = length 231, hash 95488307
+  sample 24:
+    time = 557256
+    flags = 1
+    data = length 226, hash 97F12D6F
+  sample 25:
+    time = 580475
+    flags = 1
+    data = length 236, hash 91A9D9A2
+  sample 26:
+    time = 603694
+    flags = 1
+    data = length 227, hash 27A608F9
+  sample 27:
+    time = 626913
+    flags = 1
+    data = length 229, hash 57DAAE4
+  sample 28:
+    time = 650132
+    flags = 1
+    data = length 235, hash ED30AC34
+  sample 29:
+    time = 673351
+    flags = 1
+    data = length 227, hash BD3D6280
+  sample 30:
+    time = 696570
+    flags = 1
+    data = length 233, hash 694B1087
+  sample 31:
+    time = 719789
+    flags = 1
+    data = length 232, hash 1EDFE047
+  sample 32:
+    time = 743008
+    flags = 1
+    data = length 228, hash E2A831F4
+  sample 33:
+    time = 766227
+    flags = 1
+    data = length 231, hash 757E6012
+  sample 34:
+    time = 789446
+    flags = 1
+    data = length 223, hash 4003D791
+  sample 35:
+    time = 812665
+    flags = 1
+    data = length 232, hash 3CF9A07C
+  sample 36:
+    time = 835884
+    flags = 1
+    data = length 228, hash 25AC3FF7
+  sample 37:
+    time = 859103
+    flags = 1
+    data = length 220, hash 2C1824CE
+  sample 38:
+    time = 882322
+    flags = 1
+    data = length 229, hash 46FDD8FB
+  sample 39:
+    time = 905541
+    flags = 1
+    data = length 237, hash F6988018
+  sample 40:
+    time = 928760
+    flags = 1
+    data = length 242, hash 60436B6B
+  sample 41:
+    time = 951979
+    flags = 1
+    data = length 275, hash 90EDFA8E
+  sample 42:
+    time = 975198
+    flags = 1
+    data = length 242, hash 5C86EFCB
+  sample 43:
+    time = 998417
+    flags = 1
+    data = length 233, hash E0A51B82
+  sample 44:
+    time = 1021636
+    flags = 1
+    data = length 235, hash 590DF14F
+  sample 45:
+    time = 1044855
+    flags = 1
+    data = length 238, hash 69AF4E6E
+  sample 46:
+    time = 1068074
+    flags = 1
+    data = length 235, hash E745AE8D
+  sample 47:
+    time = 1091293
+    flags = 1
+    data = length 223, hash 295F2A13
+  sample 48:
+    time = 1114512
+    flags = 1
+    data = length 228, hash E2F47B21
+  sample 49:
+    time = 1137731
+    flags = 1
+    data = length 229, hash 262C3CFE
+  sample 50:
+    time = 1160950
+    flags = 1
+    data = length 232, hash 4B5BF5E8
+  sample 51:
+    time = 1184169
+    flags = 1
+    data = length 233, hash F3D80836
+  sample 52:
+    time = 1207388
+    flags = 1
+    data = length 237, hash 32E0A11E
+  sample 53:
+    time = 1230607
+    flags = 1
+    data = length 228, hash E1B89F13
+  sample 54:
+    time = 1253826
+    flags = 1
+    data = length 237, hash 8BDD9E38
+  sample 55:
+    time = 1277045
+    flags = 1
+    data = length 235, hash 3C84161F
+  sample 56:
+    time = 1300264
+    flags = 1
+    data = length 227, hash A47E1789
+  sample 57:
+    time = 1323483
+    flags = 1
+    data = length 228, hash 869FDFD3
+  sample 58:
+    time = 1346702
+    flags = 1
+    data = length 233, hash 272ECE2
+  sample 59:
+    time = 1369921
+    flags = 1
+    data = length 227, hash DB6B9618
+  sample 60:
+    time = 1393140
+    flags = 1
+    data = length 212, hash 63214325
+  sample 61:
+    time = 1416359
+    flags = 1
+    data = length 221, hash 9BA588A1
+  sample 62:
+    time = 1439578
+    flags = 1
+    data = length 225, hash 21EFD50C
+  sample 63:
+    time = 1462797
+    flags = 1
+    data = length 231, hash F3AD0BF
+  sample 64:
+    time = 1486016
+    flags = 1
+    data = length 224, hash 822C9210
+  sample 65:
+    time = 1509235
+    flags = 1
+    data = length 195, hash D4EF53EE
+  sample 66:
+    time = 1532454
+    flags = 1
+    data = length 195, hash A816647A
+  sample 67:
+    time = 1555673
+    flags = 1
+    data = length 184, hash 9A2B7E6
+  sample 68:
+    time = 1578892
+    flags = 1
+    data = length 210, hash 956E3600
+  sample 69:
+    time = 1602111
+    flags = 1
+    data = length 234, hash 35CFDA0A
+  sample 70:
+    time = 1625330
+    flags = 1
+    data = length 239, hash 9E15AC1E
+  sample 71:
+    time = 1648549
+    flags = 1
+    data = length 228, hash F3B70641
+  sample 72:
+    time = 1671768
+    flags = 1
+    data = length 237, hash 124E3194
+  sample 73:
+    time = 1694987
+    flags = 1
+    data = length 231, hash 950CD7C8
+  sample 74:
+    time = 1718206
+    flags = 1
+    data = length 236, hash A12E49AF
+  sample 75:
+    time = 1741425
+    flags = 1
+    data = length 242, hash 43BC9C24
+  sample 76:
+    time = 1764644
+    flags = 1
+    data = length 241, hash DCF0B17
+  sample 77:
+    time = 1787863
+    flags = 1
+    data = length 251, hash C0B99968
+  sample 78:
+    time = 1811082
+    flags = 1
+    data = length 245, hash 9B38ED1C
+  sample 79:
+    time = 1834301
+    flags = 1
+    data = length 238, hash 1BA69079
+  sample 80:
+    time = 1857520
+    flags = 1
+    data = length 233, hash 44C8C6BF
+  sample 81:
+    time = 1880739
+    flags = 1
+    data = length 231, hash EABBEE02
+  sample 82:
+    time = 1903958
+    flags = 1
+    data = length 226, hash D09C44FB
+  sample 83:
+    time = 1927177
+    flags = 1
+    data = length 235, hash BE6A6608
+  sample 84:
+    time = 1950396
+    flags = 1
+    data = length 235, hash 2735F454
+  sample 85:
+    time = 1973615
+    flags = 1
+    data = length 238, hash B160DFE7
+  sample 86:
+    time = 1996834
+    flags = 1
+    data = length 232, hash 1B217D2E
+  sample 87:
+    time = 2020053
+    flags = 1
+    data = length 251, hash D1C14CEA
+  sample 88:
+    time = 2043272
+    flags = 1
+    data = length 256, hash 97C87F08
+  sample 89:
+    time = 2066491
+    flags = 1
+    data = length 237, hash 6645DB3
+  sample 90:
+    time = 2089710
+    flags = 1
+    data = length 235, hash 727A1C82
+  sample 91:
+    time = 2112929
+    flags = 1
+    data = length 234, hash 5015F8B5
+  sample 92:
+    time = 2136148
+    flags = 1
+    data = length 241, hash 9102144B
+  sample 93:
+    time = 2159367
+    flags = 1
+    data = length 224, hash 64E0D807
+  sample 94:
+    time = 2182586
+    flags = 1
+    data = length 228, hash 1922B852
+  sample 95:
+    time = 2205805
+    flags = 1
+    data = length 224, hash 953502D8
+  sample 96:
+    time = 2229024
+    flags = 1
+    data = length 214, hash 92B87FE7
+  sample 97:
+    time = 2252243
+    flags = 1
+    data = length 213, hash BB0C8D86
+  sample 98:
+    time = 2275462
+    flags = 1
+    data = length 206, hash 9AD21017
+  sample 99:
+    time = 2298681
+    flags = 1
+    data = length 209, hash C479FE94
+  sample 100:
+    time = 2321900
+    flags = 1
+    data = length 220, hash 3033DCE1
+  sample 101:
+    time = 2345119
+    flags = 1
+    data = length 217, hash 7D589C94
+  sample 102:
+    time = 2368338
+    flags = 1
+    data = length 216, hash AAF6C183
+  sample 103:
+    time = 2391557
+    flags = 1
+    data = length 206, hash 1EE1207F
+  sample 104:
+    time = 2414776
+    flags = 1
+    data = length 204, hash 4BEB1210
+  sample 105:
+    time = 2437995
+    flags = 1
+    data = length 213, hash 21A841C9
+  sample 106:
+    time = 2461214
+    flags = 1
+    data = length 207, hash B80B0424
+  sample 107:
+    time = 2484433
+    flags = 1
+    data = length 212, hash 4785A1C3
+  sample 108:
+    time = 2507652
+    flags = 1
+    data = length 205, hash 59BF7229
+  sample 109:
+    time = 2530871
+    flags = 1
+    data = length 208, hash FA313DDE
+  sample 110:
+    time = 2554090
+    flags = 1
+    data = length 211, hash 190D85FD
+  sample 111:
+    time = 2577309
+    flags = 1
+    data = length 211, hash BA050052
+  sample 112:
+    time = 2600528
+    flags = 1
+    data = length 211, hash F3080F10
+  sample 113:
+    time = 2623747
+    flags = 1
+    data = length 210, hash F41B7BE7
+  sample 114:
+    time = 2646966
+    flags = 1
+    data = length 207, hash 2176C97E
+  sample 115:
+    time = 2670185
+    flags = 1
+    data = length 220, hash 32087455
+  sample 116:
+    time = 2693404
+    flags = 1
+    data = length 213, hash 4E5649A8
+  sample 117:
+    time = 2716623
+    flags = 1
+    data = length 213, hash 5F12FDCF
+  sample 118:
+    time = 2739842
+    flags = 1
+    data = length 204, hash 1E895C2A
+  sample 119:
+    time = 2763061
+    flags = 1
+    data = length 219, hash 45382270
+  sample 120:
+    time = 2786280
+    flags = 1
+    data = length 205, hash D66C6A1D
+  sample 121:
+    time = 2809499
+    flags = 1
+    data = length 204, hash 467AD01F
+  sample 122:
+    time = 2832718
+    flags = 1
+    data = length 211, hash F0435574
+  sample 123:
+    time = 2855937
+    flags = 1
+    data = length 206, hash 8C96B75F
+  sample 124:
+    time = 2879156
+    flags = 1
+    data = length 200, hash 82553248
+  sample 125:
+    time = 2902375
+    flags = 1
+    data = length 180, hash 1E51E6CE
+  sample 126:
+    time = 2925594
+    flags = 1
+    data = length 196, hash 33151DC4
+  sample 127:
+    time = 2948813
+    flags = 1
+    data = length 197, hash 1E62A7D6
+  sample 128:
+    time = 2972032
+    flags = 1
+    data = length 206, hash 6A6C4CC9
+  sample 129:
+    time = 2995251
+    flags = 1
+    data = length 209, hash A72FABAA
+  sample 130:
+    time = 3018470
+    flags = 1
+    data = length 217, hash BA33B985
+  sample 131:
+    time = 3041689
+    flags = 1
+    data = length 235, hash 9919CFD9
+  sample 132:
+    time = 3064908
+    flags = 1
+    data = length 236, hash A22C7267
+  sample 133:
+    time = 3088127
+    flags = 1
+    data = length 213, hash 3D57C901
+  sample 134:
+    time = 3111346
+    flags = 1
+    data = length 205, hash 47F68FDE
+  sample 135:
+    time = 3134565
+    flags = 1
+    data = length 210, hash 9A756E9C
+  sample 136:
+    time = 3157784
+    flags = 1
+    data = length 210, hash BD45C31F
+  sample 137:
+    time = 3181003
+    flags = 1
+    data = length 207, hash 8774FF7B
+  sample 138:
+    time = 3204222
+    flags = 1
+    data = length 149, hash 4678C0E5
+  sample 139:
+    time = 3227441
+    flags = 1
+    data = length 161, hash E991035D
+  sample 140:
+    time = 3250660
+    flags = 1
+    data = length 197, hash C3013689
+  sample 141:
+    time = 3273879
+    flags = 1
+    data = length 208, hash E6C0237
+  sample 142:
+    time = 3297098
+    flags = 1
+    data = length 232, hash A330F188
+  sample 143:
+    time = 3320317
+    flags = 1
+    data = length 174, hash 2B69C34E
+track 1:
+  total output bytes = 141
+  sample count = 2
+  format 0:
+    id = 1
+    sampleMimeType = application/id3
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 55, hash A7EB51A0
+  sample 1:
+    time = 23219
+    flags = 1
+    data = length 86, hash 3FA72D40
+tracksEnded = true
diff --git a/library/core/src/test/assets/ts/sample_with_id3.adts.unknown_length.dump b/library/core/src/test/assets/ts/sample_with_id3.adts.unknown_length.dump
new file mode 100644
index 00000000000..1f5d510b2e7
--- /dev/null
+++ b/library/core/src/test/assets/ts/sample_with_id3.adts.unknown_length.dump
@@ -0,0 +1,607 @@
+seekMap:
+  isSeekable = false
+  duration = UNSET TIME
+  getPosition(0) = [[timeUs=0, position=0]]
+numberOfTracks = 2
+track 0:
+  total output bytes = 30797
+  sample count = 144
+  format 0:
+    id = 0
+    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
+    channelCount = 1
+    sampleRate = 44100
+    initializationData:
+      data = length 2, hash 5F7
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 23, hash 47DE9131
+  sample 1:
+    time = 23219
+    flags = 1
+    data = length 6, hash 31CF3A46
+  sample 2:
+    time = 46438
+    flags = 1
+    data = length 6, hash 31CF3A46
+  sample 3:
+    time = 69657
+    flags = 1
+    data = length 6, hash 31CF3A46
+  sample 4:
+    time = 92876
+    flags = 1
+    data = length 6, hash 31EC5206
+  sample 5:
+    time = 116095
+    flags = 1
+    data = length 171, hash 4F6478F6
+  sample 6:
+    time = 139314
+    flags = 1
+    data = length 202, hash AF4068A3
+  sample 7:
+    time = 162533
+    flags = 1
+    data = length 210, hash E4C10618
+  sample 8:
+    time = 185752
+    flags = 1
+    data = length 217, hash 9ECCD0D9
+  sample 9:
+    time = 208971
+    flags = 1
+    data = length 212, hash 6BAC2CD9
+  sample 10:
+    time = 232190
+    flags = 1
+    data = length 223, hash 188B6010
+  sample 11:
+    time = 255409
+    flags = 1
+    data = length 222, hash C1A04D0C
+  sample 12:
+    time = 278628
+    flags = 1
+    data = length 220, hash D65F9768
+  sample 13:
+    time = 301847
+    flags = 1
+    data = length 227, hash B96C9E14
+  sample 14:
+    time = 325066
+    flags = 1
+    data = length 229, hash 9FB09972
+  sample 15:
+    time = 348285
+    flags = 1
+    data = length 220, hash 2271F053
+  sample 16:
+    time = 371504
+    flags = 1
+    data = length 226, hash 5EDD2F4F
+  sample 17:
+    time = 394723
+    flags = 1
+    data = length 239, hash 957510E0
+  sample 18:
+    time = 417942
+    flags = 1
+    data = length 224, hash 718A8F47
+  sample 19:
+    time = 441161
+    flags = 1
+    data = length 225, hash 5E11E293
+  sample 20:
+    time = 464380
+    flags = 1
+    data = length 227, hash FCE50D27
+  sample 21:
+    time = 487599
+    flags = 1
+    data = length 212, hash 77908C40
+  sample 22:
+    time = 510818
+    flags = 1
+    data = length 227, hash 34C4EB32
+  sample 23:
+    time = 534037
+    flags = 1
+    data = length 231, hash 95488307
+  sample 24:
+    time = 557256
+    flags = 1
+    data = length 226, hash 97F12D6F
+  sample 25:
+    time = 580475
+    flags = 1
+    data = length 236, hash 91A9D9A2
+  sample 26:
+    time = 603694
+    flags = 1
+    data = length 227, hash 27A608F9
+  sample 27:
+    time = 626913
+    flags = 1
+    data = length 229, hash 57DAAE4
+  sample 28:
+    time = 650132
+    flags = 1
+    data = length 235, hash ED30AC34
+  sample 29:
+    time = 673351
+    flags = 1
+    data = length 227, hash BD3D6280
+  sample 30:
+    time = 696570
+    flags = 1
+    data = length 233, hash 694B1087
+  sample 31:
+    time = 719789
+    flags = 1
+    data = length 232, hash 1EDFE047
+  sample 32:
+    time = 743008
+    flags = 1
+    data = length 228, hash E2A831F4
+  sample 33:
+    time = 766227
+    flags = 1
+    data = length 231, hash 757E6012
+  sample 34:
+    time = 789446
+    flags = 1
+    data = length 223, hash 4003D791
+  sample 35:
+    time = 812665
+    flags = 1
+    data = length 232, hash 3CF9A07C
+  sample 36:
+    time = 835884
+    flags = 1
+    data = length 228, hash 25AC3FF7
+  sample 37:
+    time = 859103
+    flags = 1
+    data = length 220, hash 2C1824CE
+  sample 38:
+    time = 882322
+    flags = 1
+    data = length 229, hash 46FDD8FB
+  sample 39:
+    time = 905541
+    flags = 1
+    data = length 237, hash F6988018
+  sample 40:
+    time = 928760
+    flags = 1
+    data = length 242, hash 60436B6B
+  sample 41:
+    time = 951979
+    flags = 1
+    data = length 275, hash 90EDFA8E
+  sample 42:
+    time = 975198
+    flags = 1
+    data = length 242, hash 5C86EFCB
+  sample 43:
+    time = 998417
+    flags = 1
+    data = length 233, hash E0A51B82
+  sample 44:
+    time = 1021636
+    flags = 1
+    data = length 235, hash 590DF14F
+  sample 45:
+    time = 1044855
+    flags = 1
+    data = length 238, hash 69AF4E6E
+  sample 46:
+    time = 1068074
+    flags = 1
+    data = length 235, hash E745AE8D
+  sample 47:
+    time = 1091293
+    flags = 1
+    data = length 223, hash 295F2A13
+  sample 48:
+    time = 1114512
+    flags = 1
+    data = length 228, hash E2F47B21
+  sample 49:
+    time = 1137731
+    flags = 1
+    data = length 229, hash 262C3CFE
+  sample 50:
+    time = 1160950
+    flags = 1
+    data = length 232, hash 4B5BF5E8
+  sample 51:
+    time = 1184169
+    flags = 1
+    data = length 233, hash F3D80836
+  sample 52:
+    time = 1207388
+    flags = 1
+    data = length 237, hash 32E0A11E
+  sample 53:
+    time = 1230607
+    flags = 1
+    data = length 228, hash E1B89F13
+  sample 54:
+    time = 1253826
+    flags = 1
+    data = length 237, hash 8BDD9E38
+  sample 55:
+    time = 1277045
+    flags = 1
+    data = length 235, hash 3C84161F
+  sample 56:
+    time = 1300264
+    flags = 1
+    data = length 227, hash A47E1789
+  sample 57:
+    time = 1323483
+    flags = 1
+    data = length 228, hash 869FDFD3
+  sample 58:
+    time = 1346702
+    flags = 1
+    data = length 233, hash 272ECE2
+  sample 59:
+    time = 1369921
+    flags = 1
+    data = length 227, hash DB6B9618
+  sample 60:
+    time = 1393140
+    flags = 1
+    data = length 212, hash 63214325
+  sample 61:
+    time = 1416359
+    flags = 1
+    data = length 221, hash 9BA588A1
+  sample 62:
+    time = 1439578
+    flags = 1
+    data = length 225, hash 21EFD50C
+  sample 63:
+    time = 1462797
+    flags = 1
+    data = length 231, hash F3AD0BF
+  sample 64:
+    time = 1486016
+    flags = 1
+    data = length 224, hash 822C9210
+  sample 65:
+    time = 1509235
+    flags = 1
+    data = length 195, hash D4EF53EE
+  sample 66:
+    time = 1532454
+    flags = 1
+    data = length 195, hash A816647A
+  sample 67:
+    time = 1555673
+    flags = 1
+    data = length 184, hash 9A2B7E6
+  sample 68:
+    time = 1578892
+    flags = 1
+    data = length 210, hash 956E3600
+  sample 69:
+    time = 1602111
+    flags = 1
+    data = length 234, hash 35CFDA0A
+  sample 70:
+    time = 1625330
+    flags = 1
+    data = length 239, hash 9E15AC1E
+  sample 71:
+    time = 1648549
+    flags = 1
+    data = length 228, hash F3B70641
+  sample 72:
+    time = 1671768
+    flags = 1
+    data = length 237, hash 124E3194
+  sample 73:
+    time = 1694987
+    flags = 1
+    data = length 231, hash 950CD7C8
+  sample 74:
+    time = 1718206
+    flags = 1
+    data = length 236, hash A12E49AF
+  sample 75:
+    time = 1741425
+    flags = 1
+    data = length 242, hash 43BC9C24
+  sample 76:
+    time = 1764644
+    flags = 1
+    data = length 241, hash DCF0B17
+  sample 77:
+    time = 1787863
+    flags = 1
+    data = length 251, hash C0B99968
+  sample 78:
+    time = 1811082
+    flags = 1
+    data = length 245, hash 9B38ED1C
+  sample 79:
+    time = 1834301
+    flags = 1
+    data = length 238, hash 1BA69079
+  sample 80:
+    time = 1857520
+    flags = 1
+    data = length 233, hash 44C8C6BF
+  sample 81:
+    time = 1880739
+    flags = 1
+    data = length 231, hash EABBEE02
+  sample 82:
+    time = 1903958
+    flags = 1
+    data = length 226, hash D09C44FB
+  sample 83:
+    time = 1927177
+    flags = 1
+    data = length 235, hash BE6A6608
+  sample 84:
+    time = 1950396
+    flags = 1
+    data = length 235, hash 2735F454
+  sample 85:
+    time = 1973615
+    flags = 1
+    data = length 238, hash B160DFE7
+  sample 86:
+    time = 1996834
+    flags = 1
+    data = length 232, hash 1B217D2E
+  sample 87:
+    time = 2020053
+    flags = 1
+    data = length 251, hash D1C14CEA
+  sample 88:
+    time = 2043272
+    flags = 1
+    data = length 256, hash 97C87F08
+  sample 89:
+    time = 2066491
+    flags = 1
+    data = length 237, hash 6645DB3
+  sample 90:
+    time = 2089710
+    flags = 1
+    data = length 235, hash 727A1C82
+  sample 91:
+    time = 2112929
+    flags = 1
+    data = length 234, hash 5015F8B5
+  sample 92:
+    time = 2136148
+    flags = 1
+    data = length 241, hash 9102144B
+  sample 93:
+    time = 2159367
+    flags = 1
+    data = length 224, hash 64E0D807
+  sample 94:
+    time = 2182586
+    flags = 1
+    data = length 228, hash 1922B852
+  sample 95:
+    time = 2205805
+    flags = 1
+    data = length 224, hash 953502D8
+  sample 96:
+    time = 2229024
+    flags = 1
+    data = length 214, hash 92B87FE7
+  sample 97:
+    time = 2252243
+    flags = 1
+    data = length 213, hash BB0C8D86
+  sample 98:
+    time = 2275462
+    flags = 1
+    data = length 206, hash 9AD21017
+  sample 99:
+    time = 2298681
+    flags = 1
+    data = length 209, hash C479FE94
+  sample 100:
+    time = 2321900
+    flags = 1
+    data = length 220, hash 3033DCE1
+  sample 101:
+    time = 2345119
+    flags = 1
+    data = length 217, hash 7D589C94
+  sample 102:
+    time = 2368338
+    flags = 1
+    data = length 216, hash AAF6C183
+  sample 103:
+    time = 2391557
+    flags = 1
+    data = length 206, hash 1EE1207F
+  sample 104:
+    time = 2414776
+    flags = 1
+    data = length 204, hash 4BEB1210
+  sample 105:
+    time = 2437995
+    flags = 1
+    data = length 213, hash 21A841C9
+  sample 106:
+    time = 2461214
+    flags = 1
+    data = length 207, hash B80B0424
+  sample 107:
+    time = 2484433
+    flags = 1
+    data = length 212, hash 4785A1C3
+  sample 108:
+    time = 2507652
+    flags = 1
+    data = length 205, hash 59BF7229
+  sample 109:
+    time = 2530871
+    flags = 1
+    data = length 208, hash FA313DDE
+  sample 110:
+    time = 2554090
+    flags = 1
+    data = length 211, hash 190D85FD
+  sample 111:
+    time = 2577309
+    flags = 1
+    data = length 211, hash BA050052
+  sample 112:
+    time = 2600528
+    flags = 1
+    data = length 211, hash F3080F10
+  sample 113:
+    time = 2623747
+    flags = 1
+    data = length 210, hash F41B7BE7
+  sample 114:
+    time = 2646966
+    flags = 1
+    data = length 207, hash 2176C97E
+  sample 115:
+    time = 2670185
+    flags = 1
+    data = length 220, hash 32087455
+  sample 116:
+    time = 2693404
+    flags = 1
+    data = length 213, hash 4E5649A8
+  sample 117:
+    time = 2716623
+    flags = 1
+    data = length 213, hash 5F12FDCF
+  sample 118:
+    time = 2739842
+    flags = 1
+    data = length 204, hash 1E895C2A
+  sample 119:
+    time = 2763061
+    flags = 1
+    data = length 219, hash 45382270
+  sample 120:
+    time = 2786280
+    flags = 1
+    data = length 205, hash D66C6A1D
+  sample 121:
+    time = 2809499
+    flags = 1
+    data = length 204, hash 467AD01F
+  sample 122:
+    time = 2832718
+    flags = 1
+    data = length 211, hash F0435574
+  sample 123:
+    time = 2855937
+    flags = 1
+    data = length 206, hash 8C96B75F
+  sample 124:
+    time = 2879156
+    flags = 1
+    data = length 200, hash 82553248
+  sample 125:
+    time = 2902375
+    flags = 1
+    data = length 180, hash 1E51E6CE
+  sample 126:
+    time = 2925594
+    flags = 1
+    data = length 196, hash 33151DC4
+  sample 127:
+    time = 2948813
+    flags = 1
+    data = length 197, hash 1E62A7D6
+  sample 128:
+    time = 2972032
+    flags = 1
+    data = length 206, hash 6A6C4CC9
+  sample 129:
+    time = 2995251
+    flags = 1
+    data = length 209, hash A72FABAA
+  sample 130:
+    time = 3018470
+    flags = 1
+    data = length 217, hash BA33B985
+  sample 131:
+    time = 3041689
+    flags = 1
+    data = length 235, hash 9919CFD9
+  sample 132:
+    time = 3064908
+    flags = 1
+    data = length 236, hash A22C7267
+  sample 133:
+    time = 3088127
+    flags = 1
+    data = length 213, hash 3D57C901
+  sample 134:
+    time = 3111346
+    flags = 1
+    data = length 205, hash 47F68FDE
+  sample 135:
+    time = 3134565
+    flags = 1
+    data = length 210, hash 9A756E9C
+  sample 136:
+    time = 3157784
+    flags = 1
+    data = length 210, hash BD45C31F
+  sample 137:
+    time = 3181003
+    flags = 1
+    data = length 207, hash 8774FF7B
+  sample 138:
+    time = 3204222
+    flags = 1
+    data = length 149, hash 4678C0E5
+  sample 139:
+    time = 3227441
+    flags = 1
+    data = length 161, hash E991035D
+  sample 140:
+    time = 3250660
+    flags = 1
+    data = length 197, hash C3013689
+  sample 141:
+    time = 3273879
+    flags = 1
+    data = length 208, hash E6C0237
+  sample 142:
+    time = 3297098
+    flags = 1
+    data = length 232, hash A330F188
+  sample 143:
+    time = 3320317
+    flags = 1
+    data = length 174, hash 2B69C34E
+track 1:
+  total output bytes = 141
+  sample count = 2
+  format 0:
+    id = 1
+    sampleMimeType = application/id3
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 55, hash A7EB51A0
+  sample 1:
+    time = 23219
+    flags = 1
+    data = length 86, hash 3FA72D40
+tracksEnded = true
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
index 56776aea097..3ef454d716c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
@@ -29,6 +29,11 @@ public void testSample() throws Exception {
     ExtractorAsserts.assertBehavior(AdtsExtractor::new, "ts/sample.adts");
   }
 
+  @Test
+  public void testSample_with_id3() throws Exception {
+    ExtractorAsserts.assertBehavior(AdtsExtractor::new, "ts/sample_with_id3.adts");
+  }
+
   @Test
   public void testSample_withSeeking() throws Exception {
     ExtractorAsserts.assertBehavior(

From d921491e7d8c8d0772324a60938e345517251479 Mon Sep 17 00:00:00 2001
From: kimvde <kimvde@google.com>
Date: Wed, 1 Apr 2020 16:33:27 +0100
Subject: [PATCH 42/59] Remove thread checks in player constructor

SimpleExoPlayer instances don't have to be created from the application
thread.

PiperOrigin-RevId: 304190901
---
 .../java/com/google/android/exoplayer2/SimpleExoPlayer.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 52b686000a4..dec9bd76d81 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -445,8 +445,8 @@ protected SimpleExoPlayer(
     player =
         new ExoPlayerImpl(renderers, trackSelector, loadControl, bandwidthMeter, clock, looper);
     analyticsCollector.setPlayer(player);
-    addListener(analyticsCollector);
-    addListener(componentListener);
+    player.addListener(analyticsCollector);
+    player.addListener(componentListener);
     videoDebugListeners.add(analyticsCollector);
     videoListeners.add(analyticsCollector);
     audioDebugListeners.add(analyticsCollector);

From a5420a0b65169521e8f0491b1ac28edc236d7e10 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 1 Apr 2020 17:03:44 +0100
Subject: [PATCH 43/59] Fix release notes

PiperOrigin-RevId: 304196424
---
 RELEASENOTES.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0a8c82ffa79..077397c4a6a 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -16,15 +16,13 @@
     point audio without adjustment, pass `enableFloatOutput=true` to the
     `DefaultAudioSink` constructor
     ([#7134](https://github.com/google/ExoPlayer/issues/7134)).
-  * Fix failure to play WAV files that contain trailing non-media bytes
-    ([#7129](https://github.com/google/ExoPlayer/issues/7129))
+  * Fix playback of WAV files with trailing non-media bytes
+    ([#7129](https://github.com/google/ExoPlayer/issues/7129)).
+  * Fix playback of ADTS files with mid-stream ID3 metadata.
 * DRM:
   * Fix playback of Widevine protected content that only provides V1 PSSH atoms
     on API levels 21 and 22.
   * Fix playback of PlayReady content on Fire TV Stick (Gen 2).
-  * Fix playback of WAV files with trailing non-media bytes
-    ([#7129](https://github.com/google/ExoPlayer/issues/7129)).
-  * Fix playback of ADTS files with mid-stream ID3 metadata.
 * DASH:
   * Update the manifest URI to avoid repeated HTTP redirects
     ([#6907](https://github.com/google/ExoPlayer/issues/6907)).

From e4e56fac094c4924d702b3e0b75cca293135bdb0 Mon Sep 17 00:00:00 2001
From: samrobinson <samrobinson@google.com>
Date: Mon, 9 Dec 2019 15:55:05 +0000
Subject: [PATCH 44/59] Clean `WakeLockManager.updateWakeLock` logic.

PiperOrigin-RevId: 284552723
---
 .../java/com/google/android/exoplayer2/WakeLockManager.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java b/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java
index f498eea6f41..1e718136e87 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java
@@ -88,11 +88,9 @@ public void setStayAwake(boolean stayAwake) {
   private void updateWakeLock() {
     // Needed for the library nullness check. If enabled is true, the wakelock will not be null.
     if (wakeLock != null) {
-      if (enabled) {
-        if (stayAwake && !wakeLock.isHeld()) {
+      if (enabled && stayAwake) {
+        if (!wakeLock.isHeld()) {
           wakeLock.acquire();
-        } else if (!stayAwake && wakeLock.isHeld()) {
-          wakeLock.release();
         }
       } else if (wakeLock.isHeld()) {
         wakeLock.release();

From 83c2ca59025604d7940806a3d26bf4614a4a2041 Mon Sep 17 00:00:00 2001
From: samrobinson <samrobinson@google.com>
Date: Thu, 27 Feb 2020 16:06:22 +0000
Subject: [PATCH 45/59] Add `WifiLock` management to `SimpleExoPlayer`.

Issue:#6914
PiperOrigin-RevId: 297598910
---
 RELEASENOTES.md                               |  4 +-
 .../java/com/google/android/exoplayer2/C.java | 31 ++++++
 .../android/exoplayer2/SimpleExoPlayer.java   | 70 +++++++++++---
 .../android/exoplayer2/WakeLockManager.java   | 28 +++---
 .../android/exoplayer2/WifiLockManager.java   | 95 +++++++++++++++++++
 5 files changed, 203 insertions(+), 25 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/WifiLockManager.java

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 077397c4a6a..ce0c9c5eb11 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,7 +1,9 @@
 # Release notes #
 
-### 2.11.4 (2020-04-01) ###
+### 2.11.4 (2020-04-08) ###
 
+* Add optional automatic `WifiLock` handling to `SimpleExoPlayer`
+  ([#6914](https://github.com/google/ExoPlayer/issues/6914)).
 * Text:
   * Catch and log exceptions in `TextRenderer` rather than re-throwing. This
     allows playback to continue even if subtitle decoding fails
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java
index e926e90d22e..43cedf985be 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java
@@ -1019,6 +1019,37 @@ private C() {}
   /** Network type for other connections which are not Wifi or cellular (e.g. VPN, Bluetooth). */
   public static final int NETWORK_TYPE_OTHER = 8;
 
+  /**
+   * Mode specifying whether the player should hold a WakeLock and a WifiLock. One of {@link
+   * #WAKE_MODE_NONE}, {@link #WAKE_MODE_LOCAL} and {@link #WAKE_MODE_NETWORK}.
+   */
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({WAKE_MODE_NONE, WAKE_MODE_LOCAL, WAKE_MODE_NETWORK})
+  public @interface WakeMode {}
+  /**
+   * A wake mode that will not cause the player to hold any locks.
+   *
+   * <p>This is suitable for applications that do not play media with the screen off.
+   */
+  public static final int WAKE_MODE_NONE = 0;
+  /**
+   * A wake mode that will cause the player to hold a {@link android.os.PowerManager.WakeLock}
+   * during playback.
+   *
+   * <p>This is suitable for applications that play media with the screen off and do not load media
+   * over wifi.
+   */
+  public static final int WAKE_MODE_LOCAL = 1;
+  /**
+   * A wake mode that will cause the player to hold a {@link android.os.PowerManager.WakeLock} and a
+   * {@link android.net.wifi.WifiManager.WifiLock} during playback.
+   *
+   * <p>This is suitable for applications that play media with the screen off and may load media
+   * over wifi.
+   */
+  public static final int WAKE_MODE_NETWORK = 2;
+
   /**
    * Track role flags. Possible flag values are {@link #ROLE_FLAG_MAIN}, {@link
    * #ROLE_FLAG_ALTERNATE}, {@link #ROLE_FLAG_SUPPLEMENTARY}, {@link #ROLE_FLAG_COMMENTARY}, {@link
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index dec9bd76d81..a3c82d68cf4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -325,6 +325,7 @@ public SimpleExoPlayer build() {
   private final AudioBecomingNoisyManager audioBecomingNoisyManager;
   private final AudioFocusManager audioFocusManager;
   private final WakeLockManager wakeLockManager;
+  private final WifiLockManager wifiLockManager;
 
   @Nullable private Format videoFormat;
   @Nullable private Format audioFormat;
@@ -460,6 +461,7 @@ protected SimpleExoPlayer(
         new AudioBecomingNoisyManager(context, eventHandler, componentListener);
     audioFocusManager = new AudioFocusManager(context, eventHandler, componentListener);
     wakeLockManager = new WakeLockManager(context);
+    wifiLockManager = new WifiLockManager(context);
   }
 
   @Override
@@ -1294,6 +1296,7 @@ public void release() {
     audioBecomingNoisyManager.setEnabled(false);
     audioFocusManager.handleStop();
     wakeLockManager.setStayAwake(false);
+    wifiLockManager.setStayAwake(false);
     player.release();
     removeSurfaceCallbacks();
     if (surface != null) {
@@ -1432,9 +1435,45 @@ public long getContentBufferedPosition() {
    *
    * @param handleWakeLock Whether the player should use a {@link android.os.PowerManager.WakeLock}
    *     to ensure the device stays awake for playback, even when the screen is off.
+   * @deprecated Use {@link #setWakeMode(int)} instead.
    */
+  @Deprecated
   public void setHandleWakeLock(boolean handleWakeLock) {
-    wakeLockManager.setEnabled(handleWakeLock);
+    setWakeMode(handleWakeLock ? C.WAKE_MODE_LOCAL : C.WAKE_MODE_NONE);
+  }
+
+  /**
+   * Sets how the player should keep the device awake for playback when the screen is off.
+   *
+   * <p>Enabling this feature requires the {@link android.Manifest.permission#WAKE_LOCK} permission.
+   * It should be used together with a foreground {@link android.app.Service} for use cases where
+   * playback occurs and the screen is off (e.g. background audio playback). It is not useful when
+   * the screen will be kept on during playback (e.g. foreground video playback).
+   *
+   * <p>When enabled, the locks ({@link android.os.PowerManager.WakeLock} / {@link
+   * android.net.wifi.WifiManager.WifiLock}) will be held whenever the player is in the {@link
+   * #STATE_READY} or {@link #STATE_BUFFERING} states with {@code playWhenReady = true}. The locks
+   * held depends on the specified {@link C.WakeMode}.
+   *
+   * @param wakeMode The {@link C.WakeMode} option to keep the device awake during playback.
+   */
+  public void setWakeMode(@C.WakeMode int wakeMode) {
+    switch (wakeMode) {
+      case C.WAKE_MODE_NONE:
+        wakeLockManager.setEnabled(false);
+        wifiLockManager.setEnabled(false);
+        break;
+      case C.WAKE_MODE_LOCAL:
+        wakeLockManager.setEnabled(true);
+        wifiLockManager.setEnabled(false);
+        break;
+      case C.WAKE_MODE_NETWORK:
+        wakeLockManager.setEnabled(true);
+        wifiLockManager.setEnabled(true);
+        break;
+      default:
+        break;
+    }
   }
 
   // Internal methods.
@@ -1537,6 +1576,24 @@ private void verifyApplicationThread() {
     }
   }
 
+  private void updateWakeAndWifiLock() {
+    @State int playbackState = getPlaybackState();
+    switch (playbackState) {
+      case Player.STATE_READY:
+      case Player.STATE_BUFFERING:
+        wakeLockManager.setStayAwake(getPlayWhenReady());
+        wifiLockManager.setStayAwake(getPlayWhenReady());
+        break;
+      case Player.STATE_ENDED:
+      case Player.STATE_IDLE:
+        wakeLockManager.setStayAwake(false);
+        wifiLockManager.setStayAwake(false);
+        break;
+      default:
+        throw new IllegalStateException();
+    }
+  }
+
   private final class ComponentListener
       implements VideoRendererEventListener,
           AudioRendererEventListener,
@@ -1781,16 +1838,7 @@ public void onLoadingChanged(boolean isLoading) {
 
     @Override
     public void onPlayerStateChanged(boolean playWhenReady, @State int playbackState) {
-      switch (playbackState) {
-        case Player.STATE_READY:
-        case Player.STATE_BUFFERING:
-          wakeLockManager.setStayAwake(playWhenReady);
-          break;
-        case Player.STATE_ENDED:
-        case Player.STATE_IDLE:
-          wakeLockManager.setStayAwake(false);
-          break;
-      }
+      updateWakeAndWifiLock();
     }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java b/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java
index 1e718136e87..bd385b0849d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java
@@ -39,7 +39,8 @@
   private boolean stayAwake;
 
   public WakeLockManager(Context context) {
-    powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+    powerManager =
+        (PowerManager) context.getApplicationContext().getSystemService(Context.POWER_SERVICE);
   }
 
   /**
@@ -48,15 +49,15 @@ public WakeLockManager(Context context) {
    * <p>By default, wake lock handling is not enabled. Enabling this will acquire the wake lock if
    * necessary. Disabling this will release the wake lock if it is held.
    *
-   * @param enabled True if the player should handle a {@link WakeLock}, false otherwise. Please
-   *     note that enabling this requires the {@link android.Manifest.permission#WAKE_LOCK}
-   *     permission.
+   * <p>Enabling {@link WakeLock} requires the {@link android.Manifest.permission#WAKE_LOCK}.
+   *
+   * @param enabled True if the player should handle a {@link WakeLock}, false otherwise.
    */
   public void setEnabled(boolean enabled) {
     if (enabled) {
       if (wakeLock == null) {
         if (powerManager == null) {
-          Log.w(TAG, "PowerManager was null, therefore the WakeLock was not created.");
+          Log.w(TAG, "PowerManager is null, therefore not creating the WakeLock.");
           return;
         }
         wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKE_LOCK_TAG);
@@ -86,15 +87,16 @@ public void setStayAwake(boolean stayAwake) {
   // reasonable timeout that would not affect the user.
   @SuppressLint("WakelockTimeout")
   private void updateWakeLock() {
-    // Needed for the library nullness check. If enabled is true, the wakelock will not be null.
-    if (wakeLock != null) {
-      if (enabled && stayAwake) {
-        if (!wakeLock.isHeld()) {
-          wakeLock.acquire();
-        }
-      } else if (wakeLock.isHeld()) {
-        wakeLock.release();
+    if (wakeLock == null) {
+      return;
+    }
+
+    if (enabled && stayAwake) {
+      if (!wakeLock.isHeld()) {
+        wakeLock.acquire();
       }
+    } else if (wakeLock.isHeld()) {
+      wakeLock.release();
     }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/WifiLockManager.java b/library/core/src/main/java/com/google/android/exoplayer2/WifiLockManager.java
new file mode 100644
index 00000000000..f37ec6ab8b8
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/WifiLockManager.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.net.wifi.WifiManager.WifiLock;
+import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.util.Log;
+
+/**
+ * Handles a {@link WifiLock}
+ *
+ * <p>The handling of wifi locks requires the {@link android.Manifest.permission#WAKE_LOCK}
+ * permission.
+ */
+/* package */ final class WifiLockManager {
+
+  private static final String TAG = "WifiLockManager";
+  private static final String WIFI_LOCK_TAG = "ExoPlayer:WifiLockManager";
+
+  @Nullable private final WifiManager wifiManager;
+  @Nullable private WifiLock wifiLock;
+  private boolean enabled;
+  private boolean stayAwake;
+
+  public WifiLockManager(Context context) {
+    wifiManager =
+        (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+  }
+
+  /**
+   * Sets whether to enable the usage of a {@link WifiLock}.
+   *
+   * <p>By default, wifi lock handling is not enabled. Enabling will acquire the wifi lock if
+   * necessary. Disabling will release the wifi lock if held.
+   *
+   * <p>Enabling {@link WifiLock} requires the {@link android.Manifest.permission#WAKE_LOCK}.
+   *
+   * @param enabled True if the player should handle a {@link WifiLock}.
+   */
+  public void setEnabled(boolean enabled) {
+    if (enabled && wifiLock == null) {
+      if (wifiManager == null) {
+        Log.w(TAG, "WifiManager is null, therefore not creating the WifiLock.");
+        return;
+      }
+      wifiLock = wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, WIFI_LOCK_TAG);
+    }
+
+    this.enabled = enabled;
+    updateWifiLock();
+  }
+
+  /**
+   * Sets whether to acquire or release the {@link WifiLock}.
+   *
+   * <p>The wifi lock will not be acquired unless handling has been enabled through {@link
+   * #setEnabled(boolean)}.
+   *
+   * @param stayAwake True if the player should acquire the {@link WifiLock}. False if it should
+   *     release.
+   */
+  public void setStayAwake(boolean stayAwake) {
+    this.stayAwake = stayAwake;
+    updateWifiLock();
+  }
+
+  private void updateWifiLock() {
+    if (wifiLock == null) {
+      return;
+    }
+
+    if (enabled && stayAwake) {
+      if (!wifiLock.isHeld()) {
+        wifiLock.acquire();
+      }
+    } else if (wifiLock.isHeld()) {
+      wifiLock.release();
+    }
+  }
+}

From b8e6e98430917cd6c10b44810262bd7311aab958 Mon Sep 17 00:00:00 2001
From: samrobinson <samrobinson@google.com>
Date: Mon, 9 Mar 2020 13:47:01 +0000
Subject: [PATCH 46/59] Simplify `WakeLockManager` and `WifiLockManager` logic.

Disabling reference counting allows some checks to be removed.

This is a no-op.

PiperOrigin-RevId: 299829600
---
 .../com/google/android/exoplayer2/WakeLockManager.java     | 7 +++----
 .../com/google/android/exoplayer2/WifiLockManager.java     | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java b/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java
index bd385b0849d..6de302d62d6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java
@@ -61,6 +61,7 @@ public void setEnabled(boolean enabled) {
           return;
         }
         wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKE_LOCK_TAG);
+        wakeLock.setReferenceCounted(false);
       }
     }
 
@@ -92,10 +93,8 @@ private void updateWakeLock() {
     }
 
     if (enabled && stayAwake) {
-      if (!wakeLock.isHeld()) {
-        wakeLock.acquire();
-      }
-    } else if (wakeLock.isHeld()) {
+      wakeLock.acquire();
+    } else {
       wakeLock.release();
     }
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/WifiLockManager.java b/library/core/src/main/java/com/google/android/exoplayer2/WifiLockManager.java
index f37ec6ab8b8..d3700a646ac 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/WifiLockManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/WifiLockManager.java
@@ -59,6 +59,7 @@ public void setEnabled(boolean enabled) {
         return;
       }
       wifiLock = wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, WIFI_LOCK_TAG);
+      wifiLock.setReferenceCounted(false);
     }
 
     this.enabled = enabled;
@@ -85,10 +86,8 @@ private void updateWifiLock() {
     }
 
     if (enabled && stayAwake) {
-      if (!wifiLock.isHeld()) {
-        wifiLock.acquire();
-      }
-    } else if (wifiLock.isHeld()) {
+      wifiLock.acquire();
+    } else {
       wifiLock.release();
     }
   }

From f14c028078d8b2aa62cf8d5b3a45d398869193b5 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 3 Apr 2020 22:57:06 +0100
Subject: [PATCH 47/59] Fix dump files for release

---
 .../assets/ts/sample_with_id3.adts.0.dump     | 48 ++++++++++++++++---
 .../sample_with_id3.adts.unknown_length.dump  | 48 ++++++++++++++++---
 2 files changed, 82 insertions(+), 14 deletions(-)

diff --git a/library/core/src/test/assets/ts/sample_with_id3.adts.0.dump b/library/core/src/test/assets/ts/sample_with_id3.adts.0.dump
index 1f5d510b2e7..b9cde05d69f 100644
--- a/library/core/src/test/assets/ts/sample_with_id3.adts.0.dump
+++ b/library/core/src/test/assets/ts/sample_with_id3.adts.0.dump
@@ -4,16 +4,31 @@ seekMap:
   getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 2
 track 0:
-  total output bytes = 30797
-  sample count = 144
-  format 0:
+  format:
+    bitrate = -1
     id = 0
+    containerMimeType = null
     sampleMimeType = audio/mp4a-latm
-    codecs = mp4a.40.2
+    maxInputSize = -1
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
     channelCount = 1
     sampleRate = 44100
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = null
+    drmInitData = -
+    metadata = null
     initializationData:
       data = length 2, hash 5F7
+  total output bytes = 30797
+  sample count = 144
   sample 0:
     time = 0
     flags = 1
@@ -591,11 +606,30 @@ track 0:
     flags = 1
     data = length 174, hash 2B69C34E
 track 1:
-  total output bytes = 141
-  sample count = 2
-  format 0:
+  format:
+    bitrate = -1
     id = 1
+    containerMimeType = null
     sampleMimeType = application/id3
+    maxInputSize = -1
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = -1
+    sampleRate = -1
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = null
+    drmInitData = -
+    metadata = null
+    initializationData:
+  total output bytes = 141
+  sample count = 2
   sample 0:
     time = 0
     flags = 1
diff --git a/library/core/src/test/assets/ts/sample_with_id3.adts.unknown_length.dump b/library/core/src/test/assets/ts/sample_with_id3.adts.unknown_length.dump
index 1f5d510b2e7..b9cde05d69f 100644
--- a/library/core/src/test/assets/ts/sample_with_id3.adts.unknown_length.dump
+++ b/library/core/src/test/assets/ts/sample_with_id3.adts.unknown_length.dump
@@ -4,16 +4,31 @@ seekMap:
   getPosition(0) = [[timeUs=0, position=0]]
 numberOfTracks = 2
 track 0:
-  total output bytes = 30797
-  sample count = 144
-  format 0:
+  format:
+    bitrate = -1
     id = 0
+    containerMimeType = null
     sampleMimeType = audio/mp4a-latm
-    codecs = mp4a.40.2
+    maxInputSize = -1
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
     channelCount = 1
     sampleRate = 44100
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = null
+    drmInitData = -
+    metadata = null
     initializationData:
       data = length 2, hash 5F7
+  total output bytes = 30797
+  sample count = 144
   sample 0:
     time = 0
     flags = 1
@@ -591,11 +606,30 @@ track 0:
     flags = 1
     data = length 174, hash 2B69C34E
 track 1:
-  total output bytes = 141
-  sample count = 2
-  format 0:
+  format:
+    bitrate = -1
     id = 1
+    containerMimeType = null
     sampleMimeType = application/id3
+    maxInputSize = -1
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = -1
+    sampleRate = -1
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = null
+    drmInitData = -
+    metadata = null
+    initializationData:
+  total output bytes = 141
+  sample count = 2
   sample 0:
     time = 0
     flags = 1

From 29118f45869d1f9e61122943c4e06c9a0a8d7cb1 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Sat, 4 Apr 2020 00:21:20 +0100
Subject: [PATCH 48/59] Tweak release note

---
 RELEASENOTES.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ce0c9c5eb11..8b0ffde27e7 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,8 +2,11 @@
 
 ### 2.11.4 (2020-04-08) ###
 
-* Add optional automatic `WifiLock` handling to `SimpleExoPlayer`
-  ([#6914](https://github.com/google/ExoPlayer/issues/6914)).
+* Add `SimpleExoPlayer.setWakeMode` to allow automatic `WifiLock` and `WakeLock`
+  handling ([#6914](https://github.com/google/ExoPlayer/issues/6914)). To use
+  this feature, you must add the
+  [WAKE_LOCK](https://developer.android.com/reference/android/Manifest.permission.html#WAKE_LOCK)
+  permission to your application's manifest file.
 * Text:
   * Catch and log exceptions in `TextRenderer` rather than re-throwing. This
     allows playback to continue even if subtitle decoding fails

From d4d7907193385efae1f48e980b1f14c38c217283 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 7 Apr 2020 13:43:28 +0100
Subject: [PATCH 49/59] Revert "Remove duplicate SCTE-35 format and add sample
 to TsExtractorTest"

This reverts commit 8591e69b6a40162ffc801a1569549ca826606cc5.
---
 .../exoplayer2/extractor/ts/SpliceInfoSectionReader.java        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java
index ab674396076..27838d4c257 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java
@@ -38,6 +38,8 @@ public void init(TimestampAdjuster timestampAdjuster, ExtractorOutput extractorO
     this.timestampAdjuster = timestampAdjuster;
     idGenerator.generateNewId();
     output = extractorOutput.track(idGenerator.getTrackId(), C.TRACK_TYPE_METADATA);
+    output.format(Format.createSampleFormat(idGenerator.getFormatId(), MimeTypes.APPLICATION_SCTE35,
+        null, Format.NO_VALUE, null));
   }
 
   @Override

From 07cbfb65e576e09805cec1b2dc0051ba6c0d0bc2 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 6 Apr 2020 19:46:21 +0100
Subject: [PATCH 50/59] Fix stuck ad playbacks with DRM-protected content

When ClippingMediaPeriod first tried to read a buffer, if its end
position was before the end of the stream and it was buffered to its end
position, it would sometimes erroneously signal end-of-stream for
protected content because the sample queue might be waiting for DRM keys
at this point.

Work around the issue temporarily by signaling this specific case back
to ClippingMediaPeriod via the DecoderInputBuffer.

There will likely be a cleaner fix as a result of adding support for
dynamic clip end points in the future, at which point this can be
reverted.

issue:#7188
PiperOrigin-RevId: 305081757
---
 RELEASENOTES.md                               | 116 +++++++++---------
 .../decoder/DecoderInputBuffer.java           |   9 ++
 .../source/ClippingMediaPeriod.java           |   3 +-
 .../exoplayer2/source/SampleQueue.java        |   3 +-
 .../exoplayer2/source/SampleQueueTest.java    |   2 +
 5 files changed, 74 insertions(+), 59 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 8b0ffde27e7..b8074b8c86d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -25,6 +25,8 @@
     ([#7129](https://github.com/google/ExoPlayer/issues/7129)).
   * Fix playback of ADTS files with mid-stream ID3 metadata.
 * DRM:
+  * Fix stuck ad playbacks with DRM protected content
+    ([#7188](https://github.com/google/ExoPlayer/issues/7188)).
   * Fix playback of Widevine protected content that only provides V1 PSSH atoms
     on API levels 21 and 22.
   * Fix playback of PlayReady content on Fire TV Stick (Gen 2).
@@ -51,63 +53,63 @@
 
 ### 2.11.2 (2020-02-13) ###
 
-* Add Java FLAC extractor
-  ([#6406](https://github.com/google/ExoPlayer/issues/6406)).
-* Startup latency optimization:
-  * Reduce startup latency for DASH and SmoothStreaming playbacks by allowing
-    codec initialization to occur before the network connection for the first
-    media segment has been established.
-  * Reduce startup latency for on-demand DASH playbacks by allowing codec
-    initialization to occur before the sidx box has been loaded.
-* Downloads:
-  * Fix download resumption when the requirements for them to continue are
-    met ([#6733](https://github.com/google/ExoPlayer/issues/6733),
-    [#6798](https://github.com/google/ExoPlayer/issues/6798)).
-  * Fix `DownloadHelper.createMediaSource` to use `customCacheKey` when creating
-    `ProgressiveMediaSource` instances.
-* DRM: Fix `NullPointerException` when playing DRM-protected content
-  ([#6951](https://github.com/google/ExoPlayer/issues/6951)).
-* Metadata:
-  * Update `IcyDecoder` to try ISO-8859-1 decoding if UTF-8 decoding fails.
-    Also change `IcyInfo.rawMetadata` from `String` to `byte[]` to allow
-    developers to handle data that's neither UTF-8 nor ISO-8859-1
-    ([#6753](https://github.com/google/ExoPlayer/issues/6753)).
-  * Select multiple metadata tracks if multiple metadata renderers are available
-    ([#6676](https://github.com/google/ExoPlayer/issues/6676)).
-  * Add support for ID3 genres added in Wimamp 5.6 (2010).
-* UI:
-  * Show ad group markers in `DefaultTimeBar` even if they are after the end
-    of the current window
-    ([#6552](https://github.com/google/ExoPlayer/issues/6552)).
-  * Don't use notification chronometer if playback speed is != 1.0
-    ([#6816](https://github.com/google/ExoPlayer/issues/6816)).
-* HLS: Fix playback of DRM protected content that uses key rotation
-  ([#6903](https://github.com/google/ExoPlayer/issues/6903)).
-* WAV:
-  * Support IMA ADPCM encoded data.
-  * Improve support for G.711 A-law and mu-law encoded data.
-* MP4: Support "twos" codec (big endian PCM)
-  ([#5789](https://github.com/google/ExoPlayer/issues/5789)).
-* FMP4: Add support for encrypted AC-4 tracks.
-* HLS: Fix slow seeking into long MP3 segments
-  ([#6155](https://github.com/google/ExoPlayer/issues/6155)).
-* Fix handling of E-AC-3 streams that contain AC-3 syncframes
-  ([#6602](https://github.com/google/ExoPlayer/issues/6602)).
-* Fix playback of TrueHD streams in Matroska
-  ([#6845](https://github.com/google/ExoPlayer/issues/6845)).
-* Fix MKV subtitles to disappear when intended instead of lasting until the
-  next cue ([#6833](https://github.com/google/ExoPlayer/issues/6833)).
-* OkHttp extension: Upgrade OkHttp dependency to 3.12.8, which fixes a class of
-  `SocketTimeoutException` issues when using HTTP/2
-  ([#4078](https://github.com/google/ExoPlayer/issues/4078)).
-* FLAC extension: Fix handling of bit depths other than 16 in `FLACDecoder`.
-  This issue caused FLAC streams with other bit depths to sound like white noise
-  on earlier releases, but only when embedded in a non-FLAC container such as
-  Matroska or MP4.
-* Demo apps: Add
-  [GL demo app](https://github.com/google/ExoPlayer/tree/dev-v2/demos/gl) to
-  show how to render video to a `GLSurfaceView` while applying a GL shader.
-  ([#6920](https://github.com/google/ExoPlayer/issues/6920)).
+*   Add Java FLAC extractor
+    ([#6406](https://github.com/google/ExoPlayer/issues/6406)).
+*   Startup latency optimization:
+    *   Reduce startup latency for DASH and SmoothStreaming playbacks by
+        allowing codec initialization to occur before the network connection for
+        the first media segment has been established.
+    *   Reduce startup latency for on-demand DASH playbacks by allowing codec
+        initialization to occur before the sidx box has been loaded.
+*   Downloads:
+    *   Fix download resumption when the requirements for them to continue are
+        met ([#6733](https://github.com/google/ExoPlayer/issues/6733),
+        [#6798](https://github.com/google/ExoPlayer/issues/6798)).
+    *   Fix `DownloadHelper.createMediaSource` to use `customCacheKey` when
+        creating `ProgressiveMediaSource` instances.
+*   DRM: Fix `NullPointerException` when playing DRM protected content
+    ([#6951](https://github.com/google/ExoPlayer/issues/6951)).
+*   Metadata:
+    *   Update `IcyDecoder` to try ISO-8859-1 decoding if UTF-8 decoding fails.
+        Also change `IcyInfo.rawMetadata` from `String` to `byte[]` to allow
+        developers to handle data that's neither UTF-8 nor ISO-8859-1
+        ([#6753](https://github.com/google/ExoPlayer/issues/6753)).
+    *   Select multiple metadata tracks if multiple metadata renderers are
+        available ([#6676](https://github.com/google/ExoPlayer/issues/6676)).
+    *   Add support for ID3 genres added in Wimamp 5.6 (2010).
+*   UI:
+    *   Show ad group markers in `DefaultTimeBar` even if they are after the end
+        of the current window
+        ([#6552](https://github.com/google/ExoPlayer/issues/6552)).
+    *   Don't use notification chronometer if playback speed is != 1.0
+        ([#6816](https://github.com/google/ExoPlayer/issues/6816)).
+*   HLS: Fix playback of DRM protected content that uses key rotation
+    ([#6903](https://github.com/google/ExoPlayer/issues/6903)).
+*   WAV:
+    *   Support IMA ADPCM encoded data.
+    *   Improve support for G.711 A-law and mu-law encoded data.
+*   MP4: Support "twos" codec (big endian PCM)
+    ([#5789](https://github.com/google/ExoPlayer/issues/5789)).
+*   FMP4: Add support for encrypted AC-4 tracks.
+*   HLS: Fix slow seeking into long MP3 segments
+    ([#6155](https://github.com/google/ExoPlayer/issues/6155)).
+*   Fix handling of E-AC-3 streams that contain AC-3 syncframes
+    ([#6602](https://github.com/google/ExoPlayer/issues/6602)).
+*   Fix playback of TrueHD streams in Matroska
+    ([#6845](https://github.com/google/ExoPlayer/issues/6845)).
+*   Fix MKV subtitles to disappear when intended instead of lasting until the
+    next cue ([#6833](https://github.com/google/ExoPlayer/issues/6833)).
+*   OkHttp extension: Upgrade OkHttp dependency to 3.12.8, which fixes a class
+    of `SocketTimeoutException` issues when using HTTP/2
+    ([#4078](https://github.com/google/ExoPlayer/issues/4078)).
+*   FLAC extension: Fix handling of bit depths other than 16 in `FLACDecoder`.
+    This issue caused FLAC streams with other bit depths to sound like white
+    noise on earlier releases, but only when embedded in a non-FLAC container
+    such as Matroska or MP4.
+*   Demo apps: Add
+    [GL demo app](https://github.com/google/ExoPlayer/tree/dev-v2/demos/gl) to
+    show how to render video to a `GLSurfaceView` while applying a GL shader.
+    ([#6920](https://github.com/google/ExoPlayer/issues/6920)).
 
 ### 2.11.1 (2019-12-20) ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
index 31dfa8f0202..bd5df4c8b12 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
@@ -63,6 +63,14 @@ public class DecoderInputBuffer extends Buffer {
   /** The buffer's data, or {@code null} if no data has been set. */
   @Nullable public ByteBuffer data;
 
+  // TODO: Remove this temporary signaling once end-of-stream propagation for clips using content
+  // protection is fixed. See [Internal: b/153326944] for details.
+  /**
+   * Whether the last attempt to read a sample into this buffer failed due to not yet having the DRM
+   * keys associated with the next sample.
+   */
+  public boolean waitingForKeys;
+
   /**
    * The time at which the sample should be presented.
    */
@@ -183,6 +191,7 @@ public void clear() {
     if (supplementalData != null) {
       supplementalData.clear();
     }
+    waitingForKeys = false;
   }
 
   private ByteBuffer createReplacementByteBuffer(int requiredCapacity) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java
index 8aafb9a0e5a..4385a41ff32 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java
@@ -324,7 +324,8 @@ public int readData(FormatHolder formatHolder, DecoderInputBuffer buffer,
       if (endUs != C.TIME_END_OF_SOURCE
           && ((result == C.RESULT_BUFFER_READ && buffer.timeUs >= endUs)
               || (result == C.RESULT_NOTHING_READ
-                  && getBufferedPositionUs() == C.TIME_END_OF_SOURCE))) {
+                  && getBufferedPositionUs() == C.TIME_END_OF_SOURCE
+                  && !buffer.waitingForKeys))) {
         buffer.clear();
         buffer.setFlags(C.BUFFER_FLAG_END_OF_STREAM);
         sentEos = true;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
index d4e447bc611..b5cfe6ed72e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
@@ -539,7 +539,7 @@ private synchronized int readSampleMetadata(
       boolean loadingFinished,
       long decodeOnlyUntilUs,
       SampleExtrasHolder extrasHolder) {
-
+    buffer.waitingForKeys = false;
     // This is a temporary fix for https://github.com/google/ExoPlayer/issues/6155.
     // TODO: Remove it and replace it with a fix that discards samples when writing to the queue.
     boolean hasNextSample;
@@ -573,6 +573,7 @@ private synchronized int readSampleMetadata(
     }
 
     if (!mayReadSample(relativeReadIndex)) {
+      buffer.waitingForKeys = true;
       return C.RESULT_NOTHING_READ;
     }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
index 427e81d29fb..a34488d2e79 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
@@ -372,8 +372,10 @@ public void testReadEncryptedSectionsWaitsForKeys() {
 
     assertReadFormat(/* formatRequired= */ false, FORMAT_ENCRYPTED);
     assertReadNothing(/* formatRequired= */ false);
+    assertThat(inputBuffer.waitingForKeys).isTrue();
     when(mockDrmSession.getState()).thenReturn(DrmSession.STATE_OPENED_WITH_KEYS);
     assertReadEncryptedSample(/* sampleIndex= */ 0);
+    assertThat(inputBuffer.waitingForKeys).isFalse();
   }
 
   @Test

From 3c0e617837d84cf7647db37afdbc0c2b9d47af65 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 9 Mar 2020 13:14:02 +0000
Subject: [PATCH 51/59] Merge AudioFocusManager methods to simplify control
 flow.

handlePrepare/Stop/SetPlayReady can be merged together as they all
handle changes to the desires state of the player.

Also, simplify parts of the control flow by not mixing code that
determines if audio focus needs to be handled with code that actually
acquires or abandons the focus.

PiperOrigin-RevId: 299824857
---
 .../android/exoplayer2/AudioFocusManager.java |  89 ++---
 .../android/exoplayer2/SimpleExoPlayer.java   |  14 +-
 .../exoplayer2/AudioFocusManagerTest.java     | 320 ++++++++----------
 3 files changed, 172 insertions(+), 251 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java b/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java
index c9aa9e54a84..86ed841f1a6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java
@@ -24,7 +24,6 @@
 import androidx.annotation.RequiresApi;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.audio.AudioAttributes;
-import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
@@ -134,64 +133,38 @@ public float getVolumeMultiplier() {
   /**
    * Sets audio attributes that should be used to manage audio focus.
    *
+   * <p>Call {@link #updateAudioFocus(boolean, int)} to update the audio focus based on these
+   * attributes.
+   *
    * @param audioAttributes The audio attributes or {@code null} if audio focus should not be
    *     managed automatically.
-   * @param playWhenReady The current state of {@link ExoPlayer#getPlayWhenReady()}.
-   * @param playerState The current player state; {@link ExoPlayer#getPlaybackState()}.
-   * @return A {@link PlayerCommand} to execute on the player.
    */
-  @PlayerCommand
-  public int setAudioAttributes(
-      @Nullable AudioAttributes audioAttributes, boolean playWhenReady, int playerState) {
+  public void setAudioAttributes(@Nullable AudioAttributes audioAttributes) {
     if (!Util.areEqual(this.audioAttributes, audioAttributes)) {
       this.audioAttributes = audioAttributes;
       focusGain = convertAudioAttributesToFocusGain(audioAttributes);
-
       Assertions.checkArgument(
           focusGain == C.AUDIOFOCUS_GAIN || focusGain == C.AUDIOFOCUS_NONE,
           "Automatic handling of audio focus is only available for USAGE_MEDIA and USAGE_GAME.");
-      if (playWhenReady
-          && (playerState == Player.STATE_BUFFERING || playerState == Player.STATE_READY)) {
-        return requestAudioFocus();
-      }
     }
-
-    return playerState == Player.STATE_IDLE
-        ? handleIdle(playWhenReady)
-        : handlePrepare(playWhenReady);
   }
 
   /**
-   * Called by a player as part of {@link ExoPlayer#prepare(MediaSource, boolean, boolean)}.
-   *
-   * @param playWhenReady The current state of {@link ExoPlayer#getPlayWhenReady()}.
-   * @return A {@link PlayerCommand} to execute on the player.
-   */
-  @PlayerCommand
-  public int handlePrepare(boolean playWhenReady) {
-    return playWhenReady ? requestAudioFocus() : PLAYER_COMMAND_DO_NOT_PLAY;
-  }
-
-  /**
-   * Called by the player as part of {@link ExoPlayer#setPlayWhenReady(boolean)}.
+   * Called by the player to abandon or request audio focus based on the desired player state.
    *
    * @param playWhenReady The desired value of playWhenReady.
-   * @param playerState The current state of the player.
+   * @param playbackState The desired playback state.
    * @return A {@link PlayerCommand} to execute on the player.
    */
   @PlayerCommand
-  public int handleSetPlayWhenReady(boolean playWhenReady, int playerState) {
-    if (!playWhenReady) {
-      abandonAudioFocus();
-      return PLAYER_COMMAND_DO_NOT_PLAY;
+  public int updateAudioFocus(boolean playWhenReady, @Player.State int playbackState) {
+    if (!shouldHandleAudioFocus(playbackState)) {
+      if (audioFocusState != AUDIO_FOCUS_STATE_NO_FOCUS) {
+        abandonAudioFocus();
+      }
+      return playWhenReady ? PLAYER_COMMAND_PLAY_WHEN_READY : PLAYER_COMMAND_DO_NOT_PLAY;
     }
-
-    return playerState == Player.STATE_IDLE ? handleIdle(playWhenReady) : requestAudioFocus();
-  }
-
-  /** Called by the player as part of {@link ExoPlayer#stop(boolean)}. */
-  public void handleStop() {
-    abandonAudioFocus(/* forceAbandon= */ true);
+    return playWhenReady ? requestAudioFocus() : PLAYER_COMMAND_DO_NOT_PLAY;
   }
 
   // Internal methods.
@@ -201,22 +174,14 @@ public void handleStop() {
     return focusListener;
   }
 
-  @PlayerCommand
-  private int handleIdle(boolean playWhenReady) {
-    return playWhenReady ? PLAYER_COMMAND_PLAY_WHEN_READY : PLAYER_COMMAND_DO_NOT_PLAY;
+  private boolean shouldHandleAudioFocus(@Player.State int playbackState) {
+    return playbackState != Player.STATE_IDLE && focusGain == C.AUDIOFOCUS_GAIN;
   }
 
   @PlayerCommand
   private int requestAudioFocus() {
     int focusRequestResult;
 
-    if (focusGain == C.AUDIOFOCUS_NONE) {
-      if (audioFocusState != AUDIO_FOCUS_STATE_NO_FOCUS) {
-        abandonAudioFocus(/* forceAbandon= */ true);
-      }
-      return PLAYER_COMMAND_PLAY_WHEN_READY;
-    }
-
     if (audioFocusState == AUDIO_FOCUS_STATE_NO_FOCUS) {
       if (Util.SDK_INT >= 26) {
         focusRequestResult = requestAudioFocusV26();
@@ -239,24 +204,15 @@ private int requestAudioFocus() {
   }
 
   private void abandonAudioFocus() {
-    abandonAudioFocus(/* forceAbandon= */ false);
-  }
-
-  private void abandonAudioFocus(boolean forceAbandon) {
-    if (focusGain == C.AUDIOFOCUS_NONE && audioFocusState == AUDIO_FOCUS_STATE_NO_FOCUS) {
+    if (audioFocusState == AUDIO_FOCUS_STATE_NO_FOCUS) {
       return;
     }
-
-    if (focusGain != C.AUDIOFOCUS_GAIN
-        || audioFocusState == AUDIO_FOCUS_STATE_LOST_FOCUS
-        || forceAbandon) {
-      if (Util.SDK_INT >= 26) {
-        abandonAudioFocusV26();
-      } else {
-        abandonAudioFocusDefault();
-      }
-      audioFocusState = AUDIO_FOCUS_STATE_NO_FOCUS;
+    if (Util.SDK_INT >= 26) {
+      abandonAudioFocusV26();
+    } else {
+      abandonAudioFocusDefault();
     }
+    audioFocusState = AUDIO_FOCUS_STATE_NO_FOCUS;
   }
 
   private int requestAudioFocusDefault() {
@@ -312,7 +268,6 @@ private boolean willPauseWhenDucked() {
    */
   @C.AudioFocusGain
   private static int convertAudioAttributesToFocusGain(@Nullable AudioAttributes audioAttributes) {
-
     if (audioAttributes == null) {
       // Don't handle audio focus. It may be either video only contents or developers
       // want to have more finer grained control. (e.g. adding audio focus listener)
@@ -414,7 +369,7 @@ private void handleAudioFocusChange(int focusChange) {
         break;
       case AUDIO_FOCUS_STATE_LOST_FOCUS:
         playerControl.executePlayerCommand(PLAYER_COMMAND_DO_NOT_PLAY);
-        abandonAudioFocus(/* forceAbandon= */ true);
+        abandonAudioFocus();
         break;
       case AUDIO_FOCUS_STATE_LOSS_TRANSIENT:
         playerControl.executePlayerCommand(PLAYER_COMMAND_WAIT_FOR_CALLBACK);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index a3c82d68cf4..ba26dfd97a8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -686,10 +686,10 @@ public void setAudioAttributes(AudioAttributes audioAttributes, boolean handleAu
       }
     }
 
+    audioFocusManager.setAudioAttributes(handleAudioFocus ? audioAttributes : null);
+    boolean playWhenReady = getPlayWhenReady();
     @AudioFocusManager.PlayerCommand
-    int playerCommand =
-        audioFocusManager.setAudioAttributes(
-            handleAudioFocus ? audioAttributes : null, getPlayWhenReady(), getPlaybackState());
+    int playerCommand = audioFocusManager.updateAudioFocus(playWhenReady, getPlaybackState());
     updatePlayWhenReady(getPlayWhenReady(), playerCommand);
   }
 
@@ -1190,7 +1190,7 @@ public void prepare(MediaSource mediaSource, boolean resetPosition, boolean rese
     this.mediaSource = mediaSource;
     mediaSource.addEventListener(eventHandler, analyticsCollector);
     @AudioFocusManager.PlayerCommand
-    int playerCommand = audioFocusManager.handlePrepare(getPlayWhenReady());
+    int playerCommand = audioFocusManager.updateAudioFocus(getPlayWhenReady(), Player.STATE_BUFFERING);
     updatePlayWhenReady(getPlayWhenReady(), playerCommand);
     player.prepare(mediaSource, resetPosition, resetState);
   }
@@ -1199,7 +1199,7 @@ public void prepare(MediaSource mediaSource, boolean resetPosition, boolean rese
   public void setPlayWhenReady(boolean playWhenReady) {
     verifyApplicationThread();
     @AudioFocusManager.PlayerCommand
-    int playerCommand = audioFocusManager.handleSetPlayWhenReady(playWhenReady, getPlaybackState());
+    int playerCommand = audioFocusManager.updateAudioFocus(playWhenReady, getPlaybackState());
     updatePlayWhenReady(playWhenReady, playerCommand);
   }
 
@@ -1278,6 +1278,7 @@ public void setForegroundMode(boolean foregroundMode) {
   @Override
   public void stop(boolean reset) {
     verifyApplicationThread();
+    audioFocusManager.updateAudioFocus(getPlayWhenReady(), Player.STATE_IDLE);
     player.stop(reset);
     if (mediaSource != null) {
       mediaSource.removeEventListener(analyticsCollector);
@@ -1286,7 +1287,6 @@ public void stop(boolean reset) {
         mediaSource = null;
       }
     }
-    audioFocusManager.handleStop();
     currentCues = Collections.emptyList();
   }
 
@@ -1294,7 +1294,7 @@ public void stop(boolean reset) {
   public void release() {
     verifyApplicationThread();
     audioBecomingNoisyManager.setEnabled(false);
-    audioFocusManager.handleStop();
+    audioFocusManager.updateAudioFocus(/* playWhenReady= */ false, Player.STATE_IDLE);
     wakeLockManager.setStayAwake(false);
     wifiLockManager.setStayAwake(false);
     player.release();
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java
index 9a44d6def65..5509d3ba0a7 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java
@@ -65,13 +65,11 @@ public void setUp() {
   @Test
   public void setAudioAttributes_withNullUsage_doesNotManageAudioFocus() {
     // Ensure that NULL audio attributes -> don't manage audio focus
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                /* audioAttributes= */ null, /* playWhenReady= */ false, Player.STATE_IDLE))
+    audioFocusManager.setAudioAttributes(/* audioAttributes= */ null);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ false, Player.STATE_IDLE))
         .isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                /* audioAttributes= */ null, /* playWhenReady= */ true, Player.STATE_READY))
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
     ShadowAudioManager.AudioFocusRequest request =
         Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
@@ -85,18 +83,17 @@ public void setAudioAttributes_withNullUsage_releasesAudioFocus() {
     AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
     Shadows.shadowOf(audioManager)
         .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                media, /* playWhenReady= */ true, Player.STATE_READY))
+    audioFocusManager.setAudioAttributes(media);
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
     ShadowAudioManager.AudioFocusRequest request =
         Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
     assertThat(request.durationHint).isEqualTo(AudioManager.AUDIOFOCUS_GAIN);
 
     // Ensure that setting null audio attributes with audio focus releases audio focus.
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                /* audioAttributes= */ null, /* playWhenReady= */ true, Player.STATE_READY))
+    audioFocusManager.setAudioAttributes(/* audioAttributes= */ null);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
     AudioManager.OnAudioFocusChangeListener lastRequest =
         Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener();
@@ -110,18 +107,16 @@ public void setAudioAttributes_withNullUsage_releasesAudioFocus_v26() {
     AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
     Shadows.shadowOf(audioManager)
         .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                media, /* playWhenReady= */ true, Player.STATE_READY))
+    audioFocusManager.setAudioAttributes(media);
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
     ShadowAudioManager.AudioFocusRequest request =
         Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
     assertThat(getAudioFocusGainFromRequest(request)).isEqualTo(AudioManager.AUDIOFOCUS_GAIN);
 
     // Ensure that setting null audio attributes with audio focus releases audio focus.
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                /* audioAttributes= */ null, /* playWhenReady= */ true, Player.STATE_READY))
+    audioFocusManager.setAudioAttributes(/* audioAttributes= */ null);
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
     AudioFocusRequest lastRequest =
         Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest();
@@ -130,10 +125,10 @@ public void setAudioAttributes_withNullUsage_releasesAudioFocus_v26() {
 
   @Test
   public void setAudioAttributes_withUsageAlarm_throwsIllegalArgumentException() {
-    // Ensure that audio attributes that map to AUDIOFOCUS_GAIN_TRANSIENT* throw
+    // Ensure that audio attributes that map to AUDIOFOCUS_GAIN_TRANSIENT* throw.
     AudioAttributes alarm = new AudioAttributes.Builder().setUsage(C.USAGE_ALARM).build();
     try {
-      audioFocusManager.setAudioAttributes(alarm, /* playWhenReady= */ false, Player.STATE_IDLE);
+      audioFocusManager.setAudioAttributes(alarm);
       fail();
     } catch (IllegalArgumentException e) {
       // Expected
@@ -147,9 +142,9 @@ public void setAudioAttributes_withUsageMedia_usesAudioFocusGain() {
     Shadows.shadowOf(audioManager)
         .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
 
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                media, /* playWhenReady= */ true, Player.STATE_READY))
+    audioFocusManager.setAudioAttributes(media);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
     ShadowAudioManager.AudioFocusRequest request =
         Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
@@ -163,9 +158,9 @@ public void setAudioAttributes_inStateEnded_requestsAudioFocus() {
     Shadows.shadowOf(audioManager)
         .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
 
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                media, /* playWhenReady= */ true, Player.STATE_ENDED))
+    audioFocusManager.setAudioAttributes(media);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_ENDED))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
     ShadowAudioManager.AudioFocusRequest request =
         Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
@@ -173,42 +168,131 @@ public void setAudioAttributes_inStateEnded_requestsAudioFocus() {
   }
 
   @Test
-  public void handlePrepare_afterSetAudioAttributes_setsPlayerCommandPlayWhenReady() {
+  public void updateAudioFocusFromIdleToBuffering_setsPlayerCommandPlayWhenReady() {
     // Ensure that when playWhenReady is true while the player is IDLE, audio focus is only
-    // requested after calling handlePrepare.
+    // requested after calling prepare (= changing the state to BUFFERING).
     AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
-
     Shadows.shadowOf(audioManager)
         .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    audioFocusManager.setAudioAttributes(media);
 
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                media, /* playWhenReady= */ true, Player.STATE_IDLE))
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_IDLE))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
     assertThat(Shadows.shadowOf(audioManager).getLastAudioFocusRequest()).isNull();
-    assertThat(audioFocusManager.handlePrepare(/* playWhenReady= */ true))
+    assertThat(
+            audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_BUFFERING))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    ShadowAudioManager.AudioFocusRequest request =
+        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
+    assertThat(getAudioFocusGainFromRequest(request)).isEqualTo(AudioManager.AUDIOFOCUS_GAIN);
   }
 
   @Test
-  public void handleSetPlayWhenReady_afterSetAudioAttributes_setsPlayerCommandPlayWhenReady() {
+  public void updateAudioFocusFromPausedToPlaying_setsPlayerCommandPlayWhenReady() {
     // Ensure that audio focus is not requested until playWhenReady is true.
     AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
-
     Shadows.shadowOf(audioManager)
         .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    audioFocusManager.setAudioAttributes(media);
 
-    assertThat(audioFocusManager.handlePrepare(/* playWhenReady= */ false))
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ false, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
     assertThat(Shadows.shadowOf(audioManager).getLastAudioFocusRequest()).isNull();
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                media, /* playWhenReady= */ false, Player.STATE_READY))
-        .isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
-    assertThat(Shadows.shadowOf(audioManager).getLastAudioFocusRequest()).isNull();
-    assertThat(
-            audioFocusManager.handleSetPlayWhenReady(/* playWhenReady= */ true, Player.STATE_READY))
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    ShadowAudioManager.AudioFocusRequest request =
+        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
+    assertThat(getAudioFocusGainFromRequest(request)).isEqualTo(AudioManager.AUDIOFOCUS_GAIN);
+  }
+
+  @Test
+  @Config(maxSdk = 25)
+  public void updateAudioFocusFromReadyToIdle_abandonsAudioFocus() {
+    // Ensure that stopping the player (=changing state to idle) abandons audio focus.
+    AudioAttributes media =
+        new AudioAttributes.Builder()
+            .setUsage(C.USAGE_MEDIA)
+            .setContentType(C.CONTENT_TYPE_SPEECH)
+            .build();
+    Shadows.shadowOf(audioManager)
+        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    audioFocusManager.setAudioAttributes(media);
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener()).isNull();
+
+    ShadowAudioManager.AudioFocusRequest request =
+        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_IDLE))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener())
+        .isEqualTo(request.listener);
+  }
+
+  @Test
+  @Config(minSdk = 26, maxSdk = TARGET_SDK)
+  public void updateAudioFocusFromReadyToIdle_abandonsAudioFocus_v26() {
+    // Ensure that stopping the player (=changing state to idle) abandons audio focus.
+    AudioAttributes media =
+        new AudioAttributes.Builder()
+            .setUsage(C.USAGE_MEDIA)
+            .setContentType(C.CONTENT_TYPE_SPEECH)
+            .build();
+    Shadows.shadowOf(audioManager)
+        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    audioFocusManager.setAudioAttributes(media);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest()).isNull();
+
+    ShadowAudioManager.AudioFocusRequest request =
+        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_IDLE))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest())
+        .isEqualTo(request.audioFocusRequest);
+  }
+
+  @Test
+  @Config(maxSdk = 25)
+  public void updateAudioFocusFromReadyToIdle_withoutHandlingAudioFocus_isNoOp() {
+    // Ensure that changing state to idle is a no-op if audio focus isn't handled.
+    Shadows.shadowOf(audioManager)
+        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    audioFocusManager.setAudioAttributes(null);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ false, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
+    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener()).isNull();
+    ShadowAudioManager.AudioFocusRequest request =
+        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
+    assertThat(request).isNull();
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ false, Player.STATE_IDLE))
+        .isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
+    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener()).isNull();
+  }
+
+  @Test
+  @Config(minSdk = 26, maxSdk = TARGET_SDK)
+  public void updateAudioFocusFromReadyToIdle_withoutHandlingAudioFocus_isNoOp_v26() {
+    // Ensure that changing state to idle is a no-op if audio focus isn't handled.
+    Shadows.shadowOf(audioManager)
+        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    audioFocusManager.setAudioAttributes(null);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ false, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
+    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest()).isNull();
+    ShadowAudioManager.AudioFocusRequest request =
+        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
+    assertThat(request).isNull();
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ false, Player.STATE_IDLE))
+        .isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
+    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest()).isNull();
   }
 
   @Test
@@ -217,17 +301,17 @@ public void onAudioFocusChange_withDuckEnabled_volumeReducedAndRestored() {
     // AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK, and returns to the default value after focus is
     // regained.
     AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
-
     Shadows.shadowOf(audioManager)
         .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                media, /* playWhenReady= */ true, Player.STATE_READY))
+    audioFocusManager.setAudioAttributes(media);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
 
     audioFocusManager
         .getFocusListener()
         .onAudioFocusChange(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK);
+
     assertThat(testPlayerControl.lastVolumeMultiplier).isLessThan(1.0f);
     assertThat(testPlayerControl.lastPlayerCommand).isEqualTo(NO_COMMAND_RECEIVED);
     audioFocusManager.getFocusListener().onAudioFocusChange(AudioManager.AUDIOFOCUS_GAIN);
@@ -243,12 +327,11 @@ public void onAudioFocusChange_withPausedWhenDucked_sendsCommandWaitForCallback(
             .setUsage(C.USAGE_MEDIA)
             .setContentType(C.CONTENT_TYPE_SPEECH)
             .build();
-
     Shadows.shadowOf(audioManager)
         .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                media, /* playWhenReady= */ true, Player.STATE_READY))
+    audioFocusManager.setAudioAttributes(media);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
 
     audioFocusManager
@@ -265,12 +348,11 @@ public void onAudioFocusChange_withTransientLost_sendsCommandWaitForCallback() {
     // Ensure that the player is commanded to pause when audio focus is lost with
     // AUDIOFOCUS_LOSS_TRANSIENT.
     AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
-
     Shadows.shadowOf(audioManager)
         .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                media, /* playWhenReady= */ true, Player.STATE_READY))
+    audioFocusManager.setAudioAttributes(media);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
 
     audioFocusManager.getFocusListener().onAudioFocusChange(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT);
@@ -288,12 +370,11 @@ public void onAudioFocusChange_withAudioFocusLost_sendsDoNotPlayAndAbandondsFocu
             .setUsage(C.USAGE_MEDIA)
             .setContentType(C.CONTENT_TYPE_SPEECH)
             .build();
-
     Shadows.shadowOf(audioManager)
         .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                media, /* playWhenReady= */ true, Player.STATE_READY))
+    audioFocusManager.setAudioAttributes(media);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
     assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener()).isNull();
 
@@ -315,12 +396,11 @@ public void onAudioFocusChange_withAudioFocusLost_sendsDoNotPlayAndAbandondsFocu
             .setUsage(C.USAGE_MEDIA)
             .setContentType(C.CONTENT_TYPE_SPEECH)
             .build();
-
     Shadows.shadowOf(audioManager)
         .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                media, /* playWhenReady= */ true, Player.STATE_READY))
+    audioFocusManager.setAudioAttributes(media);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
     assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest()).isNull();
 
@@ -330,120 +410,6 @@ public void onAudioFocusChange_withAudioFocusLost_sendsDoNotPlayAndAbandondsFocu
         .isEqualTo(Shadows.shadowOf(audioManager).getLastAudioFocusRequest().audioFocusRequest);
   }
 
-  @Test
-  @Config(maxSdk = 25)
-  public void handleStop_withAudioFocus_abandonsAudioFocus() {
-    // Ensure that handleStop causes AudioFocusManager to abandon audio focus.
-    AudioAttributes media =
-        new AudioAttributes.Builder()
-            .setUsage(C.USAGE_MEDIA)
-            .setContentType(C.CONTENT_TYPE_SPEECH)
-            .build();
-
-    Shadows.shadowOf(audioManager)
-        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                media, /* playWhenReady= */ true, Player.STATE_READY))
-        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
-    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener()).isNull();
-
-    ShadowAudioManager.AudioFocusRequest request =
-        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
-    audioFocusManager.handleStop();
-    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener())
-        .isEqualTo(request.listener);
-  }
-
-  @Test
-  @Config(minSdk = 26, maxSdk = TARGET_SDK)
-  public void handleStop_withAudioFocus_abandonsAudioFocus_v26() {
-    // Ensure that handleStop causes AudioFocusManager to abandon audio focus.
-    AudioAttributes media =
-        new AudioAttributes.Builder()
-            .setUsage(C.USAGE_MEDIA)
-            .setContentType(C.CONTENT_TYPE_SPEECH)
-            .build();
-
-    Shadows.shadowOf(audioManager)
-        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                media, /* playWhenReady= */ true, Player.STATE_READY))
-        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
-    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest()).isNull();
-
-    ShadowAudioManager.AudioFocusRequest request =
-        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
-    audioFocusManager.handleStop();
-    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest())
-        .isEqualTo(request.audioFocusRequest);
-  }
-
-  @Test
-  @Config(maxSdk = 25)
-  public void handleStop_withoutAudioFocus_stillAbandonsFocus() {
-    // Ensure that handleStop causes AudioFocusManager to call through to abandon audio focus
-    // even if focus wasn't requested.
-    AudioAttributes media =
-        new AudioAttributes.Builder()
-            .setUsage(C.USAGE_MEDIA)
-            .setContentType(C.CONTENT_TYPE_SPEECH)
-            .build();
-
-    Shadows.shadowOf(audioManager)
-        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                media, /* playWhenReady= */ false, Player.STATE_READY))
-        .isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
-    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener()).isNull();
-    ShadowAudioManager.AudioFocusRequest request =
-        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
-    assertThat(request).isNull();
-
-    audioFocusManager.handleStop();
-    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener()).isNotNull();
-  }
-
-  @Test
-  @Config(maxSdk = 25)
-  public void handleStop_withoutHandlingAudioFocus_isNoOp() {
-    // Ensure that handleStop is a no-op if audio focus isn't handled.
-    Shadows.shadowOf(audioManager)
-        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                /* audioAttributes= */ null, /* playWhenReady= */ false, Player.STATE_READY))
-        .isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
-    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener()).isNull();
-    ShadowAudioManager.AudioFocusRequest request =
-        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
-    assertThat(request).isNull();
-
-    audioFocusManager.handleStop();
-    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusListener()).isNull();
-  }
-
-  @Test
-  @Config(minSdk = 26, maxSdk = TARGET_SDK)
-  public void handleStop_withoutHandlingAudioFocus_isNoOp_v26() {
-    // Ensure that handleStop is a no-op if audio focus isn't handled.
-    Shadows.shadowOf(audioManager)
-        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
-    assertThat(
-            audioFocusManager.setAudioAttributes(
-                /* audioAttributes= */ null, /* playWhenReady= */ false, Player.STATE_READY))
-        .isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
-    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest()).isNull();
-    ShadowAudioManager.AudioFocusRequest request =
-        Shadows.shadowOf(audioManager).getLastAudioFocusRequest();
-    assertThat(request).isNull();
-
-    audioFocusManager.handleStop();
-    assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest()).isNull();
-  }
-
   private int getAudioFocusGainFromRequest(ShadowAudioManager.AudioFocusRequest audioFocusRequest) {
     return Util.SDK_INT >= 26
         ? audioFocusRequest.audioFocusRequest.getFocusGain()

From cc29798d9b7dec65785c1a93a2a186352c92ff6f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 6 Apr 2020 21:47:12 +0100
Subject: [PATCH 52/59] Audio focus: Re-request audio focus if in a transient
 loss state

This avoids cases where audio focus is never successfully acquired
because another app is holding on to transient audio focus indefinitely.

Issue: #7182
PiperOrigin-RevId: 305108528
---
 RELEASENOTES.md                               |  3 ++
 .../exoplayer2/demo/PlayerActivity.java       |  2 +
 .../android/exoplayer2/AudioFocusManager.java | 40 +++++++------------
 .../exoplayer2/AudioFocusManagerTest.java     | 34 ++++++++++++----
 4 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b8074b8c86d..a90207c865a 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -14,6 +14,9 @@
   * Allow missing hours and milliseconds in SubRip (.srt) timecodes
     ([#7122](https://github.com/google/ExoPlayer/issues/7122)).
 * Audio:
+  * Prevent case where another app spuriously holding transient audio focus
+    could prevent ExoPlayer from acquiring audio focus for an indefinite period
+    of time ([#7182](https://github.com/google/ExoPlayer/issues/7182).
   * Workaround issue that could cause slower than realtime playback of AAC on
     Android 10 ([#6671](https://github.com/google/ExoPlayer/issues/6671).
   * Enable playback speed adjustment and silence skipping for floating point PCM
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
index c100c853e78..5a577449fa9 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
@@ -39,6 +39,7 @@
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.audio.AudioAttributes;
 import com.google.android.exoplayer2.demo.Sample.UriSample;
 import com.google.android.exoplayer2.drm.DefaultDrmSessionManager;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
@@ -380,6 +381,7 @@ private void initializePlayer() {
               .setTrackSelector(trackSelector)
               .build();
       player.addListener(new PlayerEventListener());
+      player.setAudioAttributes(AudioAttributes.DEFAULT, /* handleAudioFocus= */ true);
       player.setPlayWhenReady(startAutoPlay);
       player.addAnalyticsListener(new EventLogger(trackSelector));
       playerView.setPlayer(player);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java b/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java
index 86ed841f1a6..30da62b944f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java
@@ -158,10 +158,8 @@ public void setAudioAttributes(@Nullable AudioAttributes audioAttributes) {
    */
   @PlayerCommand
   public int updateAudioFocus(boolean playWhenReady, @Player.State int playbackState) {
-    if (!shouldHandleAudioFocus(playbackState)) {
-      if (audioFocusState != AUDIO_FOCUS_STATE_NO_FOCUS) {
-        abandonAudioFocus();
-      }
+    if (shouldAbandonAudioFocus(playbackState)) {
+      abandonAudioFocus();
       return playWhenReady ? PLAYER_COMMAND_PLAY_WHEN_READY : PLAYER_COMMAND_DO_NOT_PLAY;
     }
     return playWhenReady ? requestAudioFocus() : PLAYER_COMMAND_DO_NOT_PLAY;
@@ -174,33 +172,23 @@ public int updateAudioFocus(boolean playWhenReady, @Player.State int playbackSta
     return focusListener;
   }
 
-  private boolean shouldHandleAudioFocus(@Player.State int playbackState) {
-    return playbackState != Player.STATE_IDLE && focusGain == C.AUDIOFOCUS_GAIN;
+  private boolean shouldAbandonAudioFocus(@Player.State int playbackState) {
+    return playbackState == Player.STATE_IDLE || focusGain != C.AUDIOFOCUS_GAIN;
   }
 
   @PlayerCommand
   private int requestAudioFocus() {
-    int focusRequestResult;
-
-    if (audioFocusState == AUDIO_FOCUS_STATE_NO_FOCUS) {
-      if (Util.SDK_INT >= 26) {
-        focusRequestResult = requestAudioFocusV26();
-      } else {
-        focusRequestResult = requestAudioFocusDefault();
-      }
-      audioFocusState =
-          focusRequestResult == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
-              ? AUDIO_FOCUS_STATE_HAVE_FOCUS
-              : AUDIO_FOCUS_STATE_NO_FOCUS;
+    if (audioFocusState == AUDIO_FOCUS_STATE_HAVE_FOCUS) {
+      return PLAYER_COMMAND_PLAY_WHEN_READY;
     }
-
-    if (audioFocusState == AUDIO_FOCUS_STATE_NO_FOCUS) {
+    int requestResult = Util.SDK_INT >= 26 ? requestAudioFocusV26() : requestAudioFocusDefault();
+    if (requestResult == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+      audioFocusState = AUDIO_FOCUS_STATE_HAVE_FOCUS;
+      return PLAYER_COMMAND_PLAY_WHEN_READY;
+    } else {
+      audioFocusState = AUDIO_FOCUS_STATE_NO_FOCUS;
       return PLAYER_COMMAND_DO_NOT_PLAY;
     }
-
-    return audioFocusState == AUDIO_FOCUS_STATE_LOSS_TRANSIENT
-        ? PLAYER_COMMAND_WAIT_FOR_CALLBACK
-        : PLAYER_COMMAND_PLAY_WHEN_READY;
   }
 
   private void abandonAudioFocus() {
@@ -388,8 +376,8 @@ private void handleAudioFocusChange(int focusChange) {
         (audioFocusState == AUDIO_FOCUS_STATE_LOSS_TRANSIENT_DUCK)
             ? AudioFocusManager.VOLUME_MULTIPLIER_DUCK
             : AudioFocusManager.VOLUME_MULTIPLIER_DEFAULT;
-    if (AudioFocusManager.this.volumeMultiplier != volumeMultiplier) {
-      AudioFocusManager.this.volumeMultiplier = volumeMultiplier;
+    if (this.volumeMultiplier != volumeMultiplier) {
+      this.volumeMultiplier = volumeMultiplier;
       playerControl.setVolumeMultiplier(volumeMultiplier);
     }
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java
index 5509d3ba0a7..d5cf8890da6 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java
@@ -168,7 +168,7 @@ public void setAudioAttributes_inStateEnded_requestsAudioFocus() {
   }
 
   @Test
-  public void updateAudioFocusFromIdleToBuffering_setsPlayerCommandPlayWhenReady() {
+  public void updateAudioFocus_idleToBuffering_setsPlayerCommandPlayWhenReady() {
     // Ensure that when playWhenReady is true while the player is IDLE, audio focus is only
     // requested after calling prepare (= changing the state to BUFFERING).
     AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
@@ -188,17 +188,18 @@ public void updateAudioFocusFromIdleToBuffering_setsPlayerCommandPlayWhenReady()
   }
 
   @Test
-  public void updateAudioFocusFromPausedToPlaying_setsPlayerCommandPlayWhenReady() {
-    // Ensure that audio focus is not requested until playWhenReady is true.
+  public void updateAudioFocus_pausedToPlaying_setsPlayerCommandPlayWhenReady() {
     AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
     Shadows.shadowOf(audioManager)
         .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
     audioFocusManager.setAudioAttributes(media);
 
+    // Audio focus should not be requested yet, because playWhenReady=false.
     assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ false, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_DO_NOT_PLAY);
     assertThat(Shadows.shadowOf(audioManager).getLastAudioFocusRequest()).isNull();
 
+    // Audio focus should be requested now that playWhenReady=true.
     assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
     ShadowAudioManager.AudioFocusRequest request =
@@ -206,9 +207,28 @@ public void updateAudioFocusFromPausedToPlaying_setsPlayerCommandPlayWhenReady()
     assertThat(getAudioFocusGainFromRequest(request)).isEqualTo(AudioManager.AUDIOFOCUS_GAIN);
   }
 
+  // See https://github.com/google/ExoPlayer/issues/7182 for context.
+  @Test
+  public void updateAudioFocus_pausedToPlaying_withTransientLoss_setsPlayerCommandPlayWhenReady() {
+    AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
+    Shadows.shadowOf(audioManager)
+        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    audioFocusManager.setAudioAttributes(media);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+
+    // Simulate transient focus loss.
+    audioFocusManager.getFocusListener().onAudioFocusChange(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT);
+
+    // Focus should be re-requested, rather than staying in a state of transient focus loss.
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+  }
+
   @Test
   @Config(maxSdk = 25)
-  public void updateAudioFocusFromReadyToIdle_abandonsAudioFocus() {
+  public void updateAudioFocus_readyToIdle_abandonsAudioFocus() {
     // Ensure that stopping the player (=changing state to idle) abandons audio focus.
     AudioAttributes media =
         new AudioAttributes.Builder()
@@ -232,7 +252,7 @@ public void updateAudioFocusFromReadyToIdle_abandonsAudioFocus() {
 
   @Test
   @Config(minSdk = 26, maxSdk = TARGET_SDK)
-  public void updateAudioFocusFromReadyToIdle_abandonsAudioFocus_v26() {
+  public void updateAudioFocus_readyToIdle_abandonsAudioFocus_v26() {
     // Ensure that stopping the player (=changing state to idle) abandons audio focus.
     AudioAttributes media =
         new AudioAttributes.Builder()
@@ -257,7 +277,7 @@ public void updateAudioFocusFromReadyToIdle_abandonsAudioFocus_v26() {
 
   @Test
   @Config(maxSdk = 25)
-  public void updateAudioFocusFromReadyToIdle_withoutHandlingAudioFocus_isNoOp() {
+  public void updateAudioFocus_readyToIdle_withoutHandlingAudioFocus_isNoOp() {
     // Ensure that changing state to idle is a no-op if audio focus isn't handled.
     Shadows.shadowOf(audioManager)
         .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
@@ -277,7 +297,7 @@ public void updateAudioFocusFromReadyToIdle_withoutHandlingAudioFocus_isNoOp() {
 
   @Test
   @Config(minSdk = 26, maxSdk = TARGET_SDK)
-  public void updateAudioFocusFromReadyToIdle_withoutHandlingAudioFocus_isNoOp_v26() {
+  public void updateAudioFocus_readyToIdle_withoutHandlingAudioFocus_isNoOp_v26() {
     // Ensure that changing state to idle is a no-op if audio focus isn't handled.
     Shadows.shadowOf(audioManager)
         .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);

From 49858b82f24ea67373024c2ac71213ee44e2552b Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 7 Apr 2020 13:38:53 +0100
Subject: [PATCH 53/59] Merge pull request #7184 from
 TiVo:p-subtitle-format-from-codecs

PiperOrigin-RevId: 305137114
---
 RELEASENOTES.md                               |  2 +
 .../android/exoplayer2/util/MimeTypes.java    | 35 ++++++++++------
 .../exoplayer2/util/MimeTypesTest.java        |  4 ++
 .../hls/playlist/HlsPlaylistParser.java       | 40 ++++++++++++++-----
 .../playlist/HlsMasterPlaylistParserTest.java | 25 ++++++++++++
 5 files changed, 83 insertions(+), 23 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index a90207c865a..35868eca9c9 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -37,6 +37,8 @@
   * Update the manifest URI to avoid repeated HTTP redirects
     ([#6907](https://github.com/google/ExoPlayer/issues/6907)).
   * Parse period `AssetIdentifier` elements.
+* HLS: Recognize IMSC subtitles
+  ([#7185](https://github.com/google/ExoPlayer/issues/7185)).
 * UI: Add an option to set whether to use the orientation sensor for rotation
   in spherical playbacks
   ([#6761](https://github.com/google/ExoPlayer/issues/6761)).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
index e61ab837773..c3ca9257d63 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
@@ -122,22 +122,22 @@ public static void registerCustomMimeType(String mimeType, String codecPrefix, i
     customMimeTypes.add(customMimeType);
   }
 
-  /** Returns whether the given string is an audio mime type. */
+  /** Returns whether the given string is an audio MIME type. */
   public static boolean isAudio(@Nullable String mimeType) {
     return BASE_TYPE_AUDIO.equals(getTopLevelType(mimeType));
   }
 
-  /** Returns whether the given string is a video mime type. */
+  /** Returns whether the given string is a video MIME type. */
   public static boolean isVideo(@Nullable String mimeType) {
     return BASE_TYPE_VIDEO.equals(getTopLevelType(mimeType));
   }
 
-  /** Returns whether the given string is a text mime type. */
+  /** Returns whether the given string is a text MIME type. */
   public static boolean isText(@Nullable String mimeType) {
     return BASE_TYPE_TEXT.equals(getTopLevelType(mimeType));
   }
 
-  /** Returns whether the given string is an application mime type. */
+  /** Returns whether the given string is an application MIME type. */
   public static boolean isApplication(@Nullable String mimeType) {
     return BASE_TYPE_APPLICATION.equals(getTopLevelType(mimeType));
   }
@@ -173,13 +173,14 @@ public static boolean allSamplesAreSyncSamples(@Nullable String mimeType) {
    * @param codecs The codecs attribute.
    * @return The derived video mimeType, or null if it could not be derived.
    */
-  public static @Nullable String getVideoMediaMimeType(@Nullable String codecs) {
+  @Nullable
+  public static String getVideoMediaMimeType(@Nullable String codecs) {
     if (codecs == null) {
       return null;
     }
     String[] codecList = Util.splitCodecs(codecs);
     for (String codec : codecList) {
-      String mimeType = getMediaMimeType(codec);
+      @Nullable String mimeType = getMediaMimeType(codec);
       if (mimeType != null && isVideo(mimeType)) {
         return mimeType;
       }
@@ -193,13 +194,14 @@ public static boolean allSamplesAreSyncSamples(@Nullable String mimeType) {
    * @param codecs The codecs attribute.
    * @return The derived audio mimeType, or null if it could not be derived.
    */
-  public static @Nullable String getAudioMediaMimeType(@Nullable String codecs) {
+  @Nullable
+  public static String getAudioMediaMimeType(@Nullable String codecs) {
     if (codecs == null) {
       return null;
     }
     String[] codecList = Util.splitCodecs(codecs);
     for (String codec : codecList) {
-      String mimeType = getMediaMimeType(codec);
+      @Nullable String mimeType = getMediaMimeType(codec);
       if (mimeType != null && isAudio(mimeType)) {
         return mimeType;
       }
@@ -213,7 +215,8 @@ public static boolean allSamplesAreSyncSamples(@Nullable String mimeType) {
    * @param codec The codec identifier to derive.
    * @return The mimeType, or null if it could not be derived.
    */
-  public static @Nullable String getMediaMimeType(@Nullable String codec) {
+  @Nullable
+  public static String getMediaMimeType(@Nullable String codec) {
     if (codec == null) {
       return null;
     }
@@ -234,7 +237,7 @@ public static boolean allSamplesAreSyncSamples(@Nullable String mimeType) {
     } else if (codec.startsWith("vp8") || codec.startsWith("vp08")) {
       return MimeTypes.VIDEO_VP8;
     } else if (codec.startsWith("mp4a")) {
-      String mimeType = null;
+      @Nullable String mimeType = null;
       if (codec.startsWith("mp4a.")) {
         String objectTypeString = codec.substring(5); // remove the 'mp4a.' prefix
         if (objectTypeString.length() >= 2) {
@@ -243,7 +246,7 @@ public static boolean allSamplesAreSyncSamples(@Nullable String mimeType) {
             int objectTypeInt = Integer.parseInt(objectTypeHexString, 16);
             mimeType = getMimeTypeFromMp4ObjectType(objectTypeInt);
           } catch (NumberFormatException ignored) {
-            // ignored
+            // Ignored.
           }
         }
       }
@@ -266,6 +269,10 @@ public static boolean allSamplesAreSyncSamples(@Nullable String mimeType) {
       return MimeTypes.AUDIO_VORBIS;
     } else if (codec.startsWith("flac")) {
       return MimeTypes.AUDIO_FLAC;
+    } else if (codec.startsWith("stpp")) {
+      return MimeTypes.APPLICATION_TTML;
+    } else if (codec.startsWith("wvtt")) {
+      return MimeTypes.TEXT_VTT;
     } else {
       return getCustomMimeTypeForCodec(codec);
     }
@@ -405,7 +412,8 @@ public static int getTrackTypeOfCodec(String codec) {
    * Returns the top-level type of {@code mimeType}, or null if {@code mimeType} is null or does not
    * contain a forward slash character ({@code '/'}).
    */
-  private static @Nullable String getTopLevelType(@Nullable String mimeType) {
+  @Nullable
+  private static String getTopLevelType(@Nullable String mimeType) {
     if (mimeType == null) {
       return null;
     }
@@ -416,7 +424,8 @@ public static int getTrackTypeOfCodec(String codec) {
     return mimeType.substring(0, indexOfSlash);
   }
 
-  private static @Nullable String getCustomMimeTypeForCodec(String codec) {
+  @Nullable
+  private static String getCustomMimeTypeForCodec(String codec) {
     int customMimeTypeCount = customMimeTypes.size();
     for (int i = 0; i < customMimeTypeCount; i++) {
       CustomMimeType customMimeType = customMimeTypes.get(i);
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java b/library/core/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java
index 288ad918b21..e3973834908 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java
@@ -73,6 +73,10 @@ public void testGetMediaMimeType_fromValidCodecs_returnsCorrectMimeType() {
     assertThat(MimeTypes.getMediaMimeType("mp4a.AA")).isEqualTo(MimeTypes.AUDIO_DTS_HD);
     assertThat(MimeTypes.getMediaMimeType("mp4a.AB")).isEqualTo(MimeTypes.AUDIO_DTS_HD);
     assertThat(MimeTypes.getMediaMimeType("mp4a.AD")).isEqualTo(MimeTypes.AUDIO_OPUS);
+
+    assertThat(MimeTypes.getMediaMimeType("wvtt")).isEqualTo(MimeTypes.TEXT_VTT);
+    assertThat(MimeTypes.getMediaMimeType("stpp.")).isEqualTo(MimeTypes.APPLICATION_TTML);
+    assertThat(MimeTypes.getMediaMimeType("stpp.ttml.im1t")).isEqualTo(MimeTypes.APPLICATION_TTML);
   }
 
   @Test
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index 993ce8e5c1a..a8383be3e86 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -480,19 +480,28 @@ private static HlsMasterPlaylist parseMasterPlaylist(LineIterator iterator, Stri
           }
           break;
         case TYPE_SUBTITLES:
+          codecs = null;
+          sampleMimeType = null;
+          variant = getVariantWithSubtitleGroup(variants, groupId);
+          if (variant != null) {
+            codecs = Util.getCodecsOfType(variant.format.codecs, C.TRACK_TYPE_TEXT);
+            sampleMimeType = MimeTypes.getMediaMimeType(codecs);
+          }
+          if (sampleMimeType == null) {
+            sampleMimeType = MimeTypes.TEXT_VTT;
+          }
           format =
               Format.createTextContainerFormat(
-                      /* id= */ formatId,
-                      /* label= */ name,
-                      /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
-                      /* sampleMimeType= */ MimeTypes.TEXT_VTT,
-                      /* codecs= */ null,
-                      /* bitrate= */ Format.NO_VALUE,
-                      selectionFlags,
-                      roleFlags,
-                      language)
+                  /* id= */ formatId,
+                  /* label= */ name,
+                  /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
+                  sampleMimeType,
+                  codecs,
+                  /* bitrate= */ Format.NO_VALUE,
+                  selectionFlags,
+                  roleFlags,
+                  language)
                   .copyWithMetadata(metadata);
-          subtitles.add(new Rendition(uri, format, groupId, name));
           break;
         case TYPE_CLOSED_CAPTIONS:
           String instreamId = parseStringAttr(line, REGEX_INSTREAM_ID, variableDefinitions);
@@ -569,6 +578,17 @@ private static Variant getVariantWithVideoGroup(ArrayList<Variant> variants, Str
     return null;
   }
 
+  @Nullable
+  private static Variant getVariantWithSubtitleGroup(ArrayList<Variant> variants, String groupId) {
+    for (int i = 0; i < variants.size(); i++) {
+      Variant variant = variants.get(i);
+      if (groupId.equals(variant.subtitleGroupId)) {
+        return variant;
+      }
+    }
+    return null;
+  }
+
   private static HlsMediaPlaylist parseMediaPlaylist(
       HlsMasterPlaylist masterPlaylist, LineIterator iterator, String baseUri) throws IOException {
     @HlsMediaPlaylist.PlaylistType int playlistType = HlsMediaPlaylist.PLAYLIST_TYPE_UNKNOWN;
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index 0aa78d9f026..0d0ef833136 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -194,6 +194,19 @@ public class HlsMasterPlaylistParserTest {
           + "#EXT-X-MEDIA:TYPE=SUBTITLES,"
           + "GROUP-ID=\"sub1\",NAME=\"English\",URI=\"s1/en/prog_index.m3u8\"\n";
 
+  private static final String PLAYLIST_WITH_TTML_SUBTITLE =
+      " #EXTM3U\n"
+          + "\n"
+          + "#EXT-X-VERSION:6\n"
+          + "\n"
+          + "#EXT-X-INDEPENDENT-SEGMENTS\n"
+          + "\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=1280000,CODECS=\"stpp.ttml.im1t,mp4a.40.2,avc1.66.30\",RESOLUTION=304x128,AUDIO=\"aud1\",SUBTITLES=\"sub1\"\n"
+          + "http://example.com/low.m3u8\n"
+          + "\n"
+          + "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"aud1\",NAME=\"English\",URI=\"a1/index.m3u8\"\n"
+          + "#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID=\"sub1\",NAME=\"English\",AUTOSELECT=YES,DEFAULT=YES,URI=\"s1/en/prog_index.m3u8\"\n";
+
   @Test
   public void testParseMasterPlaylist() throws IOException {
     HlsMasterPlaylist masterPlaylist = parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_SIMPLE);
@@ -380,6 +393,18 @@ public void testHlsMetadata() throws IOException {
         .isEqualTo(createExtXMediaMetadata(/* groupId= */ "aud3", /* name= */ "English"));
   }
 
+  @Test
+  public void parseMasterPlaylist_withTtmlSubtitle() throws IOException {
+    HlsMasterPlaylist playlistWithTtmlSubtitle =
+        parseMasterPlaylist(PLAYLIST_URI, PLAYLIST_WITH_TTML_SUBTITLE);
+    HlsMasterPlaylist.Variant variant = playlistWithTtmlSubtitle.variants.get(0);
+    Format firstTextFormat = playlistWithTtmlSubtitle.subtitles.get(0).format;
+    assertThat(firstTextFormat.id).isEqualTo("sub1:English");
+    assertThat(firstTextFormat.containerMimeType).isEqualTo(MimeTypes.APPLICATION_M3U8);
+    assertThat(firstTextFormat.sampleMimeType).isEqualTo(MimeTypes.APPLICATION_TTML);
+    assertThat(variant.format.codecs).isEqualTo("stpp.ttml.im1t,mp4a.40.2,avc1.66.30");
+  }
+
   private static Metadata createExtXStreamInfMetadata(HlsTrackMetadataEntry.VariantInfo... infos) {
     return new Metadata(
         new HlsTrackMetadataEntry(/* groupId= */ null, /* name= */ null, Arrays.asList(infos)));

From f696a56b56e924a16a494e8e9788ed9178f203f1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 7 Apr 2020 12:45:18 +0100
Subject: [PATCH 54/59] Audio focus: Restore full volume if focus is abandoned
 when ducked

If we're in the ducked state and updateAudioFocus is called with a
new state for which focus is no longer required, we should restore
the player back to full volume.

Issue: #7182
PiperOrigin-RevId: 305232155
---
 RELEASENOTES.md                               |  12 ++-
 .../android/exoplayer2/AudioFocusManager.java | 102 +++++++++---------
 .../android/exoplayer2/SimpleExoPlayer.java   |   2 +-
 .../exoplayer2/AudioFocusManagerTest.java     |  76 ++++++++++++-
 4 files changed, 131 insertions(+), 61 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 35868eca9c9..cc529081426 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -14,16 +14,18 @@
   * Allow missing hours and milliseconds in SubRip (.srt) timecodes
     ([#7122](https://github.com/google/ExoPlayer/issues/7122)).
 * Audio:
-  * Prevent case where another app spuriously holding transient audio focus
-    could prevent ExoPlayer from acquiring audio focus for an indefinite period
-    of time ([#7182](https://github.com/google/ExoPlayer/issues/7182).
-  * Workaround issue that could cause slower than realtime playback of AAC on
-    Android 10 ([#6671](https://github.com/google/ExoPlayer/issues/6671).
   * Enable playback speed adjustment and silence skipping for floating point PCM
     audio, via resampling to 16-bit integer PCM. To output the original floating
     point audio without adjustment, pass `enableFloatOutput=true` to the
     `DefaultAudioSink` constructor
     ([#7134](https://github.com/google/ExoPlayer/issues/7134)).
+  * Workaround issue that could cause slower than realtime playback of AAC on
+    Android 10 ([#6671](https://github.com/google/ExoPlayer/issues/6671).
+  * Fix case where another app spuriously holding transient audio focus could
+    prevent ExoPlayer from acquiring audio focus for an indefinite period of
+    time ([#7182](https://github.com/google/ExoPlayer/issues/7182).
+  * Fix case where the player volume could be permanently ducked if audio focus
+    was released whilst ducking.
   * Fix playback of WAV files with trailing non-media bytes
     ([#7129](https://github.com/google/ExoPlayer/issues/7129)).
   * Fix playback of ADTS files with mid-stream ID3 metadata.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java b/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java
index 30da62b944f..5aeca440ffe 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java
@@ -75,15 +75,12 @@ public interface PlayerControl {
   @Documented
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
-    AUDIO_FOCUS_STATE_LOST_FOCUS,
     AUDIO_FOCUS_STATE_NO_FOCUS,
     AUDIO_FOCUS_STATE_HAVE_FOCUS,
     AUDIO_FOCUS_STATE_LOSS_TRANSIENT,
     AUDIO_FOCUS_STATE_LOSS_TRANSIENT_DUCK
   })
   private @interface AudioFocusState {}
-  /** No audio focus was held, but has been lost by another app taking it permanently. */
-  private static final int AUDIO_FOCUS_STATE_LOST_FOCUS = -1;
   /** No audio focus is currently being held. */
   private static final int AUDIO_FOCUS_STATE_NO_FOCUS = 0;
   /** The requested audio focus is currently held. */
@@ -100,7 +97,7 @@ public interface PlayerControl {
 
   private final AudioManager audioManager;
   private final AudioFocusListener focusListener;
-  private final PlayerControl playerControl;
+  @Nullable private PlayerControl playerControl;
   @Nullable private AudioAttributes audioAttributes;
 
   @AudioFocusState private int audioFocusState;
@@ -165,6 +162,15 @@ public int updateAudioFocus(boolean playWhenReady, @Player.State int playbackSta
     return playWhenReady ? requestAudioFocus() : PLAYER_COMMAND_DO_NOT_PLAY;
   }
 
+  /**
+   * Called when the manager is no longer required. Audio focus will be released without making any
+   * calls to the {@link PlayerControl}.
+   */
+  public void release() {
+    playerControl = null;
+    abandonAudioFocus();
+  }
+
   // Internal methods.
 
   @VisibleForTesting
@@ -183,10 +189,10 @@ private int requestAudioFocus() {
     }
     int requestResult = Util.SDK_INT >= 26 ? requestAudioFocusV26() : requestAudioFocusDefault();
     if (requestResult == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
-      audioFocusState = AUDIO_FOCUS_STATE_HAVE_FOCUS;
+      setAudioFocusState(AUDIO_FOCUS_STATE_HAVE_FOCUS);
       return PLAYER_COMMAND_PLAY_WHEN_READY;
     } else {
-      audioFocusState = AUDIO_FOCUS_STATE_NO_FOCUS;
+      setAudioFocusState(AUDIO_FOCUS_STATE_NO_FOCUS);
       return PLAYER_COMMAND_DO_NOT_PLAY;
     }
   }
@@ -200,7 +206,7 @@ private void abandonAudioFocus() {
     } else {
       abandonAudioFocusDefault();
     }
-    audioFocusState = AUDIO_FOCUS_STATE_NO_FOCUS;
+    setAudioFocusState(AUDIO_FOCUS_STATE_NO_FOCUS);
   }
 
   private int requestAudioFocusDefault() {
@@ -325,60 +331,52 @@ private static int convertAudioAttributesToFocusGain(@Nullable AudioAttributes a
     }
   }
 
-  private void handleAudioFocusChange(int focusChange) {
-    // Convert the platform focus change to internal state.
+  private void setAudioFocusState(@AudioFocusState int audioFocusState) {
+    if (this.audioFocusState == audioFocusState) {
+      return;
+    }
+    this.audioFocusState = audioFocusState;
+
+    float volumeMultiplier =
+        (audioFocusState == AUDIO_FOCUS_STATE_LOSS_TRANSIENT_DUCK)
+            ? AudioFocusManager.VOLUME_MULTIPLIER_DUCK
+            : AudioFocusManager.VOLUME_MULTIPLIER_DEFAULT;
+    if (this.volumeMultiplier == volumeMultiplier) {
+      return;
+    }
+    this.volumeMultiplier = volumeMultiplier;
+    if (playerControl != null) {
+      playerControl.setVolumeMultiplier(volumeMultiplier);
+    }
+  }
+
+  private void handlePlatformAudioFocusChange(int focusChange) {
     switch (focusChange) {
+      case AudioManager.AUDIOFOCUS_GAIN:
+        setAudioFocusState(AUDIO_FOCUS_STATE_HAVE_FOCUS);
+        executePlayerCommand(PLAYER_COMMAND_PLAY_WHEN_READY);
+        return;
       case AudioManager.AUDIOFOCUS_LOSS:
-        audioFocusState = AUDIO_FOCUS_STATE_LOST_FOCUS;
-        break;
+        executePlayerCommand(PLAYER_COMMAND_DO_NOT_PLAY);
+        abandonAudioFocus();
+        return;
       case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
-        audioFocusState = AUDIO_FOCUS_STATE_LOSS_TRANSIENT;
-        break;
       case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
-        if (willPauseWhenDucked()) {
-          audioFocusState = AUDIO_FOCUS_STATE_LOSS_TRANSIENT;
+        if (focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT || willPauseWhenDucked()) {
+          executePlayerCommand(PLAYER_COMMAND_WAIT_FOR_CALLBACK);
+          setAudioFocusState(AUDIO_FOCUS_STATE_LOSS_TRANSIENT);
         } else {
-          audioFocusState = AUDIO_FOCUS_STATE_LOSS_TRANSIENT_DUCK;
+          setAudioFocusState(AUDIO_FOCUS_STATE_LOSS_TRANSIENT_DUCK);
         }
-        break;
-      case AudioManager.AUDIOFOCUS_GAIN:
-        audioFocusState = AUDIO_FOCUS_STATE_HAVE_FOCUS;
-        break;
-      default:
-        Log.w(TAG, "Unknown focus change type: " + focusChange);
-        // Early return.
         return;
-    }
-
-    // Handle the internal state (change).
-    switch (audioFocusState) {
-      case AUDIO_FOCUS_STATE_NO_FOCUS:
-        // Focus was not requested; nothing to do.
-        break;
-      case AUDIO_FOCUS_STATE_LOST_FOCUS:
-        playerControl.executePlayerCommand(PLAYER_COMMAND_DO_NOT_PLAY);
-        abandonAudioFocus();
-        break;
-      case AUDIO_FOCUS_STATE_LOSS_TRANSIENT:
-        playerControl.executePlayerCommand(PLAYER_COMMAND_WAIT_FOR_CALLBACK);
-        break;
-      case AUDIO_FOCUS_STATE_LOSS_TRANSIENT_DUCK:
-        // Volume will be adjusted by the code below.
-        break;
-      case AUDIO_FOCUS_STATE_HAVE_FOCUS:
-        playerControl.executePlayerCommand(PLAYER_COMMAND_PLAY_WHEN_READY);
-        break;
       default:
-        throw new IllegalStateException("Unknown audio focus state: " + audioFocusState);
+        Log.w(TAG, "Unknown focus change type: " + focusChange);
     }
+  }
 
-    float volumeMultiplier =
-        (audioFocusState == AUDIO_FOCUS_STATE_LOSS_TRANSIENT_DUCK)
-            ? AudioFocusManager.VOLUME_MULTIPLIER_DUCK
-            : AudioFocusManager.VOLUME_MULTIPLIER_DEFAULT;
-    if (this.volumeMultiplier != volumeMultiplier) {
-      this.volumeMultiplier = volumeMultiplier;
-      playerControl.setVolumeMultiplier(volumeMultiplier);
+  private void executePlayerCommand(@PlayerCommand int playerCommand) {
+    if (playerControl != null) {
+      playerControl.executePlayerCommand(playerCommand);
     }
   }
 
@@ -393,7 +391,7 @@ public AudioFocusListener(Handler eventHandler) {
 
     @Override
     public void onAudioFocusChange(int focusChange) {
-      eventHandler.post(() -> handleAudioFocusChange(focusChange));
+      eventHandler.post(() -> handlePlatformAudioFocusChange(focusChange));
     }
   }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index ba26dfd97a8..bb80d60f217 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -1294,9 +1294,9 @@ public void stop(boolean reset) {
   public void release() {
     verifyApplicationThread();
     audioBecomingNoisyManager.setEnabled(false);
-    audioFocusManager.updateAudioFocus(/* playWhenReady= */ false, Player.STATE_IDLE);
     wakeLockManager.setStayAwake(false);
     wifiLockManager.setStayAwake(false);
+    audioFocusManager.release();
     player.release();
     removeSurfaceCallbacks();
     if (surface != null) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java
index d5cf8890da6..b0f258c0c24 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java
@@ -226,6 +226,54 @@ public void updateAudioFocus_pausedToPlaying_withTransientLoss_setsPlayerCommand
         .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
   }
 
+  @Test
+  public void updateAudioFocus_pausedToPlaying_withTransientDuck_setsPlayerCommandPlayWhenReady() {
+    AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
+    Shadows.shadowOf(audioManager)
+        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    audioFocusManager.setAudioAttributes(media);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+
+    // Simulate transient ducking.
+    audioFocusManager
+        .getFocusListener()
+        .onAudioFocusChange(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK);
+    assertThat(testPlayerControl.lastVolumeMultiplier).isLessThan(1.0f);
+
+    // Focus should be re-requested, rather than staying in a state of transient ducking. This
+    // should restore the volume to 1.0.
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    assertThat(testPlayerControl.lastVolumeMultiplier).isEqualTo(1.0f);
+  }
+
+  @Test
+  public void updateAudioFocus_abandonFocusWhenDucked_restoresFullVolume() {
+    AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
+    Shadows.shadowOf(audioManager)
+        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    audioFocusManager.setAudioAttributes(media);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+
+    // Simulate transient ducking.
+    audioFocusManager
+        .getFocusListener()
+        .onAudioFocusChange(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK);
+    assertThat(testPlayerControl.lastVolumeMultiplier).isLessThan(1.0f);
+
+    // Configure the manager to no longer handle audio focus.
+    audioFocusManager.setAudioAttributes(null);
+
+    // Focus should be abandoned, which should restore the volume to 1.0.
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+    assertThat(testPlayerControl.lastVolumeMultiplier).isEqualTo(1.0f);
+  }
+
   @Test
   @Config(maxSdk = 25)
   public void updateAudioFocus_readyToIdle_abandonsAudioFocus() {
@@ -315,6 +363,28 @@ public void updateAudioFocus_readyToIdle_withoutHandlingAudioFocus_isNoOp_v26()
     assertThat(Shadows.shadowOf(audioManager).getLastAbandonedAudioFocusRequest()).isNull();
   }
 
+  @Test
+  public void release_doesNotCallPlayerControlToRestoreVolume() {
+    AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
+    Shadows.shadowOf(audioManager)
+        .setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    audioFocusManager.setAudioAttributes(media);
+
+    assertThat(audioFocusManager.updateAudioFocus(/* playWhenReady= */ true, Player.STATE_READY))
+        .isEqualTo(PLAYER_COMMAND_PLAY_WHEN_READY);
+
+    // Simulate transient ducking.
+    audioFocusManager
+        .getFocusListener()
+        .onAudioFocusChange(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK);
+    assertThat(testPlayerControl.lastVolumeMultiplier).isLessThan(1.0f);
+
+    audioFocusManager.release();
+
+    // PlaybackController.setVolumeMultiplier should not have been called to restore the volume.
+    assertThat(testPlayerControl.lastVolumeMultiplier).isLessThan(1.0f);
+  }
+
   @Test
   public void onAudioFocusChange_withDuckEnabled_volumeReducedAndRestored() {
     // Ensure that the volume multiplier is adjusted when audio focus is lost to
@@ -364,7 +434,7 @@ public void onAudioFocusChange_withPausedWhenDucked_sendsCommandWaitForCallback(
   }
 
   @Test
-  public void onAudioFocusChange_withTransientLost_sendsCommandWaitForCallback() {
+  public void onAudioFocusChange_withTransientLoss_sendsCommandWaitForCallback() {
     // Ensure that the player is commanded to pause when audio focus is lost with
     // AUDIOFOCUS_LOSS_TRANSIENT.
     AudioAttributes media = new AudioAttributes.Builder().setUsage(C.USAGE_MEDIA).build();
@@ -382,7 +452,7 @@ public void onAudioFocusChange_withTransientLost_sendsCommandWaitForCallback() {
 
   @Test
   @Config(maxSdk = 25)
-  public void onAudioFocusChange_withAudioFocusLost_sendsDoNotPlayAndAbandondsFocus() {
+  public void onAudioFocusChange_withFocusLoss_sendsDoNotPlayAndAbandonsFocus() {
     // Ensure that AUDIOFOCUS_LOSS causes AudioFocusManager to pause playback and abandon audio
     // focus.
     AudioAttributes media =
@@ -408,7 +478,7 @@ public void onAudioFocusChange_withAudioFocusLost_sendsDoNotPlayAndAbandondsFocu
 
   @Test
   @Config(minSdk = 26, maxSdk = TARGET_SDK)
-  public void onAudioFocusChange_withAudioFocusLost_sendsDoNotPlayAndAbandondsFocus_v26() {
+  public void onAudioFocusChange_withFocusLoss_sendsDoNotPlayAndAbandonsFocus_v26() {
     // Ensure that AUDIOFOCUS_LOSS causes AudioFocusManager to pause playback and abandon audio
     // focus.
     AudioAttributes media =

From 55e33e36995dbcaea6f370f331f0e72d63441f2e Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 7 Apr 2020 21:43:09 +0100
Subject: [PATCH 55/59] Fix missing subtitle addition

---
 .../exoplayer2/source/hls/playlist/HlsPlaylistParser.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
index a8383be3e86..6bd447f7464 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
@@ -502,6 +502,7 @@ private static HlsMasterPlaylist parseMasterPlaylist(LineIterator iterator, Stri
                   roleFlags,
                   language)
                   .copyWithMetadata(metadata);
+          subtitles.add(new Rendition(uri, format, groupId, name));
           break;
         case TYPE_CLOSED_CAPTIONS:
           String instreamId = parseStringAttr(line, REGEX_INSTREAM_ID, variableDefinitions);

From 1f4d37431ec7d04f0f9c64514676752857d7e0de Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 8 Apr 2020 18:14:01 +0100
Subject: [PATCH 56/59] Upgrade cast dependency

Issue: #7191
PiperOrigin-RevId: 305502293
---
 RELEASENOTES.md                         | 4 ++++
 demos/cast/src/main/AndroidManifest.xml | 1 +
 extensions/cast/build.gradle            | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index cc529081426..29f4926b576 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -49,6 +49,10 @@
 * FFmpeg extension: Add support for `x86_64` architecture.
 * Opus extension: Fix parsing of negative gain values
   ([#7046](https://github.com/google/ExoPlayer/issues/7046)).
+* Cast extension: Upgrade `play-services-cast-framework` dependency to 18.1.0.
+  This fixes an issue where `RemoteServiceException` was thrown due to
+  `Context.startForegroundService()` not calling `Service.startForeground()`
+  ([#7191](https://github.com/google/ExoPlayer/issues/7191)).
 
 ### 2.11.3 (2020-02-19) ###
 
diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
index dbfdd833f65..d92d9e2303d 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -18,6 +18,7 @@
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
   <uses-sdk/>
 
diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
index 0d7d96db4c8..3486fbb08fe 100644
--- a/extensions/cast/build.gradle
+++ b/extensions/cast/build.gradle
@@ -31,7 +31,7 @@ android {
 }
 
 dependencies {
-    api 'com.google.android.gms:play-services-cast-framework:17.0.0'
+    api 'com.google.android.gms:play-services-cast-framework:18.1.0'
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-ui')

From f95a0caec3a2b56300da435b5f9fd72426686a07 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 8 Apr 2020 18:21:39 +0100
Subject: [PATCH 57/59] Update misc dependencies

PiperOrigin-RevId: 305503804
---
 demos/cast/build.gradle             | 4 ++--
 demos/main/build.gradle             | 2 +-
 extensions/workmanager/build.gradle | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
index f9228e4b792..c929f09c87b 100644
--- a/demos/cast/build.gradle
+++ b/demos/cast/build.gradle
@@ -57,8 +57,8 @@ dependencies {
     implementation project(modulePrefix + 'library-ui')
     implementation project(modulePrefix + 'extension-cast')
     implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'com.google.android.material:material:1.1.0'
 }
 
 apply plugin: 'com.google.android.gms.strict-version-matcher-plugin'
diff --git a/demos/main/build.gradle b/demos/main/build.gradle
index ab47b6de811..b7a8666fe37 100644
--- a/demos/main/build.gradle
+++ b/demos/main/build.gradle
@@ -64,7 +64,7 @@ android {
 dependencies {
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-dash')
     implementation project(modulePrefix + 'library-hls')
diff --git a/extensions/workmanager/build.gradle b/extensions/workmanager/build.gradle
index 6a7aa107228..96712792690 100644
--- a/extensions/workmanager/build.gradle
+++ b/extensions/workmanager/build.gradle
@@ -34,7 +34,7 @@ android {
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
-    implementation 'androidx.work:work-runtime:2.2.0'
+    implementation 'androidx.work:work-runtime:2.3.4'
 }
 
 ext {

From 54f3e6a2034ac8006eba0f5430b88fabfb3106ec Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 8 Apr 2020 22:03:06 +0100
Subject: [PATCH 58/59] Revert release note indentation change

---
 RELEASENOTES.md | 114 ++++++++++++++++++++++++------------------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 29f4926b576..8820273a730 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -64,63 +64,63 @@
 
 ### 2.11.2 (2020-02-13) ###
 
-*   Add Java FLAC extractor
-    ([#6406](https://github.com/google/ExoPlayer/issues/6406)).
-*   Startup latency optimization:
-    *   Reduce startup latency for DASH and SmoothStreaming playbacks by
-        allowing codec initialization to occur before the network connection for
-        the first media segment has been established.
-    *   Reduce startup latency for on-demand DASH playbacks by allowing codec
-        initialization to occur before the sidx box has been loaded.
-*   Downloads:
-    *   Fix download resumption when the requirements for them to continue are
-        met ([#6733](https://github.com/google/ExoPlayer/issues/6733),
-        [#6798](https://github.com/google/ExoPlayer/issues/6798)).
-    *   Fix `DownloadHelper.createMediaSource` to use `customCacheKey` when
-        creating `ProgressiveMediaSource` instances.
-*   DRM: Fix `NullPointerException` when playing DRM protected content
-    ([#6951](https://github.com/google/ExoPlayer/issues/6951)).
-*   Metadata:
-    *   Update `IcyDecoder` to try ISO-8859-1 decoding if UTF-8 decoding fails.
-        Also change `IcyInfo.rawMetadata` from `String` to `byte[]` to allow
-        developers to handle data that's neither UTF-8 nor ISO-8859-1
-        ([#6753](https://github.com/google/ExoPlayer/issues/6753)).
-    *   Select multiple metadata tracks if multiple metadata renderers are
-        available ([#6676](https://github.com/google/ExoPlayer/issues/6676)).
-    *   Add support for ID3 genres added in Wimamp 5.6 (2010).
-*   UI:
-    *   Show ad group markers in `DefaultTimeBar` even if they are after the end
-        of the current window
-        ([#6552](https://github.com/google/ExoPlayer/issues/6552)).
-    *   Don't use notification chronometer if playback speed is != 1.0
-        ([#6816](https://github.com/google/ExoPlayer/issues/6816)).
-*   HLS: Fix playback of DRM protected content that uses key rotation
-    ([#6903](https://github.com/google/ExoPlayer/issues/6903)).
-*   WAV:
-    *   Support IMA ADPCM encoded data.
-    *   Improve support for G.711 A-law and mu-law encoded data.
-*   MP4: Support "twos" codec (big endian PCM)
-    ([#5789](https://github.com/google/ExoPlayer/issues/5789)).
-*   FMP4: Add support for encrypted AC-4 tracks.
-*   HLS: Fix slow seeking into long MP3 segments
-    ([#6155](https://github.com/google/ExoPlayer/issues/6155)).
-*   Fix handling of E-AC-3 streams that contain AC-3 syncframes
-    ([#6602](https://github.com/google/ExoPlayer/issues/6602)).
-*   Fix playback of TrueHD streams in Matroska
-    ([#6845](https://github.com/google/ExoPlayer/issues/6845)).
-*   Fix MKV subtitles to disappear when intended instead of lasting until the
-    next cue ([#6833](https://github.com/google/ExoPlayer/issues/6833)).
-*   OkHttp extension: Upgrade OkHttp dependency to 3.12.8, which fixes a class
-    of `SocketTimeoutException` issues when using HTTP/2
-    ([#4078](https://github.com/google/ExoPlayer/issues/4078)).
-*   FLAC extension: Fix handling of bit depths other than 16 in `FLACDecoder`.
-    This issue caused FLAC streams with other bit depths to sound like white
-    noise on earlier releases, but only when embedded in a non-FLAC container
-    such as Matroska or MP4.
-*   Demo apps: Add
-    [GL demo app](https://github.com/google/ExoPlayer/tree/dev-v2/demos/gl) to
-    show how to render video to a `GLSurfaceView` while applying a GL shader.
-    ([#6920](https://github.com/google/ExoPlayer/issues/6920)).
+* Add Java FLAC extractor
+  ([#6406](https://github.com/google/ExoPlayer/issues/6406)).
+* Startup latency optimization:
+  * Reduce startup latency for DASH and SmoothStreaming playbacks by allowing
+    codec initialization to occur before the network connection for the first
+    media segment has been established.
+  * Reduce startup latency for on-demand DASH playbacks by allowing codec
+    initialization to occur before the sidx box has been loaded.
+* Downloads:
+  * Fix download resumption when the requirements for them to continue are
+    met ([#6733](https://github.com/google/ExoPlayer/issues/6733),
+    [#6798](https://github.com/google/ExoPlayer/issues/6798)).
+  * Fix `DownloadHelper.createMediaSource` to use `customCacheKey` when creating
+    `ProgressiveMediaSource` instances.
+* DRM: Fix `NullPointerException` when playing DRM-protected content
+  ([#6951](https://github.com/google/ExoPlayer/issues/6951)).
+* Metadata:
+  * Update `IcyDecoder` to try ISO-8859-1 decoding if UTF-8 decoding fails.
+    Also change `IcyInfo.rawMetadata` from `String` to `byte[]` to allow
+    developers to handle data that's neither UTF-8 nor ISO-8859-1
+    ([#6753](https://github.com/google/ExoPlayer/issues/6753)).
+  * Select multiple metadata tracks if multiple metadata renderers are available
+    ([#6676](https://github.com/google/ExoPlayer/issues/6676)).
+  * Add support for ID3 genres added in Wimamp 5.6 (2010).
+* UI:
+  * Show ad group markers in `DefaultTimeBar` even if they are after the end
+    of the current window
+    ([#6552](https://github.com/google/ExoPlayer/issues/6552)).
+  * Don't use notification chronometer if playback speed is != 1.0
+    ([#6816](https://github.com/google/ExoPlayer/issues/6816)).
+* HLS: Fix playback of DRM protected content that uses key rotation
+  ([#6903](https://github.com/google/ExoPlayer/issues/6903)).
+* WAV:
+  * Support IMA ADPCM encoded data.
+  * Improve support for G.711 A-law and mu-law encoded data.
+* MP4: Support "twos" codec (big endian PCM)
+  ([#5789](https://github.com/google/ExoPlayer/issues/5789)).
+* FMP4: Add support for encrypted AC-4 tracks.
+* HLS: Fix slow seeking into long MP3 segments
+  ([#6155](https://github.com/google/ExoPlayer/issues/6155)).
+* Fix handling of E-AC-3 streams that contain AC-3 syncframes
+  ([#6602](https://github.com/google/ExoPlayer/issues/6602)).
+* Fix playback of TrueHD streams in Matroska
+  ([#6845](https://github.com/google/ExoPlayer/issues/6845)).
+* Fix MKV subtitles to disappear when intended instead of lasting until the
+  next cue ([#6833](https://github.com/google/ExoPlayer/issues/6833)).
+* OkHttp extension: Upgrade OkHttp dependency to 3.12.8, which fixes a class of
+  `SocketTimeoutException` issues when using HTTP/2
+  ([#4078](https://github.com/google/ExoPlayer/issues/4078)).
+* FLAC extension: Fix handling of bit depths other than 16 in `FLACDecoder`.
+  This issue caused FLAC streams with other bit depths to sound like white noise
+  on earlier releases, but only when embedded in a non-FLAC container such as
+  Matroska or MP4.
+* Demo apps: Add
+  [GL demo app](https://github.com/google/ExoPlayer/tree/dev-v2/demos/gl) to
+  show how to render video to a `GLSurfaceView` while applying a GL shader.
+  ([#6920](https://github.com/google/ExoPlayer/issues/6920)).
 
 ### 2.11.1 (2019-12-20) ###
 

From 76374d78222c43860d676f5d1aacafa915d984be Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 8 Apr 2020 22:11:33 +0100
Subject: [PATCH 59/59] Clean up playWhenReady

---
 .../com/google/android/exoplayer2/SimpleExoPlayer.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index bb80d60f217..839c65b1248 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -690,7 +690,7 @@ public void setAudioAttributes(AudioAttributes audioAttributes, boolean handleAu
     boolean playWhenReady = getPlayWhenReady();
     @AudioFocusManager.PlayerCommand
     int playerCommand = audioFocusManager.updateAudioFocus(playWhenReady, getPlaybackState());
-    updatePlayWhenReady(getPlayWhenReady(), playerCommand);
+    updatePlayWhenReady(playWhenReady, playerCommand);
   }
 
   @Override
@@ -1189,9 +1189,10 @@ public void prepare(MediaSource mediaSource, boolean resetPosition, boolean rese
     }
     this.mediaSource = mediaSource;
     mediaSource.addEventListener(eventHandler, analyticsCollector);
+    boolean playWhenReady = getPlayWhenReady();
     @AudioFocusManager.PlayerCommand
-    int playerCommand = audioFocusManager.updateAudioFocus(getPlayWhenReady(), Player.STATE_BUFFERING);
-    updatePlayWhenReady(getPlayWhenReady(), playerCommand);
+    int playerCommand = audioFocusManager.updateAudioFocus(playWhenReady, Player.STATE_BUFFERING);
+    updatePlayWhenReady(playWhenReady, playerCommand);
     player.prepare(mediaSource, resetPosition, resetState);
   }