sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add MediaMetadata.EMPTY

Browse source 
PiperOrigin-RevId: 362186928
This commit is contained in:
gyumin 2021-03-11 02:08:35 +00:00 committed by Ian Baker
parent 70f4809323
commit 27477a1980
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverterTest.java
View file

@ -51,7 +51,7 @@ public class DefaultMediaItemConverterTest {
MediaItem item = MediaItem item =
builder builder
.setUri(Uri.parse("http://example.com")) .setUri(Uri.parse("http://example.com"))
.setMediaMetadata(new MediaMetadata.Builder().build()) .setMediaMetadata(MediaMetadata.EMPTY)
.setMimeType(MimeTypes.APPLICATION_MPD) .setMimeType(MimeTypes.APPLICATION_MPD)
.setDrmUuid(C.WIDEVINE_UUID) .setDrmUuid(C.WIDEVINE_UUID)
.setDrmLicenseUri("http://license.com") .setDrmLicenseUri("http://license.com")

4
library/common/src/main/java/com/google/android/exoplayer2/MediaItem.java
View file

@ -604,7 +604,7 @@ public final class MediaItem implements Bundleable {
liveMaxOffsetMs, liveMaxOffsetMs,
liveMinPlaybackSpeed, liveMinPlaybackSpeed,
liveMaxPlaybackSpeed), liveMaxPlaybackSpeed),
mediaMetadata != null ? mediaMetadata : new MediaMetadata.Builder().build()); mediaMetadata != null ? mediaMetadata : MediaMetadata.EMPTY);
} }
} }
@ -1308,7 +1308,7 @@ public final class MediaItem implements Bundleable {
@Nullable Bundle mediaMetadataBundle = bundle.getBundle(keyForField(FIELD_MEDIA_METADATA)); @Nullable Bundle mediaMetadataBundle = bundle.getBundle(keyForField(FIELD_MEDIA_METADATA));
MediaMetadata mediaMetadata; MediaMetadata mediaMetadata;
if (mediaMetadataBundle == null) { if (mediaMetadataBundle == null) {
mediaMetadata = new MediaMetadata.Builder().build(); mediaMetadata = MediaMetadata.EMPTY;
} else { } else {
mediaMetadata = MediaMetadata.CREATOR.fromBundle(mediaMetadataBundle); mediaMetadata = MediaMetadata.CREATOR.fromBundle(mediaMetadataBundle);
} }

5
library/common/src/main/java/com/google/android/exoplayer2/MediaMetadata.java
View file

@ -23,7 +23,7 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
/** Metadata of the {@link MediaItem}. */ /** Metadata of a {@link MediaItem} or a playlist. */
public final class MediaMetadata implements Bundleable { public final class MediaMetadata implements Bundleable {
/** A builder for {@link MediaMetadata} instances. */ /** A builder for {@link MediaMetadata} instances. */
@ -43,6 +43,9 @@ public final class MediaMetadata implements Bundleable {
} }
} }
/** Empty {@link MediaMetadata}. */
public static final MediaMetadata EMPTY = new MediaMetadata.Builder().build();
/** Optional title. */ /** Optional title. */
@Nullable public final String title; @Nullable public final String title;