From 8d87a693517f84f1b520fedbe145a9e64ada7f2b Mon Sep 17 00:00:00 2001 From: sheenachhabra Date: Wed, 30 Apr 2025 03:59:24 -0700 Subject: [PATCH] Rollback of https://github.com/androidx/media/commit/a31c7ad9a8ad65505150531439746d1988e050f5 PiperOrigin-RevId: 753104435 --- RELEASENOTES.md | 1 + .../src/main/java/androidx/media3/muxer}/Muxer.java | 3 +-- .../androidx/media3/test/utils/TestTransformerBuilder.java | 2 +- .../java/androidx/media3/transformer/AndroidTestUtil.java | 1 + .../media3/transformer/EditingMetricsCollectorTest.java | 1 + .../media3/transformer/MediaProjectionAssetLoaderTest.java | 1 + .../main/java/androidx/media3/transformer/DefaultMuxer.java | 1 + .../main/java/androidx/media3/transformer/FrameworkMuxer.java | 1 + .../androidx/media3/transformer/InAppFragmentedMp4Muxer.java | 1 + .../main/java/androidx/media3/transformer/InAppMp4Muxer.java | 1 + .../main/java/androidx/media3/transformer/MuxerWrapper.java | 1 + .../main/java/androidx/media3/transformer/NoWriteMuxer.java | 1 + .../src/main/java/androidx/media3/transformer/Transformer.java | 1 + .../test/java/androidx/media3/transformer/CapturingMuxer.java | 1 + .../TransformerWithInAppMp4MuxerEndToEndParameterizedTest.java | 1 + .../transformer/TransformerWithInAppMp4MuxerEndToEndTest.java | 1 + 16 files changed, 16 insertions(+), 3 deletions(-) rename libraries/{transformer/src/main/java/androidx/media3/transformer => muxer/src/main/java/androidx/media3/muxer}/Muxer.java (97%) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 973e470cd4..09891ae688 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -19,6 +19,7 @@ requires explicitly setting `experimentalSetForceAudioTrack(true)` in `EditedMediaItemSequence.Builder`. If the gap is in the middle of the sequence, then this flag is not required. + * Move `Muxer` interface from `media3-transformer` to `media3-muxer`. * Track Selection: * Extractors: * MP3: Use duration and data size from unseekable Xing, VBRI and similar diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/Muxer.java b/libraries/muxer/src/main/java/androidx/media3/muxer/Muxer.java similarity index 97% rename from libraries/transformer/src/main/java/androidx/media3/transformer/Muxer.java rename to libraries/muxer/src/main/java/androidx/media3/muxer/Muxer.java index b67928b54a..373c108711 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/Muxer.java +++ b/libraries/muxer/src/main/java/androidx/media3/muxer/Muxer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer; +package androidx.media3.muxer; import android.media.MediaCodec.BufferInfo; import androidx.media3.common.C; @@ -21,7 +21,6 @@ import androidx.media3.common.Format; import androidx.media3.common.Metadata; import androidx.media3.common.MimeTypes; import androidx.media3.common.util.UnstableApi; -import androidx.media3.muxer.MuxerException; import com.google.common.collect.ImmutableList; import java.nio.ByteBuffer; diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/TestTransformerBuilder.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/TestTransformerBuilder.java index 67301e11fe..67b24d8cc1 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/TestTransformerBuilder.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/TestTransformerBuilder.java @@ -25,6 +25,7 @@ import androidx.media3.common.MimeTypes; import androidx.media3.common.util.Clock; import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; +import androidx.media3.muxer.Muxer; import androidx.media3.muxer.MuxerException; import androidx.media3.transformer.AssetLoader; import androidx.media3.transformer.Codec; @@ -32,7 +33,6 @@ import androidx.media3.transformer.DefaultAssetLoaderFactory; import androidx.media3.transformer.DefaultDecoderFactory; import androidx.media3.transformer.DefaultEncoderFactory; import androidx.media3.transformer.DefaultMuxer; -import androidx.media3.transformer.Muxer; import androidx.media3.transformer.Transformer; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.CanIgnoreReturnValue; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java index ded3875c62..3ff7e60d74 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java @@ -73,6 +73,7 @@ import androidx.media3.exoplayer.video.MediaCodecVideoRenderer; import androidx.media3.exoplayer.video.PlaybackVideoGraphWrapper; import androidx.media3.exoplayer.video.VideoFrameReleaseControl; import androidx.media3.extractor.ExtractorOutput; +import androidx.media3.muxer.Muxer; import androidx.media3.muxer.MuxerException; import androidx.media3.test.utils.BitmapPixelTestUtil; import androidx.media3.test.utils.FakeExtractorOutput; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/EditingMetricsCollectorTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/EditingMetricsCollectorTest.java index 33b105684e..e1a679a489 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/EditingMetricsCollectorTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/EditingMetricsCollectorTest.java @@ -38,6 +38,7 @@ import androidx.media3.common.Format; import androidx.media3.common.MediaItem; import androidx.media3.common.MediaLibraryInfo; import androidx.media3.common.Metadata; +import androidx.media3.muxer.Muxer; import androidx.media3.muxer.MuxerException; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/MediaProjectionAssetLoaderTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/MediaProjectionAssetLoaderTest.java index 7ec9bcd33e..3a187e54e2 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/MediaProjectionAssetLoaderTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/MediaProjectionAssetLoaderTest.java @@ -42,6 +42,7 @@ import androidx.media3.common.MimeTypes; import androidx.media3.common.util.ConditionVariable; import androidx.media3.common.util.Util; import androidx.media3.effect.Presentation; +import androidx.media3.muxer.Muxer; import androidx.media3.muxer.MuxerException; import androidx.test.core.app.ActivityScenario; import androidx.test.ext.junit.runners.AndroidJUnit4; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultMuxer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultMuxer.java index 2cca9042c3..7c4835c38d 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultMuxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultMuxer.java @@ -21,6 +21,7 @@ import androidx.media3.common.Format; import androidx.media3.common.Metadata; import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; +import androidx.media3.muxer.Muxer; import androidx.media3.muxer.MuxerException; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.CanIgnoreReturnValue; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java index 32e94fdd5f..b574d73281 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java @@ -38,6 +38,7 @@ import androidx.media3.common.util.Log; import androidx.media3.common.util.MediaFormatUtil; import androidx.media3.common.util.Util; import androidx.media3.container.Mp4LocationData; +import androidx.media3.muxer.Muxer; import androidx.media3.muxer.MuxerException; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.CanIgnoreReturnValue; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/InAppFragmentedMp4Muxer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/InAppFragmentedMp4Muxer.java index 553bab3245..d11cc3e623 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/InAppFragmentedMp4Muxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/InAppFragmentedMp4Muxer.java @@ -27,6 +27,7 @@ import androidx.media3.common.util.Log; import androidx.media3.common.util.UnstableApi; import androidx.media3.container.Mp4OrientationData; import androidx.media3.muxer.FragmentedMp4Muxer; +import androidx.media3.muxer.Muxer; import androidx.media3.muxer.MuxerException; import androidx.media3.muxer.MuxerUtil; import com.google.common.collect.ImmutableList; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMp4Muxer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMp4Muxer.java index 6c83ffba0c..a221484007 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMp4Muxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMp4Muxer.java @@ -28,6 +28,7 @@ import androidx.media3.common.util.Log; import androidx.media3.common.util.UnstableApi; import androidx.media3.container.Mp4OrientationData; import androidx.media3.muxer.Mp4Muxer; +import androidx.media3.muxer.Muxer; import androidx.media3.muxer.MuxerException; import androidx.media3.muxer.MuxerUtil; import com.google.common.collect.ImmutableList; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java b/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java index 75395e3ed7..83af1f4e2a 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java @@ -46,6 +46,7 @@ import androidx.media3.common.util.Log; import androidx.media3.common.util.Util; import androidx.media3.container.NalUnitUtil; import androidx.media3.effect.DebugTraceUtil; +import androidx.media3.muxer.Muxer; import androidx.media3.muxer.MuxerException; import com.google.common.collect.ImmutableList; import java.io.File; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/NoWriteMuxer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/NoWriteMuxer.java index 17ef154717..b02d948f19 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/NoWriteMuxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/NoWriteMuxer.java @@ -21,6 +21,7 @@ import androidx.media3.common.C; import androidx.media3.common.Format; import androidx.media3.common.Metadata; import androidx.media3.common.MimeTypes; +import androidx.media3.muxer.Muxer; import com.google.common.collect.ImmutableList; import java.nio.ByteBuffer; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java index 6810adc7de..1ff6ceb066 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java @@ -60,6 +60,7 @@ import androidx.media3.common.util.Util; import androidx.media3.effect.DebugTraceUtil; import androidx.media3.effect.DefaultVideoFrameProcessor; import androidx.media3.exoplayer.source.DefaultMediaSourceFactory; +import androidx.media3.muxer.Muxer; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/CapturingMuxer.java b/libraries/transformer/src/test/java/androidx/media3/transformer/CapturingMuxer.java index c06f44f5ee..c969591651 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/CapturingMuxer.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/CapturingMuxer.java @@ -26,6 +26,7 @@ import androidx.media3.common.C; import androidx.media3.common.Format; import androidx.media3.common.Metadata; import androidx.media3.common.util.Util; +import androidx.media3.muxer.Muxer; import androidx.media3.muxer.MuxerException; import androidx.media3.test.utils.DumpableFormat; import androidx.media3.test.utils.Dumper; diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMp4MuxerEndToEndParameterizedTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMp4MuxerEndToEndParameterizedTest.java index 7cefe55482..83f639928e 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMp4MuxerEndToEndParameterizedTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMp4MuxerEndToEndParameterizedTest.java @@ -24,6 +24,7 @@ import androidx.media3.common.MediaItem; import androidx.media3.container.Mp4TimestampData; import androidx.media3.extractor.mp4.Mp4Extractor; import androidx.media3.extractor.text.DefaultSubtitleParserFactory; +import androidx.media3.muxer.Muxer; import androidx.media3.test.utils.DumpFileAsserts; import androidx.media3.test.utils.FakeExtractorOutput; import androidx.media3.test.utils.TestTransformerBuilder; diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMp4MuxerEndToEndTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMp4MuxerEndToEndTest.java index 090e0d7fc8..fc518878e7 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMp4MuxerEndToEndTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMp4MuxerEndToEndTest.java @@ -34,6 +34,7 @@ import androidx.media3.container.Mp4TimestampData; import androidx.media3.container.XmpData; import androidx.media3.extractor.mp4.Mp4Extractor; import androidx.media3.extractor.text.DefaultSubtitleParserFactory; +import androidx.media3.muxer.Muxer; import androidx.media3.test.utils.DumpFileAsserts; import androidx.media3.test.utils.FakeExtractorOutput; import androidx.media3.test.utils.TestTransformerBuilder;