loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1255 from phcannesson:fix-cast-media-item-conversion

Browse Source 
PiperOrigin-RevId: 624147863
This commit is contained in:
Copybara-Service 2024-04-12 05:45:50 -07:00
commit f13c879cd0
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASENOTES.md
View File

@ -38,6 +38,9 @@
* Decoder Extensions (FFmpeg, VP9, AV1, MIDI, etc.): * Decoder Extensions (FFmpeg, VP9, AV1, MIDI, etc.):
* Leanback extension: * Leanback extension:
* Cast 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: * Test Utilities:
* Remove deprecated symbols: * Remove deprecated symbols:
* Demo app: * Demo app:

2
libraries/cast/src/main/java/androidx/media3/cast/DefaultMediaItemConverter.java
View File

@ -68,7 +68,7 @@ public final class DefaultMediaItemConverter implements MediaItemConverter {
metadataBuilder.setAlbumArtist(metadata.getString(MediaMetadata.KEY_ALBUM_ARTIST)); metadataBuilder.setAlbumArtist(metadata.getString(MediaMetadata.KEY_ALBUM_ARTIST));
} }
if (metadata.containsKey(MediaMetadata.KEY_ALBUM_TITLE)) { 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()) { if (!metadata.getImages().isEmpty()) {
metadataBuilder.setArtworkUri(metadata.getImages().get(0).getUrl()); metadataBuilder.setArtworkUri(metadata.getImages().get(0).getUrl());

12
libraries/cast/src/test/java/androidx/media3/cast/DefaultMediaItemConverterTest.java
View File

@ -52,7 +52,17 @@ public class DefaultMediaItemConverterTest {
builder builder
.setMediaId("fooBar") .setMediaId("fooBar")
.setUri(Uri.parse("http://example.com")) .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) .setMimeType(MimeTypes.APPLICATION_MPD)
.setDrmConfiguration( .setDrmConfiguration(
new MediaItem.DrmConfiguration.Builder(C.WIDEVINE_UUID) new MediaItem.DrmConfiguration.Builder(C.WIDEVINE_UUID)