Skip to content

Commit f13c879

Browse files
Merge pull request #1255 from phcannesson:fix-cast-media-item-conversion
PiperOrigin-RevId: 624147863
2 parents 1f40451 + 5788286 commit f13c879

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

RELEASENOTES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
* Decoder Extensions (FFmpeg, VP9, AV1, MIDI, etc.):
3939
* Leanback extension:
4040
* Cast Extension:
41+
* Fix bug that converted the album title of the `MediaQueueItem` to the
42+
artist in the Media3 media item
43+
([#1255](https://github.com/androidx/media/pull/1255)).
4144
* Test Utilities:
4245
* Remove deprecated symbols:
4346
* Demo app:

libraries/cast/src/main/java/androidx/media3/cast/DefaultMediaItemConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public MediaItem toMediaItem(MediaQueueItem mediaQueueItem) {
6868
metadataBuilder.setAlbumArtist(metadata.getString(MediaMetadata.KEY_ALBUM_ARTIST));
6969
}
7070
if (metadata.containsKey(MediaMetadata.KEY_ALBUM_TITLE)) {
71-
metadataBuilder.setArtist(metadata.getString(MediaMetadata.KEY_ALBUM_TITLE));
71+
metadataBuilder.setAlbumTitle(metadata.getString(MediaMetadata.KEY_ALBUM_TITLE));
7272
}
7373
if (!metadata.getImages().isEmpty()) {
7474
metadataBuilder.setArtworkUri(metadata.getImages().get(0).getUrl());

libraries/cast/src/test/java/androidx/media3/cast/DefaultMediaItemConverterTest.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,17 @@ public void serialize_deserialize_complete() {
5252
builder
5353
.setMediaId("fooBar")
5454
.setUri(Uri.parse("http://example.com"))
55-
.setMediaMetadata(MediaMetadata.EMPTY)
55+
.setMediaMetadata(
56+
new MediaMetadata.Builder()
57+
.setTitle("testTitle")
58+
.setSubtitle("testSubtitle")
59+
.setArtist("testArtist")
60+
.setAlbumArtist("testAlbumArtist")
61+
.setArtworkUri(Uri.parse("http://testArtworkUri"))
62+
.setComposer("testComposer")
63+
.setDiscNumber(42)
64+
.setTrackNumber(23)
65+
.build())
5666
.setMimeType(MimeTypes.APPLICATION_MPD)
5767
.setDrmConfiguration(
5868
new MediaItem.DrmConfiguration.Builder(C.WIDEVINE_UUID)

0 commit comments

Comments
 (0)