From 1f1460a152b0f179552b00b56c35a1b3e9f092fa Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Tue, 5 Jul 2022 23:21:59 +0000
Subject: [PATCH] Use mediaId as contentId if available

This is to be consistent with what cast `QueueMediaItem` is doing. If a contentId is
not available the contentUrl is used as the ID.

#minor-release

PiperOrigin-RevId: 459133323
(cherry picked from commit 0a9f9007c66ca725959b3fe70311dd72dc086346)
---
 .../cast/DefaultMediaItemConverter.java       |  7 +++-
 .../cast/DefaultMediaItemConverterTest.java   | 42 +++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/libraries/cast/src/main/java/androidx/media3/cast/DefaultMediaItemConverter.java b/libraries/cast/src/main/java/androidx/media3/cast/DefaultMediaItemConverter.java
index d4bcbd4b9d..97b90b2b4b 100644
--- a/libraries/cast/src/main/java/androidx/media3/cast/DefaultMediaItemConverter.java
+++ b/libraries/cast/src/main/java/androidx/media3/cast/DefaultMediaItemConverter.java
@@ -128,11 +128,14 @@ public final class DefaultMediaItemConverter implements MediaItemConverter {
     if (mediaItem.mediaMetadata.trackNumber != null) {
       metadata.putInt(MediaMetadata.KEY_TRACK_NUMBER, mediaItem.mediaMetadata.trackNumber);
     }
-
+    String contentUrl = mediaItem.localConfiguration.uri.toString();
+    String contentId =
+        mediaItem.mediaId.equals(MediaItem.DEFAULT_MEDIA_ID) ? contentUrl : mediaItem.mediaId;
     MediaInfo mediaInfo =
-        new MediaInfo.Builder(mediaItem.localConfiguration.uri.toString())
+        new MediaInfo.Builder(contentId)
             .setStreamType(MediaInfo.STREAM_TYPE_BUFFERED)
             .setContentType(mediaItem.localConfiguration.mimeType)
+            .setContentUrl(contentUrl)
             .setMetadata(metadata)
             .setCustomData(getCustomData(mediaItem))
             .build();
diff --git a/libraries/cast/src/test/java/androidx/media3/cast/DefaultMediaItemConverterTest.java b/libraries/cast/src/test/java/androidx/media3/cast/DefaultMediaItemConverterTest.java
index 0a760043d3..10ac47a62e 100644
--- a/libraries/cast/src/test/java/androidx/media3/cast/DefaultMediaItemConverterTest.java
+++ b/libraries/cast/src/test/java/androidx/media3/cast/DefaultMediaItemConverterTest.java
@@ -50,6 +50,7 @@ public class DefaultMediaItemConverterTest {
     MediaItem.Builder builder = new MediaItem.Builder();
     MediaItem item =
         builder
+            .setMediaId("fooBar")
             .setUri(Uri.parse("http://example.com"))
             .setMediaMetadata(MediaMetadata.EMPTY)
             .setMimeType(MimeTypes.APPLICATION_MPD)
@@ -66,4 +67,45 @@ public class DefaultMediaItemConverterTest {
 
     assertThat(reconstructedItem).isEqualTo(item);
   }
+
+  @Test
+  public void toMediaQueueItem_nonDefaultMediaId_usedAsContentId() {
+    MediaItem.Builder builder = new MediaItem.Builder();
+    MediaItem item =
+        builder
+            .setMediaId("fooBar")
+            .setUri("http://example.com")
+            .setMimeType(MimeTypes.APPLICATION_MPD)
+            .build();
+
+    DefaultMediaItemConverter converter = new DefaultMediaItemConverter();
+    MediaQueueItem queueItem = converter.toMediaQueueItem(item);
+
+    assertThat(queueItem.getMedia().getContentId()).isEqualTo("fooBar");
+  }
+
+  @Test
+  public void toMediaQueueItem_defaultMediaId_uriAsContentId() {
+    DefaultMediaItemConverter converter = new DefaultMediaItemConverter();
+    MediaItem mediaItem =
+        new MediaItem.Builder()
+            .setUri("http://example.com")
+            .setMimeType(MimeTypes.APPLICATION_MPD)
+            .build();
+
+    MediaQueueItem queueItem = converter.toMediaQueueItem(mediaItem);
+
+    assertThat(queueItem.getMedia().getContentId()).isEqualTo("http://example.com");
+
+    MediaItem secondMediaItem =
+        new MediaItem.Builder()
+            .setMediaId(MediaItem.DEFAULT_MEDIA_ID)
+            .setUri("http://example.com")
+            .setMimeType(MimeTypes.APPLICATION_MPD)
+            .build();
+
+    MediaQueueItem secondQueueItem = converter.toMediaQueueItem(secondMediaItem);
+
+    assertThat(secondQueueItem.getMedia().getContentId()).isEqualTo("http://example.com");
+  }
 }