Add missing 1.6.0 entry to GH bug template

PiperOrigin-RevId: 741120336
Merge pull request #2253 from nirb999:main
2025-04-29 22:36:54 +08:00 · 2025-03-27 05:48:34 -07:00 · 2025-03-27 03:50:08 -07:00 · 2025-03-26 14:12:55 +00:00 · 2025-03-26 14:04:08 +00:00 · 2025-03-21 16:36:17 +01:00
5 changed files with 7 additions and 4 deletions
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@ -19,6 +19,7 @@ body:
      options:
        - Media3 main branch
        - Media3 pre-release (alpha, beta or RC not in this list)
+        - Media3 1.6.0
        - Media3 1.5.1
        - Media3 1.5.0
        - Media3 1.4.1
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@ -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:
--- a/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java
+++ b/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java
@ -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),
--- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/DefaultHlsPlaylistTracker.java
+++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/DefaultHlsPlaylistTracker.java
@ -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<>(
--- a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java
+++ b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/SsMediaSource.java
@ -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);
Author	SHA1	Message	Date
tonihei	f74abed984	Add missing 1.6.0 entry to GH bug template PiperOrigin-RevId: 741120336	2025-03-27 05:48:34 -07:00
Copybara-Service	f2fa0f7b2a	Merge pull request #2253 from nirb999:main PiperOrigin-RevId: 741092998	2025-03-27 03:50:08 -07:00
Rohit Singh	916ffcfe5f	Add RELEASENOTES entry	2025-03-26 14:12:55 +00:00
Rohit Singh	5594dddc99	Fix not sent for manifest requests in HLS and SS	2025-03-26 14:04:08 +00:00
Nir.Ben-Shmuel	f235516d8b	Fix CmcdData in query parameter mode not sent for manifest requests in DASH	2025-03-21 16:36:17 +01:00