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

Include mediaId when marshalling a MediaItem to JSON

Browse Source 
When sending a MediaItem to a MediaSession with a Media3 MediaController important information is removed for privacy reason. To look up the fully populated MediaItem the mediaId is used as a key. Hence having the mediaId marhalled to the JSON representation that is sent to a Cast device enables app developers to use the same look up facilities.

#minor-release

PiperOrigin-RevId: 420022868
This commit is contained in:
bachinger 2022-01-06 11:27:37 +00:00
parent 0eeea1e523
commit a0873e6f7d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@ public final class DefaultMediaItemConverter implements MediaItemConverter {
private static final String KEY_MEDIA_ITEM = "mediaItem"; private static final String KEY_MEDIA_ITEM = "mediaItem";
private static final String KEY_PLAYER_CONFIG = "exoPlayerConfig"; private static final String KEY_PLAYER_CONFIG = "exoPlayerConfig";
private static final String KEY_MEDIA_ID = "mediaId";
private static final String KEY_URI = "uri"; private static final String KEY_URI = "uri";
private static final String KEY_TITLE = "title"; private static final String KEY_TITLE = "title";
private static final String KEY_MIME_TYPE = "mimeType"; private static final String KEY_MIME_TYPE = "mimeType";
@ -79,6 +80,7 @@ public final class DefaultMediaItemConverter implements MediaItemConverter {
JSONObject mediaItemJson = customData.getJSONObject(KEY_MEDIA_ITEM); JSONObject mediaItemJson = customData.getJSONObject(KEY_MEDIA_ITEM);
MediaItem.Builder builder = new MediaItem.Builder(); MediaItem.Builder builder = new MediaItem.Builder();
builder.setUri(Uri.parse(mediaItemJson.getString(KEY_URI))); builder.setUri(Uri.parse(mediaItemJson.getString(KEY_URI)));
builder.setMediaId(mediaItemJson.getString(KEY_MEDIA_ID));
if (mediaItemJson.has(KEY_TITLE)) { if (mediaItemJson.has(KEY_TITLE)) {
androidx.media3.common.MediaMetadata mediaMetadata = androidx.media3.common.MediaMetadata mediaMetadata =
new androidx.media3.common.MediaMetadata.Builder() new androidx.media3.common.MediaMetadata.Builder()
@ -132,6 +134,7 @@ public final class DefaultMediaItemConverter implements MediaItemConverter {
private static JSONObject getMediaItemJson(MediaItem mediaItem) throws JSONException { private static JSONObject getMediaItemJson(MediaItem mediaItem) throws JSONException {
Assertions.checkNotNull(mediaItem.localConfiguration); Assertions.checkNotNull(mediaItem.localConfiguration);
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put(KEY_MEDIA_ID, mediaItem.mediaId);
json.put(KEY_TITLE, mediaItem.mediaMetadata.title); json.put(KEY_TITLE, mediaItem.mediaMetadata.title);
json.put(KEY_URI, mediaItem.localConfiguration.uri.toString()); json.put(KEY_URI, mediaItem.localConfiguration.uri.toString());
json.put(KEY_MIME_TYPE, mediaItem.localConfiguration.mimeType); json.put(KEY_MIME_TYPE, mediaItem.localConfiguration.mimeType);