From 2e90d1d7c6cc3e8bd267f2183f74394ed2c9391a Mon Sep 17 00:00:00 2001 From: Paul-Hubert Cannesson Date: Tue, 9 Apr 2024 17:11:22 +0200 Subject: [PATCH 1/3] Fix album title metadata in media item conversion --- .../java/androidx/media3/cast/DefaultMediaItemConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 97b90b2b4b..aac838f29e 100644 --- a/libraries/cast/src/main/java/androidx/media3/cast/DefaultMediaItemConverter.java +++ b/libraries/cast/src/main/java/androidx/media3/cast/DefaultMediaItemConverter.java @@ -68,7 +68,7 @@ public final class DefaultMediaItemConverter implements MediaItemConverter { metadataBuilder.setAlbumArtist(metadata.getString(MediaMetadata.KEY_ALBUM_ARTIST)); } if (metadata.containsKey(MediaMetadata.KEY_ALBUM_TITLE)) { - metadataBuilder.setArtist(metadata.getString(MediaMetadata.KEY_ALBUM_TITLE)); + metadataBuilder.setAlbumTitle(metadata.getString(MediaMetadata.KEY_ALBUM_TITLE)); } if (!metadata.getImages().isEmpty()) { metadataBuilder.setArtworkUri(metadata.getImages().get(0).getUrl()); From 14fb3860e0a8ae88960974e802ada795349876b1 Mon Sep 17 00:00:00 2001 From: Marc Baechinger Date: Tue, 9 Apr 2024 17:35:40 +0200 Subject: [PATCH 2/3] Update release notes --- RELEASENOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index c97e9ba046..dfe53d64cc 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -31,6 +31,9 @@ * Decoder Extensions (FFmpeg, VP9, AV1, MIDI, etc.): * Leanback extension: * Cast Extension: + * Fix bug that converted the album title of the `MediaQueueItem` to the + artist in the Media3 media item + ([#1255](https://github.com/androidx/media/pull/1255)). * Test Utilities: * Remove deprecated symbols: * Demo app: From 5788286b68dd104522787f48a649fbadbc1e7105 Mon Sep 17 00:00:00 2001 From: Marc Baechinger Date: Fri, 12 Apr 2024 14:16:01 +0200 Subject: [PATCH 3/3] add regression test for DefaultMediaItemConverter --- .../media3/cast/DefaultMediaItemConverterTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 10ac47a62e..d74b470d68 100644 --- a/libraries/cast/src/test/java/androidx/media3/cast/DefaultMediaItemConverterTest.java +++ b/libraries/cast/src/test/java/androidx/media3/cast/DefaultMediaItemConverterTest.java @@ -52,7 +52,16 @@ public class DefaultMediaItemConverterTest { builder .setMediaId("fooBar") .setUri(Uri.parse("http://example.com")) - .setMediaMetadata(MediaMetadata.EMPTY) + .setMediaMetadata(new MediaMetadata.Builder() + .setTitle("testTitle") + .setSubtitle("testSubtitle") + .setArtist("testArtist") + .setAlbumArtist("testAlbumArtist") + .setArtworkUri(Uri.parse("http://testArtworkUri")) + .setComposer("testComposer") + .setDiscNumber(42) + .setTrackNumber(23) + .build()) .setMimeType(MimeTypes.APPLICATION_MPD) .setDrmConfiguration( new MediaItem.DrmConfiguration.Builder(C.WIDEVINE_UUID)