From 675c1d898aa2df9ea199b7a9b39d1a09dbd31470 Mon Sep 17 00:00:00 2001 From: claincly Date: Mon, 2 Dec 2024 15:01:11 -0800 Subject: [PATCH] Move interface locations PiperOrigin-RevId: 702096389 --- .../androidx/media3/demo/transformer/AnimatedLogoOverlay.java | 2 +- .../java/androidx/media3/demo/transformer/ClockOverlay.java | 2 +- .../java/androidx/media3/demo/transformer/TimerOverlay.java | 2 +- .../main/java/androidx/media3/common}/OverlaySettings.java | 4 ++-- .../java/androidx/media3/common}/VideoCompositorSettings.java | 4 ++-- .../androidx/media3/effect/OverlayShaderProgramPixelTest.java | 1 + .../src/main/java/androidx/media3/effect/BitmapOverlay.java | 1 + .../java/androidx/media3/effect/DefaultVideoCompositor.java | 2 ++ .../src/main/java/androidx/media3/effect/DrawableOverlay.java | 1 + .../java/androidx/media3/effect/MultipleInputVideoGraph.java | 1 + .../java/androidx/media3/effect/OverlayMatrixProvider.java | 1 + .../java/androidx/media3/effect/OverlayShaderProgram.java | 1 + .../media3/effect/PreviewingSingleInputVideoGraph.java | 1 + .../androidx/media3/effect/SamplerOverlayMatrixProvider.java | 1 + .../java/androidx/media3/effect/SingleInputVideoGraph.java | 1 + .../java/androidx/media3/effect/StaticOverlaySettings.java | 1 + .../src/main/java/androidx/media3/effect/TextOverlay.java | 1 + .../src/main/java/androidx/media3/effect/TextureOverlay.java | 1 + .../media3/transformer/DefaultVideoCompositorPixelTest.java | 4 ++-- .../transformer/TransformerMultiSequenceCompositionTest.java | 4 ++-- .../media3/transformer/mh/performance/PlaybackTestUtil.java | 2 +- .../main/java/androidx/media3/transformer/Composition.java | 2 +- .../transformer/TransformerMultipleInputVideoGraph.java | 2 +- .../media3/transformer/TransformerSingleInputVideoGraph.java | 2 +- .../androidx/media3/transformer/TransformerVideoGraph.java | 2 +- .../java/androidx/media3/transformer/VideoSampleExporter.java | 2 +- 26 files changed, 31 insertions(+), 17 deletions(-) rename libraries/{effect/src/main/java/androidx/media3/effect => common/src/main/java/androidx/media3/common}/OverlaySettings.java (98%) rename libraries/{effect/src/main/java/androidx/media3/effect => common/src/main/java/androidx/media3/common}/VideoCompositorSettings.java (96%) diff --git a/demos/transformer/src/main/java/androidx/media3/demo/transformer/AnimatedLogoOverlay.java b/demos/transformer/src/main/java/androidx/media3/demo/transformer/AnimatedLogoOverlay.java index abf11eaa67..2707180503 100644 --- a/demos/transformer/src/main/java/androidx/media3/demo/transformer/AnimatedLogoOverlay.java +++ b/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; diff --git a/demos/transformer/src/main/java/androidx/media3/demo/transformer/ClockOverlay.java b/demos/transformer/src/main/java/androidx/media3/demo/transformer/ClockOverlay.java index ebcbddcbd2..b433051fbc 100644 --- a/demos/transformer/src/main/java/androidx/media3/demo/transformer/ClockOverlay.java +++ b/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 { diff --git a/demos/transformer/src/main/java/androidx/media3/demo/transformer/TimerOverlay.java b/demos/transformer/src/main/java/androidx/media3/demo/transformer/TimerOverlay.java index 9defd82cc0..e05dab87ba 100644 --- a/demos/transformer/src/main/java/androidx/media3/demo/transformer/TimerOverlay.java +++ b/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; diff --git a/libraries/effect/src/main/java/androidx/media3/effect/OverlaySettings.java b/libraries/common/src/main/java/androidx/media3/common/OverlaySettings.java similarity index 98% rename from libraries/effect/src/main/java/androidx/media3/effect/OverlaySettings.java rename to libraries/common/src/main/java/androidx/media3/common/OverlaySettings.java index a2de71943c..2b6a197115 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/OverlaySettings.java +++ b/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 diff --git a/libraries/effect/src/main/java/androidx/media3/effect/VideoCompositorSettings.java b/libraries/common/src/main/java/androidx/media3/common/VideoCompositorSettings.java similarity index 96% rename from libraries/effect/src/main/java/androidx/media3/effect/VideoCompositorSettings.java rename to libraries/common/src/main/java/androidx/media3/common/VideoCompositorSettings.java index e003c62884..cf7846e293 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/VideoCompositorSettings.java +++ b/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: diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/OverlayShaderProgramPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/OverlayShaderProgramPixelTest.java index b4dfbfa0b6..5906ffd80a 100644 --- a/libraries/effect/src/androidTest/java/androidx/media3/effect/OverlayShaderProgramPixelTest.java +++ b/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; diff --git a/libraries/effect/src/main/java/androidx/media3/effect/BitmapOverlay.java b/libraries/effect/src/main/java/androidx/media3/effect/BitmapOverlay.java index 28bc85503c..91afb494bb 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/BitmapOverlay.java +++ b/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; diff --git a/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoCompositor.java b/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoCompositor.java index 747c8d6990..3a26c35b5a 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoCompositor.java +++ b/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; diff --git a/libraries/effect/src/main/java/androidx/media3/effect/DrawableOverlay.java b/libraries/effect/src/main/java/androidx/media3/effect/DrawableOverlay.java index c77d6e4077..1efe1c7630 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/DrawableOverlay.java +++ b/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; diff --git a/libraries/effect/src/main/java/androidx/media3/effect/MultipleInputVideoGraph.java b/libraries/effect/src/main/java/androidx/media3/effect/MultipleInputVideoGraph.java index f76620355d..f1633466a8 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/MultipleInputVideoGraph.java +++ b/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; diff --git a/libraries/effect/src/main/java/androidx/media3/effect/OverlayMatrixProvider.java b/libraries/effect/src/main/java/androidx/media3/effect/OverlayMatrixProvider.java index 9103a77d84..6a02c940bb 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/OverlayMatrixProvider.java +++ b/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; diff --git a/libraries/effect/src/main/java/androidx/media3/effect/OverlayShaderProgram.java b/libraries/effect/src/main/java/androidx/media3/effect/OverlayShaderProgram.java index 014fc72106..d350520f31 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/OverlayShaderProgram.java +++ b/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; diff --git a/libraries/effect/src/main/java/androidx/media3/effect/PreviewingSingleInputVideoGraph.java b/libraries/effect/src/main/java/androidx/media3/effect/PreviewingSingleInputVideoGraph.java index 2ed6026de0..889fc4950c 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/PreviewingSingleInputVideoGraph.java +++ b/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; diff --git a/libraries/effect/src/main/java/androidx/media3/effect/SamplerOverlayMatrixProvider.java b/libraries/effect/src/main/java/androidx/media3/effect/SamplerOverlayMatrixProvider.java index 7ed8bfcb54..48b01ecb47 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/SamplerOverlayMatrixProvider.java +++ b/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; diff --git a/libraries/effect/src/main/java/androidx/media3/effect/SingleInputVideoGraph.java b/libraries/effect/src/main/java/androidx/media3/effect/SingleInputVideoGraph.java index 13a2580c4d..7ee1029754 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/SingleInputVideoGraph.java +++ b/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; diff --git a/libraries/effect/src/main/java/androidx/media3/effect/StaticOverlaySettings.java b/libraries/effect/src/main/java/androidx/media3/effect/StaticOverlaySettings.java index 1c2f4ec085..f5fd83ae55 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/StaticOverlaySettings.java +++ b/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; diff --git a/libraries/effect/src/main/java/androidx/media3/effect/TextOverlay.java b/libraries/effect/src/main/java/androidx/media3/effect/TextOverlay.java index 7616193989..3d7a351cc9 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/TextOverlay.java +++ b/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; diff --git a/libraries/effect/src/main/java/androidx/media3/effect/TextureOverlay.java b/libraries/effect/src/main/java/androidx/media3/effect/TextureOverlay.java index 02ca8106d3..f5d2befe47 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/TextureOverlay.java +++ b/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; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java index bc0fb13f18..c95f2b0e0c 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/DefaultVideoCompositorPixelTest.java +++ b/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; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerMultiSequenceCompositionTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerMultiSequenceCompositionTest.java index 4695d53217..f5a0fb28a2 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerMultiSequenceCompositionTest.java +++ b/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; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/PlaybackTestUtil.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/PlaybackTestUtil.java index d8b9f35d45..1ee7076641 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/PlaybackTestUtil.java +++ b/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; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/Composition.java b/libraries/transformer/src/main/java/androidx/media3/transformer/Composition.java index e475e6d152..2cfb28eadd 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/Composition.java +++ b/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; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerMultipleInputVideoGraph.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerMultipleInputVideoGraph.java index 73e47e31e7..e6c33682ed 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerMultipleInputVideoGraph.java +++ b/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; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerSingleInputVideoGraph.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerSingleInputVideoGraph.java index 39b2962445..92b445abc4 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerSingleInputVideoGraph.java +++ b/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; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoGraph.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoGraph.java index 311595eda6..75ccac73b4 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoGraph.java +++ b/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; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java index 4ab287718a..19706937d8 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java +++ b/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;