Move BitmapLoader to common.

The migration strategy is to deprecate `androidx.media3.session.BitmapLoader` and copy the file into common since BitmapLoader is a public interface that apps could be relying on.

PiperOrigin-RevId: 501266521

libraries/effect/src/main/java/androidx/media3/effect/BitmapLoader.java → libraries/common/src/main/java/androidx/media3/common/util/BitmapLoader.java

@@ -13,18 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package androidx.media3.effect;
+package androidx.media3.common.util;
 
 import android.graphics.Bitmap;
 import android.net.Uri;
 import androidx.annotation.Nullable;
 import androidx.media3.common.MediaMetadata;
-import androidx.media3.common.util.UnstableApi;
 import com.google.common.util.concurrent.ListenableFuture;
 
-// TODO(b/258685047): delete this copy once session/BitmapLoader.java is moved to common
-//  (b/194284041, b/258658893).
-
 /** Loads images. */
 @UnstableApi
 public interface BitmapLoader {

libraries/effect/src/main/java/androidx/media3/effect/BitmapOverlay.java

@@ -22,6 +22,7 @@ import android.net.Uri;
 import android.opengl.GLES20;
 import android.opengl.GLUtils;
 import androidx.media3.common.FrameProcessingException;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.GlUtil;
 import androidx.media3.common.util.Size;
 import androidx.media3.common.util.UnstableApi;

libraries/effect/src/main/java/androidx/media3/effect/SimpleBitmapLoader.java

@@ -22,6 +22,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.UnstableApi;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;

libraries/session/src/main/java/androidx/media3/session/BitmapLoader.java

@@ -15,41 +15,11 @@
  */
 package androidx.media3.session;
 
-import android.graphics.Bitmap;
-import android.net.Uri;
-import androidx.annotation.Nullable;
-import androidx.media3.common.MediaMetadata;
 import androidx.media3.common.util.UnstableApi;
-import com.google.common.util.concurrent.ListenableFuture;
 
-/** Loads images. */
+/**
+ * @deprecated Use {@link androidx.media3.common.util.BitmapLoader} instead.
+ */
+@Deprecated
 @UnstableApi
-public interface BitmapLoader {
-  /** Decodes an image from compressed binary data. */
-  ListenableFuture<Bitmap> decodeBitmap(byte[] data);
-
-  /** Loads an image from {@code uri}. */
-  ListenableFuture<Bitmap> loadBitmap(Uri uri);
-
-  /**
-   * Loads an image from {@link MediaMetadata}. Returns null if {@code metadata} doesn't contain
-   * bitmap information.
-   *
-   * <p>By default, the method will try to decode an image from {@link MediaMetadata#artworkData} if
-   * it is present. Otherwise, the method will try to load an image from {@link
-   * MediaMetadata#artworkUri} if it is present. The method will return null if neither {@link
-   * MediaMetadata#artworkData} nor {@link MediaMetadata#artworkUri} is present.
-   */
-  @Nullable
-  default ListenableFuture<Bitmap> loadBitmapFromMetadata(MediaMetadata metadata) {
-    @Nullable ListenableFuture<Bitmap> future;
-    if (metadata.artworkData != null) {
-      future = decodeBitmap(metadata.artworkData);
-    } else if (metadata.artworkUri != null) {
-      future = loadBitmap(metadata.artworkUri);
-    } else {
-      future = null;
-    }
-    return future;
-  }
-}
+public interface BitmapLoader extends androidx.media3.common.util.BitmapLoader {}

libraries/session/src/main/java/androidx/media3/session/CacheBitmapLoader.java

@@ -20,6 +20,7 @@ import static androidx.media3.common.util.Assertions.checkStateNotNull;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.UnstableApi;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Arrays;

libraries/session/src/main/java/androidx/media3/session/MediaBrowser.java

@@ -31,6 +31,7 @@ import androidx.annotation.IntRange;
 import androidx.annotation.Nullable;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.Player;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.Consumer;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;

libraries/session/src/main/java/androidx/media3/session/MediaBrowserImplLegacy.java

@@ -30,6 +30,7 @@ import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.MediaMetadata;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.Log;
 import androidx.media3.session.MediaLibraryService.LibraryParams;
 import com.google.common.collect.ImmutableList;

libraries/session/src/main/java/androidx/media3/session/MediaController.java

@@ -52,6 +52,7 @@ import androidx.media3.common.TrackSelectionParameters;
 import androidx.media3.common.Tracks;
 import androidx.media3.common.VideoSize;
 import androidx.media3.common.text.CueGroup;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.Consumer;
 import androidx.media3.common.util.Log;
 import androidx.media3.common.util.Size;

libraries/session/src/main/java/androidx/media3/session/MediaControllerImplLegacy.java

@@ -65,6 +65,7 @@ import androidx.media3.common.TrackSelectionParameters;
 import androidx.media3.common.Tracks;
 import androidx.media3.common.VideoSize;
 import androidx.media3.common.text.CueGroup;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.Clock;
 import androidx.media3.common.util.ListenerSet;
 import androidx.media3.common.util.Log;

libraries/session/src/main/java/androidx/media3/session/MediaLibraryService.java

@@ -33,6 +33,7 @@ import androidx.media3.common.Bundleable;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.MediaMetadata;
 import androidx.media3.common.Player;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
 import androidx.media3.session.MediaSession.ControllerInfo;

libraries/session/src/main/java/androidx/media3/session/MediaLibrarySessionImpl.java

@@ -34,6 +34,7 @@ import androidx.annotation.Nullable;
 import androidx.collection.ArrayMap;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.Player;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.Log;
 import androidx.media3.session.MediaLibraryService.LibraryParams;
 import androidx.media3.session.MediaLibraryService.MediaLibrarySession;

libraries/session/src/main/java/androidx/media3/session/MediaSession.java

@@ -54,6 +54,7 @@ import androidx.media3.common.Timeline;
 import androidx.media3.common.TrackSelectionParameters;
 import androidx.media3.common.Tracks;
 import androidx.media3.common.VideoSize;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
 import androidx.media3.session.MediaLibraryService.LibraryParams;

libraries/session/src/main/java/androidx/media3/session/MediaSessionImpl.java

@@ -68,6 +68,7 @@ import androidx.media3.common.TrackSelectionParameters;
 import androidx.media3.common.Tracks;
 import androidx.media3.common.VideoSize;
 import androidx.media3.common.text.CueGroup;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.Log;
 import androidx.media3.common.util.Util;
 import androidx.media3.session.MediaSession.ControllerCb;

libraries/session/src/main/java/androidx/media3/session/SimpleBitmapLoader.java

@@ -22,6 +22,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.UnstableApi;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;

libraries/session/src/test/java/androidx/media3/session/DefaultMediaNotificationProviderTest.java

@@ -41,6 +41,7 @@ import androidx.core.app.NotificationCompat;
 import androidx.media3.common.MediaMetadata;
 import androidx.media3.common.Player;
 import androidx.media3.common.Player.Commands;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.common.collect.ImmutableList;

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerMediaSessionCompatCallbackAggregationTest.java

@@ -45,6 +45,7 @@ import androidx.media3.common.Player.Events;
 import androidx.media3.common.Player.PositionInfo;
 import androidx.media3.common.Timeline;
 import androidx.media3.common.Timeline.Window;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.Util;
 import androidx.media3.test.session.common.HandlerThreadTestRule;
 import androidx.test.core.app.ApplicationProvider;

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerWithMediaSessionCompatTest.java

@@ -68,6 +68,7 @@ import androidx.media3.common.Player.PositionInfo;
 import androidx.media3.common.Player.RepeatMode;
 import androidx.media3.common.Player.State;
 import androidx.media3.common.Timeline;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.Util;
 import androidx.media3.test.session.common.HandlerThreadTestRule;
 import androidx.media3.test.session.common.MainLooperTestRule;

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaUtilsTest.java

@@ -58,6 +58,7 @@ import androidx.media3.common.ThumbRating;
 import androidx.media3.common.Timeline;
 import androidx.media3.common.TrackGroup;
 import androidx.media3.common.Tracks;
+import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.session.PlayerInfo.BundlingExclusions;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;