loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-29 22:36:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2253 from nirb999:main

Browse Source 
PiperOrigin-RevId: 741092998
This commit is contained in:
Copybara-Service 2025-03-27 03:50:08 -07:00
commit f2fa0f7b2a
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.md
View File

@ -4,6 +4,8 @@
* Common Library:
* ExoPlayer:
* Fix sending `CmcdData` in manifest requests for DASH, HLS, and
SmoothStreaming ([#2253](https://github.com/androidx/media/pull/2253)).
* Transformer:
* Track Selection:
* Extractors:

2
libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java
View File

@ -1122,7 +1122,7 @@ public final class DashMediaSource extends BaseMediaSource {
if (manifest != null) {
cmcdDataFactory.setIsLive(manifest.dynamic);
}
cmcdDataFactory.createCmcdData().addToDataSpec(dataSpec);
dataSpec = cmcdDataFactory.createCmcdData().addToDataSpec(dataSpec);
}
startLoading(
new ParsingLoadable<>(dataSource, dataSpec, C.DATA_TYPE_MANIFEST, manifestParser),

4
libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/DefaultHlsPlaylistTracker.java
View File

@ -153,7 +153,7 @@ public final class DefaultHlsPlaylistTracker
new CmcdData.Factory(cmcdConfiguration, CmcdData.STREAMING_FORMAT_HLS)
.setObjectType(CmcdData.OBJECT_TYPE_MANIFEST)
.createCmcdData();
cmcdData.addToDataSpec(dataSpec);
dataSpec = cmcdData.addToDataSpec(dataSpec);
}
ParsingLoadable<HlsPlaylist> multivariantPlaylistLoadable =
new ParsingLoadable<>(
@ -796,7 +796,7 @@ public final class DefaultHlsPlaylistTracker
if (primaryMediaPlaylistSnapshot != null) {
cmcdDataFactory.setIsLive(!primaryMediaPlaylistSnapshot.hasEndTag);
}
cmcdDataFactory.createCmcdData().addToDataSpec(dataSpec);
dataSpec = cmcdDataFactory.createCmcdData().addToDataSpec(dataSpec);
}
ParsingLoadable<HlsPlaylist> mediaPlaylistLoadable =
new ParsingLoadable<>(

2
libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java
View File

@ -689,7 +689,7 @@ public final class SsMediaSource extends BaseMediaSource
if (manifest != null) {
cmcdDataFactory.setIsLive(manifest.isLive);
}
cmcdDataFactory.createCmcdData().addToDataSpec(dataSpec);
dataSpec = cmcdDataFactory.createCmcdData().addToDataSpec(dataSpec);
}
ParsingLoadable<SsManifest> loadable =
new ParsingLoadable<>(manifestDataSource, dataSpec, C.DATA_TYPE_MANIFEST, manifestParser);