Merge branch 'main' into feature/prevent-infinite-reloads-for-ll-hls

Author: mojsdev

RELEASENOTES.md

@@ -80,6 +80,9 @@
 *   Cronet extension:
 *   RTMP extension:
 *   HLS extension:
+    *   Fix issue where chunk duration wasn't set in `CmcdData` for HLS media,
+        causing an assertion failure when processing encrypted media segments
+        ([#2312](https://github.com/androidx/media/issues/2312)).
     *   Prevent excessive reloads by waiting for half the part target duration
         when `CAN-BLOCK-RELOAD=YES` is not honored.
 *   DASH extension:

libraries/decoder/src/main/java/androidx/media3/decoder/VideoDecoderOutputBuffer.java

@@ -56,6 +56,8 @@ public class VideoDecoderOutputBuffer extends DecoderOutputBuffer {
 
   @Nullable public int[] yuvStrides;
   public int colorspace;
+  public int yStride;
+  public int uvStride;
 
   /**
    * Supplemental data related to the output frame, if {@link #hasSupplementalData()} returns true.
@@ -117,6 +119,8 @@ public boolean initForYuvFrame(int width, int height, int yStride, int uvStride,
     this.width = width;
     this.height = height;
     this.colorspace = colorspace;
+    this.yStride = yStride;
+    this.uvStride = uvStride;
     int uvHeight = (int) (((long) height + 1) / 2);
     if (!isSafeToMultiply(yStride, height) || !isSafeToMultiply(uvStride, uvHeight)) {
       return false;

libraries/effect/src/main/java/androidx/media3/effect/ReplayableFrameCacheGlShaderProgram.java

@@ -66,6 +66,17 @@ public void flush() {
     super.flush();
   }
 
+  @Override
+  public void signalEndOfCurrentInputStream() {
+    // TODO: b/391109625 - Support mixed size buffers in the output texture pool to allow
+    //  replaying the last frame in a sequence.
+    for (int i = 0; i < cacheSize; i++) {
+      super.releaseOutputFrame(cachedFrames[i].glTextureInfo);
+    }
+    cacheSize = 0;
+    super.signalEndOfCurrentInputStream();
+  }
+
   /** Returns whether there is no cached frame. */
   public boolean isEmpty() {
     return cacheSize == 0;

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapper.java

@@ -731,8 +731,15 @@ public boolean isInitialized() {
     @Override
     public void redraw() {
       checkState(isInitialized());
+      // Resignal EOS only for the last item.
+      boolean needsResignalEndOfCurrentInputStream = signaledEndOfStream;
+      long replayedPresentationTimeUs = lastOutputBufferPresentationTimeUs;
       PlaybackVideoGraphWrapper.this.flush(/* resetPosition= */ false);
       checkNotNull(videoGraph).redraw();
+      lastOutputBufferPresentationTimeUs = replayedPresentationTimeUs;
+      if (needsResignalEndOfCurrentInputStream) {
+        signalEndOfCurrentInputStream();
+      }
     }
 
     @Override

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameRenderControl.java

@@ -209,6 +209,13 @@ public void onFrameAvailableForRendering(long presentationTimeUs) {
    * this method, the end of input signal is ignored.
    */
   public void signalEndOfInput() {
+    if (latestInputPresentationTimeUs == C.TIME_UNSET) {
+      // If EOS is signalled right after a flush without receiving a frame (could happen with frame
+      // replaying as available frame is not reported to the render control), set the latest input
+      // and output timestamp to end of source to ensure isEnded() returns true.
+      latestInputPresentationTimeUs = C.TIME_END_OF_SOURCE;
+      latestOutputPresentationTimeUs = C.TIME_END_OF_SOURCE;
+    }
     lastPresentationTimeUs = latestInputPresentationTimeUs;
   }
 

libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsChunkSource.java

@@ -517,7 +517,8 @@ public void getNextChunk(
               .setPlaybackRate(loadingInfo.playbackSpeed)
               .setIsLive(!playlist.hasEndTag)
               .setDidRebuffer(loadingInfo.rebufferedSince(lastChunkRequestRealtimeMs))
-              .setIsBufferEmpty(queue.isEmpty());
+              .setIsBufferEmpty(queue.isEmpty())
+              .setChunkDurationUs(segmentBaseHolder.segmentBase.durationUs);
       long nextMediaSequence =
           segmentBaseHolder.partIndex == C.INDEX_UNSET
               ? segmentBaseHolder.mediaSequence + 1

libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaChunk.java

@@ -112,8 +112,7 @@ public static HlsMediaChunk createInstance(
             .setFlags(segmentBaseHolder.isPreload ? FLAG_MIGHT_NOT_USE_FULL_NETWORK_SPEED : 0)
             .build();
     if (cmcdDataFactory != null) {
-      CmcdData cmcdData =
-          cmcdDataFactory.setChunkDurationUs(mediaSegment.durationUs).createCmcdData();
+      CmcdData cmcdData = cmcdDataFactory.createCmcdData();
       dataSpec = cmcdData.addToDataSpec(dataSpec);
     }