Move interface locations

PiperOrigin-RevId: 702096389

demos/transformer/src/main/java/androidx/media3/demo/transformer/AnimatedLogoOverlay.java

@@ -27,10 +27,10 @@ import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.util.Pair;
 import android.view.animation.LinearInterpolator;
+import androidx.media3.common.OverlaySettings;
 import androidx.media3.common.VideoFrameProcessingException;
 import androidx.media3.common.util.Util;
 import androidx.media3.effect.DrawableOverlay;
-import androidx.media3.effect.OverlaySettings;
 import androidx.media3.effect.TextureOverlay;
 import java.util.concurrent.CountDownLatch;
 

demos/transformer/src/main/java/androidx/media3/demo/transformer/ClockOverlay.java

@@ -23,8 +23,8 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.RectF;
+import androidx.media3.common.OverlaySettings;
 import androidx.media3.effect.CanvasOverlay;
-import androidx.media3.effect.OverlaySettings;
 import androidx.media3.effect.StaticOverlaySettings;
 
 /* package */ final class ClockOverlay extends CanvasOverlay {

demos/transformer/src/main/java/androidx/media3/demo/transformer/TimerOverlay.java

@@ -20,7 +20,7 @@ import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import androidx.media3.common.C;
-import androidx.media3.effect.OverlaySettings;
+import androidx.media3.common.OverlaySettings;
 import androidx.media3.effect.StaticOverlaySettings;
 import androidx.media3.effect.TextOverlay;
 import androidx.media3.effect.TextureOverlay;

libraries/common/src/main/java/androidx/media3/common/OverlaySettings.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package androidx.media3.common;
 
 import android.util.Pair;
 import androidx.media3.common.util.UnstableApi;
 
 /**
- * Provides information of how an input texture (for example, a {@link TextureOverlay} or in {@link
+ * Provides information of how an input texture (for example, a {@code TextureOverlay} or in {@code
  * VideoCompositor}) is presented.
  */
 @UnstableApi

libraries/common/src/main/java/androidx/media3/common/VideoCompositorSettings.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package androidx.media3.common;
 
 import androidx.media3.common.util.Size;
 import androidx.media3.common.util.UnstableApi;
 import java.util.List;
 
-/** Settings for the {@link VideoCompositor}. */
+/** Settings for the {@code VideoCompositor}. */
 @UnstableApi
 public interface VideoCompositorSettings {
   // TODO: b/262694346 - Consider adding more features, like selecting a:

libraries/effect/src/androidTest/java/androidx/media3/effect/OverlayShaderProgramPixelTest.java

@@ -35,6 +35,7 @@ import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.RelativeSizeSpan;
+import androidx.media3.common.OverlaySettings;
 import androidx.media3.common.VideoFrameProcessingException;
 import androidx.media3.common.util.GlUtil;
 import androidx.media3.common.util.Size;

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

@@ -23,6 +23,7 @@ import android.net.Uri;
 import android.opengl.Matrix;
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
+import androidx.media3.common.OverlaySettings;
 import androidx.media3.common.VideoFrameProcessingException;
 import androidx.media3.common.util.BitmapLoader;
 import androidx.media3.common.util.GlUtil;

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

@@ -35,6 +35,8 @@ import androidx.media3.common.C;
 import androidx.media3.common.ColorInfo;
 import androidx.media3.common.GlObjectsProvider;
 import androidx.media3.common.GlTextureInfo;
+import androidx.media3.common.OverlaySettings;
+import androidx.media3.common.VideoCompositorSettings;
 import androidx.media3.common.VideoFrameProcessingException;
 import androidx.media3.common.util.GlProgram;
 import androidx.media3.common.util.GlUtil;

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

@@ -22,6 +22,7 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
+import androidx.media3.common.OverlaySettings;
 import androidx.media3.common.util.UnstableApi;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 

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

@@ -45,6 +45,7 @@ import androidx.media3.common.Format;
 import androidx.media3.common.GlObjectsProvider;
 import androidx.media3.common.GlTextureInfo;
 import androidx.media3.common.SurfaceInfo;
+import androidx.media3.common.VideoCompositorSettings;
 import androidx.media3.common.VideoFrameProcessingException;
 import androidx.media3.common.VideoFrameProcessor;
 import androidx.media3.common.VideoGraph;

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

@@ -19,6 +19,7 @@ import static androidx.media3.common.util.Assertions.checkStateNotNull;
 
 import android.opengl.Matrix;
 import android.util.Pair;
+import androidx.media3.common.OverlaySettings;
 import androidx.media3.common.util.GlUtil;
 import androidx.media3.common.util.Size;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;

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

@@ -31,6 +31,7 @@ import android.util.SparseArray;
 import android.util.SparseIntArray;
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
+import androidx.media3.common.OverlaySettings;
 import androidx.media3.common.VideoFrameProcessingException;
 import androidx.media3.common.util.GlProgram;
 import androidx.media3.common.util.GlUtil;

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

@@ -21,6 +21,7 @@ import androidx.media3.common.ColorInfo;
 import androidx.media3.common.DebugViewProvider;
 import androidx.media3.common.Effect;
 import androidx.media3.common.PreviewingVideoGraph;
+import androidx.media3.common.VideoCompositorSettings;
 import androidx.media3.common.VideoFrameProcessor;
 import androidx.media3.common.util.UnstableApi;
 import java.util.List;

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

@@ -16,6 +16,7 @@
 package androidx.media3.effect;
 
 import android.opengl.Matrix;
+import androidx.media3.common.OverlaySettings;
 import androidx.media3.common.util.GlUtil;
 import androidx.media3.common.util.Size;
 

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

@@ -28,6 +28,7 @@ import androidx.media3.common.DebugViewProvider;
 import androidx.media3.common.Effect;
 import androidx.media3.common.Format;
 import androidx.media3.common.SurfaceInfo;
+import androidx.media3.common.VideoCompositorSettings;
 import androidx.media3.common.VideoFrameProcessingException;
 import androidx.media3.common.VideoFrameProcessor;
 import androidx.media3.common.VideoGraph;

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

@@ -19,6 +19,7 @@ import static androidx.media3.common.util.Assertions.checkArgument;
 
 import android.util.Pair;
 import androidx.annotation.FloatRange;
+import androidx.media3.common.OverlaySettings;
 import androidx.media3.common.util.UnstableApi;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 

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

@@ -29,6 +29,7 @@ import android.text.SpannableString;
 import android.text.StaticLayout;
 import android.text.TextPaint;
 import androidx.annotation.RequiresApi;
+import androidx.media3.common.OverlaySettings;
 import androidx.media3.common.util.UnstableApi;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 

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

@@ -15,6 +15,7 @@
  */
 package androidx.media3.effect;
 
+import androidx.media3.common.OverlaySettings;
 import androidx.media3.common.VideoFrameProcessingException;
 import androidx.media3.common.util.GlUtil;
 import androidx.media3.common.util.Size;

libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java

@@ -45,6 +45,8 @@ import androidx.media3.common.C;
 import androidx.media3.common.ColorInfo;
 import androidx.media3.common.Effect;
 import androidx.media3.common.GlObjectsProvider;
+import androidx.media3.common.OverlaySettings;
+import androidx.media3.common.VideoCompositorSettings;
 import androidx.media3.common.VideoFrameProcessingException;
 import androidx.media3.common.util.GlUtil;
 import androidx.media3.common.util.Size;
@@ -54,14 +56,12 @@ import androidx.media3.effect.DefaultGlObjectsProvider;
 import androidx.media3.effect.DefaultVideoCompositor;
 import androidx.media3.effect.DefaultVideoFrameProcessor;
 import androidx.media3.effect.OverlayEffect;
-import androidx.media3.effect.OverlaySettings;
 import androidx.media3.effect.Presentation;
 import androidx.media3.effect.RgbFilter;
 import androidx.media3.effect.ScaleAndRotateTransformation;
 import androidx.media3.effect.StaticOverlaySettings;
 import androidx.media3.effect.TextOverlay;
 import androidx.media3.effect.VideoCompositor;
-import androidx.media3.effect.VideoCompositorSettings;
 import androidx.media3.test.utils.BitmapPixelTestUtil;
 import androidx.media3.test.utils.TextureBitmapReader;
 import androidx.media3.test.utils.VideoFrameProcessorTestRunner;

libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerMultiSequenceCompositionTest.java

@@ -36,16 +36,16 @@ import android.net.Uri;
 import androidx.media3.common.C;
 import androidx.media3.common.Effect;
 import androidx.media3.common.MediaItem;
+import androidx.media3.common.OverlaySettings;
+import androidx.media3.common.VideoCompositorSettings;
 import androidx.media3.common.util.Size;
 import androidx.media3.common.util.Util;
 import androidx.media3.effect.AlphaScale;
 import androidx.media3.effect.Contrast;
 import androidx.media3.effect.DefaultVideoFrameProcessor;
-import androidx.media3.effect.OverlaySettings;
 import androidx.media3.effect.Presentation;
 import androidx.media3.effect.ScaleAndRotateTransformation;
 import androidx.media3.effect.StaticOverlaySettings;
-import androidx.media3.effect.VideoCompositorSettings;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.common.collect.ImmutableList;
 import java.io.File;

libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/PlaybackTestUtil.java

@@ -22,8 +22,8 @@ import android.text.SpannableString;
 import android.text.style.AbsoluteSizeSpan;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.TypefaceSpan;
+import androidx.media3.common.OverlaySettings;
 import androidx.media3.effect.OverlayEffect;
-import androidx.media3.effect.OverlaySettings;
 import androidx.media3.effect.StaticOverlaySettings;
 import androidx.media3.effect.TextOverlay;
 import com.google.common.collect.ImmutableList;

libraries/transformer/src/main/java/androidx/media3/transformer/Composition.java

@@ -21,9 +21,9 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
 
 import androidx.annotation.IntDef;
 import androidx.media3.common.MediaItem;
+import androidx.media3.common.VideoCompositorSettings;
 import androidx.media3.common.audio.AudioProcessor;
 import androidx.media3.common.util.UnstableApi;
-import androidx.media3.effect.VideoCompositorSettings;
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.lang.annotation.Documented;

libraries/transformer/src/main/java/androidx/media3/transformer/TransformerMultipleInputVideoGraph.java

@@ -22,11 +22,11 @@ import android.content.Context;
 import androidx.media3.common.ColorInfo;
 import androidx.media3.common.DebugViewProvider;
 import androidx.media3.common.Effect;
+import androidx.media3.common.VideoCompositorSettings;
 import androidx.media3.common.VideoFrameProcessingException;
 import androidx.media3.common.VideoFrameProcessor;
 import androidx.media3.common.VideoGraph;
 import androidx.media3.effect.MultipleInputVideoGraph;
-import androidx.media3.effect.VideoCompositorSettings;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.concurrent.Executor;

libraries/transformer/src/main/java/androidx/media3/transformer/TransformerSingleInputVideoGraph.java

@@ -23,10 +23,10 @@ import android.content.Context;
 import androidx.media3.common.ColorInfo;
 import androidx.media3.common.DebugViewProvider;
 import androidx.media3.common.Effect;
+import androidx.media3.common.VideoCompositorSettings;
 import androidx.media3.common.VideoFrameProcessingException;
 import androidx.media3.common.VideoFrameProcessor;
 import androidx.media3.effect.SingleInputVideoGraph;
-import androidx.media3.effect.VideoCompositorSettings;
 import java.util.List;
 import java.util.concurrent.Executor;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;

libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoGraph.java

@@ -21,10 +21,10 @@ import androidx.media3.common.ColorInfo;
 import androidx.media3.common.DebugViewProvider;
 import androidx.media3.common.Effect;
 import androidx.media3.common.SurfaceInfo;
+import androidx.media3.common.VideoCompositorSettings;
 import androidx.media3.common.VideoFrameProcessingException;
 import androidx.media3.common.VideoFrameProcessor;
 import androidx.media3.common.VideoGraph;
-import androidx.media3.effect.VideoCompositorSettings;
 import java.util.List;
 import java.util.concurrent.Executor;
 

libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java

@@ -43,13 +43,13 @@ import androidx.media3.common.Effect;
 import androidx.media3.common.Format;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.SurfaceInfo;
+import androidx.media3.common.VideoCompositorSettings;
 import androidx.media3.common.VideoFrameProcessingException;
 import androidx.media3.common.VideoFrameProcessor;
 import androidx.media3.common.VideoGraph;
 import androidx.media3.common.util.Consumer;
 import androidx.media3.common.util.Util;
 import androidx.media3.decoder.DecoderInputBuffer;
-import androidx.media3.effect.VideoCompositorSettings;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.nio.ByteBuffer;
 import java.util.List;