loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure chunk duration is set in CmcdData for HLS media

Browse Source 
Previously, encrypted media segments did not have the chunk duration set,
causing an assertion failure during `CmcdData` creation. With this change,
the chunk duration is always set, while `CmcdData` ensures it is applied
only for media chunks.

Issue: androidx/media#2312
PiperOrigin-RevId: 745196718
This commit is contained in:
rohks 2025-04-08 10:19:53 -07:00 committed by Copybara-Service
parent e11a8a1b19
commit 9182b413dc
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASENOTES.md
View File

@ -80,6 +80,9 @@
* Cronet extension: * Cronet extension:
* RTMP extension: * RTMP extension:
* HLS 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)).
* DASH extension: * DASH extension:
* Smooth Streaming extension: * Smooth Streaming extension:
* RTSP extension: * RTSP extension:

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

@ -517,7 +517,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
.setPlaybackRate(loadingInfo.playbackSpeed) .setPlaybackRate(loadingInfo.playbackSpeed)
.setIsLive(!playlist.hasEndTag) .setIsLive(!playlist.hasEndTag)
.setDidRebuffer(loadingInfo.rebufferedSince(lastChunkRequestRealtimeMs)) .setDidRebuffer(loadingInfo.rebufferedSince(lastChunkRequestRealtimeMs))
.setIsBufferEmpty(queue.isEmpty()); .setIsBufferEmpty(queue.isEmpty())
.setChunkDurationUs(segmentBaseHolder.segmentBase.durationUs);
long nextMediaSequence = long nextMediaSequence =
segmentBaseHolder.partIndex == C.INDEX_UNSET segmentBaseHolder.partIndex == C.INDEX_UNSET
? segmentBaseHolder.mediaSequence + 1 ? segmentBaseHolder.mediaSequence + 1

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

@ -112,8 +112,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
.setFlags(segmentBaseHolder.isPreload ? FLAG_MIGHT_NOT_USE_FULL_NETWORK_SPEED : 0) .setFlags(segmentBaseHolder.isPreload ? FLAG_MIGHT_NOT_USE_FULL_NETWORK_SPEED : 0)
.build(); .build();
if (cmcdDataFactory != null) { if (cmcdDataFactory != null) {
CmcdData cmcdData = CmcdData cmcdData = cmcdDataFactory.createCmcdData();
cmcdDataFactory.setChunkDurationUs(mediaSegment.durationUs).createCmcdData();
dataSpec = cmcdData.addToDataSpec(dataSpec); dataSpec = cmcdData.addToDataSpec(dataSpec);
} }