Skip to content

SDK / exoplayer

Go to a project
Commit 3fc61bb7 by tonihei Committed by Ian Baker
Options

Deprecate MediaMetadata folderType and stabilize mediaType+isBrowsable 

PiperOrigin-RevId: 522058915
parent e4194fc8
Expand all
Inline Side-by-side
Showing with 22 additions and 7 deletions
RELEASENOTES.md
...@@ -52,6 +52,9 @@ ...@@ -52,6 +52,9 @@
`onAudioCapabilitiesChanged` in `AudioSink.Listener` interface, and a `onAudioCapabilitiesChanged` in `AudioSink.Listener` interface, and a
new interface `RendererCapabilities.Listener` which triggers new interface `RendererCapabilities.Listener` which triggers
`onRendererCapabilitiesChanged` events. `onRendererCapabilitiesChanged` events.
* Metadata:
* Deprecate `MediaMetadata.folderType` in favor of `isBrowsable` and
`mediaType`.
* DRM: * DRM:
* Reduce the visibility of several internal-only methods on * Reduce the visibility of several internal-only methods on
`DefaultDrmSession` that aren't expected to be called from outside the `DefaultDrmSession` that aren't expected to be called from outside the
......
libraries/common/src/test/java/androidx/media3/common/MediaMetadataTest.java
...@@ -30,6 +30,7 @@ public class MediaMetadataTest { ...@@ -30,6 +30,7 @@ public class MediaMetadataTest {
private static final String EXTRAS_KEY = "exampleKey"; private static final String EXTRAS_KEY = "exampleKey";
private static final String EXTRAS_VALUE = "exampleValue"; private static final String EXTRAS_VALUE = "exampleValue";
@SuppressWarnings("deprecation") // Testing deprecated field.
@Test @Test
public void builder_minimal_correctDefaults() { public void builder_minimal_correctDefaults() {
MediaMetadata mediaMetadata = new MediaMetadata.Builder().build(); MediaMetadata mediaMetadata = new MediaMetadata.Builder().build();
...@@ -134,6 +135,7 @@ public class MediaMetadataTest { ...@@ -134,6 +135,7 @@ public class MediaMetadataTest {
assertThat(mediaMetadataFromBundle.extras.getString(EXTRAS_KEY)).isEqualTo(EXTRAS_VALUE); assertThat(mediaMetadataFromBundle.extras.getString(EXTRAS_KEY)).isEqualTo(EXTRAS_VALUE);
} }
@SuppressWarnings("deprecation") // Testing deprecated setter.
@Test @Test
public void builderSetFolderType_toNone_setsIsBrowsableToFalse() { public void builderSetFolderType_toNone_setsIsBrowsableToFalse() {
MediaMetadata mediaMetadata = MediaMetadata mediaMetadata =
...@@ -142,6 +144,7 @@ public class MediaMetadataTest { ...@@ -142,6 +144,7 @@ public class MediaMetadataTest {
assertThat(mediaMetadata.isBrowsable).isFalse(); assertThat(mediaMetadata.isBrowsable).isFalse();
} }
@SuppressWarnings("deprecation") // Testing deprecated setter.
@Test @Test
public void builderSetFolderType_toNotNone_setsIsBrowsableToTrueAndMatchingMediaType() { public void builderSetFolderType_toNotNone_setsIsBrowsableToTrueAndMatchingMediaType() {
MediaMetadata mediaMetadata = MediaMetadata mediaMetadata =
...@@ -151,6 +154,7 @@ public class MediaMetadataTest { ...@@ -151,6 +154,7 @@ public class MediaMetadataTest {
assertThat(mediaMetadata.mediaType).isEqualTo(MediaMetadata.MEDIA_TYPE_FOLDER_PLAYLISTS); assertThat(mediaMetadata.mediaType).isEqualTo(MediaMetadata.MEDIA_TYPE_FOLDER_PLAYLISTS);
} }
@SuppressWarnings("deprecation") // Testing deprecated setter.
@Test @Test
public void public void
builderSetFolderType_toNotNoneWithManualMediaType_setsIsBrowsableToTrueAndDoesNotOverrideMediaType() { builderSetFolderType_toNotNoneWithManualMediaType_setsIsBrowsableToTrueAndDoesNotOverrideMediaType() {
...@@ -164,6 +168,7 @@ public class MediaMetadataTest { ...@@ -164,6 +168,7 @@ public class MediaMetadataTest {
assertThat(mediaMetadata.mediaType).isEqualTo(MediaMetadata.MEDIA_TYPE_FOLDER_PODCASTS); assertThat(mediaMetadata.mediaType).isEqualTo(MediaMetadata.MEDIA_TYPE_FOLDER_PODCASTS);
} }
@SuppressWarnings("deprecation") // Testing deprecated field.
@Test @Test
public void builderSetIsBrowsable_toTrueWithoutMediaType_setsFolderTypeToMixed() { public void builderSetIsBrowsable_toTrueWithoutMediaType_setsFolderTypeToMixed() {
MediaMetadata mediaMetadata = new MediaMetadata.Builder().setIsBrowsable(true).build(); MediaMetadata mediaMetadata = new MediaMetadata.Builder().setIsBrowsable(true).build();
...@@ -171,6 +176,7 @@ public class MediaMetadataTest { ...@@ -171,6 +176,7 @@ public class MediaMetadataTest {
assertThat(mediaMetadata.folderType).isEqualTo(MediaMetadata.FOLDER_TYPE_MIXED); assertThat(mediaMetadata.folderType).isEqualTo(MediaMetadata.FOLDER_TYPE_MIXED);
} }
@SuppressWarnings("deprecation") // Testing deprecated field.
@Test @Test
public void builderSetIsBrowsable_toTrueWithMediaType_setsFolderTypeToMatchMediaType() { public void builderSetIsBrowsable_toTrueWithMediaType_setsFolderTypeToMatchMediaType() {
MediaMetadata mediaMetadata = MediaMetadata mediaMetadata =
...@@ -182,6 +188,7 @@ public class MediaMetadataTest { ...@@ -182,6 +188,7 @@ public class MediaMetadataTest {
assertThat(mediaMetadata.folderType).isEqualTo(MediaMetadata.FOLDER_TYPE_ARTISTS); assertThat(mediaMetadata.folderType).isEqualTo(MediaMetadata.FOLDER_TYPE_ARTISTS);
} }
@SuppressWarnings("deprecation") // Testing deprecated field.
@Test @Test
public void builderSetFolderType_toFalse_setsFolderTypeToNone() { public void builderSetFolderType_toFalse_setsFolderTypeToNone() {
MediaMetadata mediaMetadata = new MediaMetadata.Builder().setIsBrowsable(false).build(); MediaMetadata mediaMetadata = new MediaMetadata.Builder().setIsBrowsable(false).build();
...@@ -189,6 +196,7 @@ public class MediaMetadataTest { ...@@ -189,6 +196,7 @@ public class MediaMetadataTest {
assertThat(mediaMetadata.folderType).isEqualTo(MediaMetadata.FOLDER_TYPE_NONE); assertThat(mediaMetadata.folderType).isEqualTo(MediaMetadata.FOLDER_TYPE_NONE);
} }
@SuppressWarnings("deprecation") // Setting deprecated fields.
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);
......
libraries/session/src/main/java/androidx/media3/session/LibraryResult.java
...@@ -176,8 +176,8 @@ public final class LibraryResult<V> implements Bundleable { ...@@ -176,8 +176,8 @@ public final class LibraryResult<V> implements Bundleable {
/** /**
* Creates an instance with a media item and {@link #resultCode}{@code ==}{@link #RESULT_SUCCESS}. * Creates an instance with a media item and {@link #resultCode}{@code ==}{@link #RESULT_SUCCESS}.
* *
* <p>The {@link MediaItem#mediaMetadata} must specify {@link MediaMetadata#isBrowsable} (or * <p>The {@link MediaItem#mediaMetadata} must specify {@link MediaMetadata#isBrowsable} and
* {@link MediaMetadata#folderType}) and {@link MediaMetadata#isPlayable} fields. * {@link MediaMetadata#isPlayable} fields.
* *
* @param item The media item. * @param item The media item.
* @param params The optional parameters to describe the media item. * @param params The optional parameters to describe the media item.
...@@ -193,8 +193,7 @@ public final class LibraryResult<V> implements Bundleable { ...@@ -193,8 +193,7 @@ public final class LibraryResult<V> implements Bundleable {
* #RESULT_SUCCESS}. * #RESULT_SUCCESS}.
* *
* <p>The {@link MediaItem#mediaMetadata} of each item in the list must specify {@link * <p>The {@link MediaItem#mediaMetadata} of each item in the list must specify {@link
* MediaMetadata#isBrowsable} (or {@link MediaMetadata#folderType}) and {@link * MediaMetadata#isBrowsable} and {@link MediaMetadata#isPlayable} fields.
* MediaMetadata#isPlayable} fields.
* *
* @param items The list of media items. * @param items The list of media items.
* @param params The optional parameters to describe the list of media items. * @param params The optional parameters to describe the list of media items.
......
libraries/session/src/main/java/androidx/media3/session/MediaLibraryService.java
...@@ -119,9 +119,8 @@ public abstract class MediaLibraryService extends MediaSessionService { ...@@ -119,9 +119,8 @@ public abstract class MediaLibraryService extends MediaSessionService {
* An extended {@link MediaSession.Callback} for the {@link MediaLibrarySession}. * An extended {@link MediaSession.Callback} for the {@link MediaLibrarySession}.
* *
* <p>When you return {@link LibraryResult} with {@link MediaItem media items}, each item must * <p>When you return {@link LibraryResult} with {@link MediaItem media items}, each item must
* have valid {@link MediaItem#mediaId} and specify {@link MediaMetadata#isBrowsable} (or {@link * have valid {@link MediaItem#mediaId} and specify {@link MediaMetadata#isBrowsable} and {@link
* MediaMetadata#folderType}) and {@link MediaMetadata#isPlayable} in its {@link * MediaMetadata#isPlayable} in its {@link MediaItem#mediaMetadata}.
* MediaItem#mediaMetadata}.
*/ */
public interface Callback extends MediaSession.Callback { public interface Callback extends MediaSession.Callback {
......
libraries/session/src/main/java/androidx/media3/session/MediaUtils.java
...@@ -317,6 +317,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -317,6 +317,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
} }
/** Converts a {@link MediaItem} to a {@link MediaDescriptionCompat} */ /** Converts a {@link MediaItem} to a {@link MediaDescriptionCompat} */
@SuppressWarnings("deprecation") // Converting deprecated fields.
public static MediaDescriptionCompat convertToMediaDescriptionCompat( public static MediaDescriptionCompat convertToMediaDescriptionCompat(
MediaItem item, @Nullable Bitmap artworkBitmap) { MediaItem item, @Nullable Bitmap artworkBitmap) {
MediaDescriptionCompat.Builder builder = MediaDescriptionCompat.Builder builder =
...@@ -372,6 +373,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -372,6 +373,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
descriptionCompat, ratingType, /* browsable= */ false, /* playable= */ true); descriptionCompat, ratingType, /* browsable= */ false, /* playable= */ true);
} }
@SuppressWarnings("deprecation") // Populating deprecated fields.
private static MediaMetadata convertToMediaMetadata( private static MediaMetadata convertToMediaMetadata(
@Nullable MediaDescriptionCompat descriptionCompat, @Nullable MediaDescriptionCompat descriptionCompat,
@RatingCompat.Style int ratingType, @RatingCompat.Style int ratingType,
...@@ -425,6 +427,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -425,6 +427,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
} }
/** Creates {@link MediaMetadata} from the {@link MediaMetadataCompat} and rating type. */ /** Creates {@link MediaMetadata} from the {@link MediaMetadataCompat} and rating type. */
@SuppressWarnings("deprecation") // Populating deprecated fields.
public static MediaMetadata convertToMediaMetadata( public static MediaMetadata convertToMediaMetadata(
@Nullable MediaMetadataCompat metadataCompat, @RatingCompat.Style int ratingType) { @Nullable MediaMetadataCompat metadataCompat, @RatingCompat.Style int ratingType) {
if (metadataCompat == null) { if (metadataCompat == null) {
...@@ -547,6 +550,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -547,6 +550,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
* duration should be included. * duration should be included.
* @return An instance of the legacy {@link MediaMetadataCompat}. * @return An instance of the legacy {@link MediaMetadataCompat}.
*/ */
@SuppressWarnings("deprecation") // Converting deprecated fields.
public static MediaMetadataCompat convertToMediaMetadataCompat( public static MediaMetadataCompat convertToMediaMetadataCompat(
MediaMetadata metadata, MediaMetadata metadata,
String mediaId, String mediaId,
...@@ -629,6 +633,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -629,6 +633,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
return builder.build(); return builder.build();
} }
@SuppressWarnings("deprecation") // Converting to deprecated constants.
@MediaMetadata.FolderType @MediaMetadata.FolderType
private static int convertToFolderType(long extraBtFolderType) { private static int convertToFolderType(long extraBtFolderType) {
if (extraBtFolderType == MediaDescriptionCompat.BT_FOLDER_TYPE_MIXED) { if (extraBtFolderType == MediaDescriptionCompat.BT_FOLDER_TYPE_MIXED) {
...@@ -650,6 +655,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -650,6 +655,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
} }
} }
@SuppressWarnings("deprecation") // Converting from deprecated constants.
private static long convertToExtraBtFolderType(@MediaMetadata.FolderType int folderType) { private static long convertToExtraBtFolderType(@MediaMetadata.FolderType int folderType) {
switch (folderType) { switch (folderType) {
case MediaMetadata.FOLDER_TYPE_MIXED: case MediaMetadata.FOLDER_TYPE_MIXED:
......
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