Skip to content

Fix album title metadata in media item conversion #1255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 3 commits into from
Apr 12, 2024
+14 −2
Merged

Fix album title metadata in media item conversion #1255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e90d1d
Fix album title metadata in media item conversion
phcannesson Apr 9, 2024
14fb386
Update release notes
marcbaechinger Apr 9, 2024
5788286
add regression test for DefaultMediaItemConverter
marcbaechinger Apr 12, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions RELEASENOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion libraries/cast/src/main/java/androidx/media3/cast/DefaultMediaItemConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public MediaItem toMediaItem(MediaQueueItem mediaQueueItem) {
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());
Expand Down
11 changes: 10 additions & 1 deletion libraries/cast/src/test/java/androidx/media3/cast/DefaultMediaItemConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,16 @@ public void serialize_deserialize_complete() {
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)
Expand Down