From a786c03a34d2df41b714b1026d9ee571fb3cc40d Mon Sep 17 00:00:00 2001
From: tofunmi <tofunmi@google.com>
Date: Wed, 11 Jan 2023 14:36:02 +0000
Subject: [PATCH] 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
---
 .../com/google/android/exoplayer2/util}/BitmapLoader.java    | 5 +----
 .../com/google/android/exoplayer2/effect/BitmapOverlay.java  | 1 +
 .../google/android/exoplayer2/effect/SimpleBitmapLoader.java | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename library/{effect/src/main/java/com/google/android/exoplayer2/effect => common/src/main/java/com/google/android/exoplayer2/util}/BitmapLoader.java (92%)

diff --git a/library/effect/src/main/java/com/google/android/exoplayer2/effect/BitmapLoader.java b/library/common/src/main/java/com/google/android/exoplayer2/util/BitmapLoader.java
similarity index 92%
rename from library/effect/src/main/java/com/google/android/exoplayer2/effect/BitmapLoader.java
rename to library/common/src/main/java/com/google/android/exoplayer2/util/BitmapLoader.java
index a3f7aad6f8..5b34d78bde 100644
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/BitmapLoader.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/util/BitmapLoader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.google.android.exoplayer2.effect;
+package com.google.android.exoplayer2.util;
 
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ -21,9 +21,6 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.MediaMetadata;
 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. */
 public interface BitmapLoader {
   /** Decodes an image from compressed binary data. */
diff --git a/library/effect/src/main/java/com/google/android/exoplayer2/effect/BitmapOverlay.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/BitmapOverlay.java
index c8a3d967b4..fc2922f308 100644
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/BitmapOverlay.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/BitmapOverlay.java
@@ -21,6 +21,7 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.opengl.GLES20;
 import android.opengl.GLUtils;
+import com.google.android.exoplayer2.util.BitmapLoader;
 import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Size;
diff --git a/library/effect/src/main/java/com/google/android/exoplayer2/effect/SimpleBitmapLoader.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/SimpleBitmapLoader.java
index ccefb887fa..3a6f6efd2e 100644
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/SimpleBitmapLoader.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/SimpleBitmapLoader.java
@@ -22,6 +22,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.util.BitmapLoader;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.io.ByteStreams;