Skip to content

SDK / exoplayer

Go to a project
Commit 9d059352 by tonihei Committed by Ian Baker
Options

Replace MediaMetadata folderType by isBrowsable 

The folder type has a mix of information about the item. It shows
whether the item is browsable (type != FOLDER_TYPE_NONE) and
which Bluetooth folder type to set for legacy session information.

It's a lot clearer to split this into a boolean isBrowsable and
use the existing mediaType to map back to the bluetooth folder type
where required.

folderType is not marked as deprecated yet as this would be an API
change, which will be done later.

PiperOrigin-RevId: 493544589
parent 3a66c28d
Inline Side-by-side
Showing with 183 additions and 5 deletions
library/common/src/main/java/com/google/android/exoplayer2/MediaMetadata.java
...@@ -61,6 +61,7 @@ public final class MediaMetadata implements Bundleable { ...@@ -61,6 +61,7 @@ public final class MediaMetadata implements Bundleable {
@Nullable private Integer trackNumber; @Nullable private Integer trackNumber;
@Nullable private Integer totalTrackCount; @Nullable private Integer totalTrackCount;
@Nullable private @FolderType Integer folderType; @Nullable private @FolderType Integer folderType;
@Nullable private Boolean isBrowsable;
@Nullable private Boolean isPlayable; @Nullable private Boolean isPlayable;
@Nullable private Integer recordingYear; @Nullable private Integer recordingYear;
@Nullable private Integer recordingMonth; @Nullable private Integer recordingMonth;
...@@ -97,6 +98,7 @@ public final class MediaMetadata implements Bundleable { ...@@ -97,6 +98,7 @@ public final class MediaMetadata implements Bundleable {
this.trackNumber = mediaMetadata.trackNumber; this.trackNumber = mediaMetadata.trackNumber;
this.totalTrackCount = mediaMetadata.totalTrackCount; this.totalTrackCount = mediaMetadata.totalTrackCount;
this.folderType = mediaMetadata.folderType; this.folderType = mediaMetadata.folderType;
this.isBrowsable = mediaMetadata.isBrowsable;
this.isPlayable = mediaMetadata.isPlayable; this.isPlayable = mediaMetadata.isPlayable;
this.recordingYear = mediaMetadata.recordingYear; this.recordingYear = mediaMetadata.recordingYear;
this.recordingMonth = mediaMetadata.recordingMonth; this.recordingMonth = mediaMetadata.recordingMonth;
...@@ -245,13 +247,25 @@ public final class MediaMetadata implements Bundleable { ...@@ -245,13 +247,25 @@ public final class MediaMetadata implements Bundleable {
return this; return this;
} }
/** Sets the {@link FolderType}. */ /**
* Sets the {@link FolderType}.
*
* <p>This method will be deprecated. Use {@link #setIsBrowsable} to indicate if an item is a
* browsable folder and use {@link #setMediaType} to indicate the type of the folder.
*/
@CanIgnoreReturnValue @CanIgnoreReturnValue
public Builder setFolderType(@Nullable @FolderType Integer folderType) { public Builder setFolderType(@Nullable @FolderType Integer folderType) {
this.folderType = folderType; this.folderType = folderType;
return this; return this;
} }
/** Sets whether the media is a browsable folder. */
@CanIgnoreReturnValue
public Builder setIsBrowsable(@Nullable Boolean isBrowsable) {
this.isBrowsable = isBrowsable;
return this;
}
/** Sets whether the media is playable. */ /** Sets whether the media is playable. */
@CanIgnoreReturnValue @CanIgnoreReturnValue
public Builder setIsPlayable(@Nullable Boolean isPlayable) { public Builder setIsPlayable(@Nullable Boolean isPlayable) {
...@@ -485,6 +499,9 @@ public final class MediaMetadata implements Bundleable { ...@@ -485,6 +499,9 @@ public final class MediaMetadata implements Bundleable {
if (mediaMetadata.folderType != null) { if (mediaMetadata.folderType != null) {
setFolderType(mediaMetadata.folderType); setFolderType(mediaMetadata.folderType);
} }
if (mediaMetadata.isBrowsable != null) {
setIsBrowsable(mediaMetadata.isBrowsable);
}
if (mediaMetadata.isPlayable != null) { if (mediaMetadata.isPlayable != null) {
setIsPlayable(mediaMetadata.isPlayable); setIsPlayable(mediaMetadata.isPlayable);
} }
...@@ -867,9 +884,16 @@ public final class MediaMetadata implements Bundleable { ...@@ -867,9 +884,16 @@ public final class MediaMetadata implements Bundleable {
@Nullable public final Integer trackNumber; @Nullable public final Integer trackNumber;
/** Optional total number of tracks. */ /** Optional total number of tracks. */
@Nullable public final Integer totalTrackCount; @Nullable public final Integer totalTrackCount;
/** Optional {@link FolderType}. */ /**
* Optional {@link FolderType}.
*
* <p>This field will be deprecated. Use {@link #isBrowsable} to indicate if an item is a
* browsable folder and use {@link #mediaType} to indicate the type of the folder.
*/
@Nullable public final @FolderType Integer folderType; @Nullable public final @FolderType Integer folderType;
/** Optional boolean for media playability. */ /** Optional boolean to indicate that the media is a browsable folder. */
@Nullable public final Boolean isBrowsable;
/** Optional boolean to indicate that the media is playable. */
@Nullable public final Boolean isPlayable; @Nullable public final Boolean isPlayable;
/** /**
* @deprecated Use {@link #recordingYear} instead. * @deprecated Use {@link #recordingYear} instead.
...@@ -932,6 +956,22 @@ public final class MediaMetadata implements Bundleable { ...@@ -932,6 +956,22 @@ public final class MediaMetadata implements Bundleable {
@Nullable public final Bundle extras; @Nullable public final Bundle extras;
private MediaMetadata(Builder builder) { private MediaMetadata(Builder builder) {
// Handle compatibility for deprecated fields.
@Nullable Boolean isBrowsable = builder.isBrowsable;
@Nullable Integer folderType = builder.folderType;
@Nullable Integer mediaType = builder.mediaType;
if (isBrowsable != null) {
if (!isBrowsable) {
folderType = FOLDER_TYPE_NONE;
} else if (folderType == null || folderType == FOLDER_TYPE_NONE) {
folderType = mediaType != null ? getFolderTypeFromMediaType(mediaType) : FOLDER_TYPE_MIXED;
}
} else if (folderType != null) {
isBrowsable = folderType != FOLDER_TYPE_NONE;
if (isBrowsable && mediaType == null) {
mediaType = getMediaTypeFromFolderType(folderType);
}
}
this.title = builder.title; this.title = builder.title;
this.artist = builder.artist; this.artist = builder.artist;
this.albumTitle = builder.albumTitle; this.albumTitle = builder.albumTitle;
...@@ -946,7 +986,8 @@ public final class MediaMetadata implements Bundleable { ...@@ -946,7 +986,8 @@ public final class MediaMetadata implements Bundleable {
this.artworkUri = builder.artworkUri; this.artworkUri = builder.artworkUri;
this.trackNumber = builder.trackNumber; this.trackNumber = builder.trackNumber;
this.totalTrackCount = builder.totalTrackCount; this.totalTrackCount = builder.totalTrackCount;
this.folderType = builder.folderType; this.folderType = folderType;
this.isBrowsable = isBrowsable;
this.isPlayable = builder.isPlayable; this.isPlayable = builder.isPlayable;
this.year = builder.recordingYear; this.year = builder.recordingYear;
this.recordingYear = builder.recordingYear; this.recordingYear = builder.recordingYear;
...@@ -963,7 +1004,7 @@ public final class MediaMetadata implements Bundleable { ...@@ -963,7 +1004,7 @@ public final class MediaMetadata implements Bundleable {
this.genre = builder.genre; this.genre = builder.genre;
this.compilation = builder.compilation; this.compilation = builder.compilation;
this.station = builder.station; this.station = builder.station;
this.mediaType = builder.mediaType; this.mediaType = mediaType;
this.extras = builder.extras; this.extras = builder.extras;
} }
...@@ -996,6 +1037,7 @@ public final class MediaMetadata implements Bundleable { ...@@ -996,6 +1037,7 @@ public final class MediaMetadata implements Bundleable {
&& Util.areEqual(trackNumber, that.trackNumber) && Util.areEqual(trackNumber, that.trackNumber)
&& Util.areEqual(totalTrackCount, that.totalTrackCount) && Util.areEqual(totalTrackCount, that.totalTrackCount)
&& Util.areEqual(folderType, that.folderType) && Util.areEqual(folderType, that.folderType)
&& Util.areEqual(isBrowsable, that.isBrowsable)
&& Util.areEqual(isPlayable, that.isPlayable) && Util.areEqual(isPlayable, that.isPlayable)
&& Util.areEqual(recordingYear, that.recordingYear) && Util.areEqual(recordingYear, that.recordingYear)
&& Util.areEqual(recordingMonth, that.recordingMonth) && Util.areEqual(recordingMonth, that.recordingMonth)
...@@ -1032,6 +1074,7 @@ public final class MediaMetadata implements Bundleable { ...@@ -1032,6 +1074,7 @@ public final class MediaMetadata implements Bundleable {
trackNumber, trackNumber,
totalTrackCount, totalTrackCount,
folderType, folderType,
isBrowsable,
isPlayable, isPlayable,
recordingYear, recordingYear,
recordingMonth, recordingMonth,
...@@ -1088,6 +1131,7 @@ public final class MediaMetadata implements Bundleable { ...@@ -1088,6 +1131,7 @@ public final class MediaMetadata implements Bundleable {
FIELD_COMPILATION, FIELD_COMPILATION,
FIELD_STATION, FIELD_STATION,
FIELD_MEDIA_TYPE, FIELD_MEDIA_TYPE,
FIELD_IS_BROWSABLE,
FIELD_EXTRAS, FIELD_EXTRAS,
}) })
private @interface FieldNumber {} private @interface FieldNumber {}
...@@ -1124,6 +1168,7 @@ public final class MediaMetadata implements Bundleable { ...@@ -1124,6 +1168,7 @@ public final class MediaMetadata implements Bundleable {
private static final int FIELD_ARTWORK_DATA_TYPE = 29; private static final int FIELD_ARTWORK_DATA_TYPE = 29;
private static final int FIELD_STATION = 30; private static final int FIELD_STATION = 30;
private static final int FIELD_MEDIA_TYPE = 31; private static final int FIELD_MEDIA_TYPE = 31;
private static final int FIELD_IS_BROWSABLE = 32;
private static final int FIELD_EXTRAS = 1000; private static final int FIELD_EXTRAS = 1000;
@Override @Override
...@@ -1160,6 +1205,9 @@ public final class MediaMetadata implements Bundleable { ...@@ -1160,6 +1205,9 @@ public final class MediaMetadata implements Bundleable {
if (folderType != null) { if (folderType != null) {
bundle.putInt(keyForField(FIELD_FOLDER_TYPE), folderType); bundle.putInt(keyForField(FIELD_FOLDER_TYPE), folderType);
} }
if (isBrowsable != null) {
bundle.putBoolean(keyForField(FIELD_IS_BROWSABLE), isBrowsable);
}
if (isPlayable != null) { if (isPlayable != null) {
bundle.putBoolean(keyForField(FIELD_IS_PLAYABLE), isPlayable); bundle.putBoolean(keyForField(FIELD_IS_PLAYABLE), isPlayable);
} }
...@@ -1247,6 +1295,9 @@ public final class MediaMetadata implements Bundleable { ...@@ -1247,6 +1295,9 @@ public final class MediaMetadata implements Bundleable {
if (bundle.containsKey(keyForField(FIELD_FOLDER_TYPE))) { if (bundle.containsKey(keyForField(FIELD_FOLDER_TYPE))) {
builder.setFolderType(bundle.getInt(keyForField(FIELD_FOLDER_TYPE))); builder.setFolderType(bundle.getInt(keyForField(FIELD_FOLDER_TYPE)));
} }
if (bundle.containsKey(keyForField(FIELD_IS_BROWSABLE))) {
builder.setIsBrowsable(bundle.getBoolean(keyForField(FIELD_IS_BROWSABLE)));
}
if (bundle.containsKey(keyForField(FIELD_IS_PLAYABLE))) { if (bundle.containsKey(keyForField(FIELD_IS_PLAYABLE))) {
builder.setIsPlayable(bundle.getBoolean(keyForField(FIELD_IS_PLAYABLE))); builder.setIsPlayable(bundle.getBoolean(keyForField(FIELD_IS_PLAYABLE)));
} }
...@@ -1284,4 +1335,74 @@ public final class MediaMetadata implements Bundleable { ...@@ -1284,4 +1335,74 @@ public final class MediaMetadata implements Bundleable {
private static String keyForField(@FieldNumber int field) { private static String keyForField(@FieldNumber int field) {
return Integer.toString(field, Character.MAX_RADIX); return Integer.toString(field, Character.MAX_RADIX);
} }
private static @FolderType int getFolderTypeFromMediaType(@MediaType int mediaType) {
switch (mediaType) {
case MEDIA_TYPE_ALBUM:
case MEDIA_TYPE_ARTIST:
case MEDIA_TYPE_AUDIO_BOOK:
case MEDIA_TYPE_AUDIO_BOOK_CHAPTER:
case MEDIA_TYPE_FOLDER_MOVIES:
case MEDIA_TYPE_FOLDER_NEWS:
case MEDIA_TYPE_FOLDER_RADIO_STATIONS:
case MEDIA_TYPE_FOLDER_TRAILERS:
case MEDIA_TYPE_FOLDER_VIDEOS:
case MEDIA_TYPE_GENRE:
case MEDIA_TYPE_MOVIE:
case MEDIA_TYPE_MUSIC:
case MEDIA_TYPE_NEWS:
case MEDIA_TYPE_PLAYLIST:
case MEDIA_TYPE_PODCAST:
case MEDIA_TYPE_PODCAST_EPISODE:
case MEDIA_TYPE_RADIO_STATION:
case MEDIA_TYPE_TRAILER:
case MEDIA_TYPE_TV_CHANNEL:
case MEDIA_TYPE_TV_SEASON:
case MEDIA_TYPE_TV_SERIES:
case MEDIA_TYPE_TV_SHOW:
case MEDIA_TYPE_VIDEO:
case MEDIA_TYPE_YEAR:
return FOLDER_TYPE_TITLES;
case MEDIA_TYPE_FOLDER_ALBUMS:
return FOLDER_TYPE_ALBUMS;
case MEDIA_TYPE_FOLDER_ARTISTS:
return FOLDER_TYPE_ARTISTS;
case MEDIA_TYPE_FOLDER_GENRES:
return FOLDER_TYPE_GENRES;
case MEDIA_TYPE_FOLDER_PLAYLISTS:
return FOLDER_TYPE_PLAYLISTS;
case MEDIA_TYPE_FOLDER_YEARS:
return FOLDER_TYPE_YEARS;
case MEDIA_TYPE_FOLDER_AUDIO_BOOKS:
case MEDIA_TYPE_FOLDER_MIXED:
case MEDIA_TYPE_FOLDER_TV_CHANNELS:
case MEDIA_TYPE_FOLDER_TV_SERIES:
case MEDIA_TYPE_FOLDER_TV_SHOWS:
case MEDIA_TYPE_FOLDER_PODCASTS:
case MEDIA_TYPE_MIXED:
default:
return FOLDER_TYPE_MIXED;
}
}
private static @MediaType int getMediaTypeFromFolderType(@FolderType int folderType) {
switch (folderType) {
case FOLDER_TYPE_ALBUMS:
return MEDIA_TYPE_FOLDER_ALBUMS;
case FOLDER_TYPE_ARTISTS:
return MEDIA_TYPE_FOLDER_ARTISTS;
case FOLDER_TYPE_GENRES:
return MEDIA_TYPE_FOLDER_GENRES;
case FOLDER_TYPE_PLAYLISTS:
return MEDIA_TYPE_FOLDER_PLAYLISTS;
case FOLDER_TYPE_TITLES:
return MEDIA_TYPE_MIXED;
case FOLDER_TYPE_YEARS:
return MEDIA_TYPE_FOLDER_YEARS;
case FOLDER_TYPE_MIXED:
case FOLDER_TYPE_NONE:
default:
return MEDIA_TYPE_FOLDER_MIXED;
}
}
} }
library/common/src/test/java/com/google/android/exoplayer2/MediaMetadataTest.java
...@@ -49,6 +49,7 @@ public class MediaMetadataTest { ...@@ -49,6 +49,7 @@ public class MediaMetadataTest {
assertThat(mediaMetadata.trackNumber).isNull(); assertThat(mediaMetadata.trackNumber).isNull();
assertThat(mediaMetadata.totalTrackCount).isNull(); assertThat(mediaMetadata.totalTrackCount).isNull();
assertThat(mediaMetadata.folderType).isNull(); assertThat(mediaMetadata.folderType).isNull();
assertThat(mediaMetadata.isBrowsable).isNull();
assertThat(mediaMetadata.isPlayable).isNull(); assertThat(mediaMetadata.isPlayable).isNull();
assertThat(mediaMetadata.recordingYear).isNull(); assertThat(mediaMetadata.recordingYear).isNull();
assertThat(mediaMetadata.recordingMonth).isNull(); assertThat(mediaMetadata.recordingMonth).isNull();
...@@ -115,6 +116,61 @@ public class MediaMetadataTest { ...@@ -115,6 +116,61 @@ public class MediaMetadataTest {
assertThat(fromBundle.extras.getString(EXTRAS_KEY)).isEqualTo(EXTRAS_VALUE); assertThat(fromBundle.extras.getString(EXTRAS_KEY)).isEqualTo(EXTRAS_VALUE);
} }
@Test
public void builderSetFolderType_toNone_setsIsBrowsableToFalse() {
MediaMetadata mediaMetadata =
new MediaMetadata.Builder().setFolderType(MediaMetadata.FOLDER_TYPE_NONE).build();
assertThat(mediaMetadata.isBrowsable).isFalse();
}
@Test
public void builderSetFolderType_toNotNone_setsIsBrowsableToTrueAndMatchingMediaType() {
MediaMetadata mediaMetadata =
new MediaMetadata.Builder().setFolderType(MediaMetadata.FOLDER_TYPE_PLAYLISTS).build();
assertThat(mediaMetadata.isBrowsable).isTrue();
assertThat(mediaMetadata.mediaType).isEqualTo(MediaMetadata.MEDIA_TYPE_FOLDER_PLAYLISTS);
}
@Test
public void
builderSetFolderType_toNotNoneWithManualMediaType_setsIsBrowsableToTrueAndDoesNotOverrideMediaType() {
MediaMetadata mediaMetadata =
new MediaMetadata.Builder()
.setMediaType(MediaMetadata.MEDIA_TYPE_FOLDER_PODCASTS)
.setFolderType(MediaMetadata.FOLDER_TYPE_PLAYLISTS)
.build();
assertThat(mediaMetadata.isBrowsable).isTrue();
assertThat(mediaMetadata.mediaType).isEqualTo(MediaMetadata.MEDIA_TYPE_FOLDER_PODCASTS);
}
@Test
public void builderSetIsBrowsable_toTrueWithoutMediaType_setsFolderTypeToMixed() {
MediaMetadata mediaMetadata = new MediaMetadata.Builder().setIsBrowsable(true).build();
assertThat(mediaMetadata.folderType).isEqualTo(MediaMetadata.FOLDER_TYPE_MIXED);
}
@Test
public void builderSetIsBrowsable_toTrueWithMediaType_setsFolderTypeToMatchMediaType() {
MediaMetadata mediaMetadata =
new MediaMetadata.Builder()
.setIsBrowsable(true)
.setMediaType(MediaMetadata.MEDIA_TYPE_FOLDER_ARTISTS)
.build();
assertThat(mediaMetadata.folderType).isEqualTo(MediaMetadata.FOLDER_TYPE_ARTISTS);
}
@Test
public void builderSetFolderType_toFalse_setsFolderTypeToNone() {
MediaMetadata mediaMetadata = new MediaMetadata.Builder().setIsBrowsable(false).build();
assertThat(mediaMetadata.folderType).isEqualTo(MediaMetadata.FOLDER_TYPE_NONE);
}
private static MediaMetadata getFullyPopulatedMediaMetadata() { private static MediaMetadata getFullyPopulatedMediaMetadata() {
Bundle extras = new Bundle(); Bundle extras = new Bundle();
extras.putString(EXTRAS_KEY, EXTRAS_VALUE); extras.putString(EXTRAS_KEY, EXTRAS_VALUE);
...@@ -135,6 +191,7 @@ public class MediaMetadataTest { ...@@ -135,6 +191,7 @@ public class MediaMetadataTest {
.setTrackNumber(4) .setTrackNumber(4)
.setTotalTrackCount(12) .setTotalTrackCount(12)
.setFolderType(MediaMetadata.FOLDER_TYPE_PLAYLISTS) .setFolderType(MediaMetadata.FOLDER_TYPE_PLAYLISTS)
.setIsBrowsable(true)
.setIsPlayable(true) .setIsPlayable(true)
.setRecordingYear(2000) .setRecordingYear(2000)
.setRecordingMonth(11) .setRecordingMonth(11)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment