diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 6077cf2604..abee86beec 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -37,6 +37,7 @@ `InAppMp4Muxer` is to be used for producing a non-fragmented MP4 file, while `InAppFragmentedMp4Muxer` is to be used for producing a fragmented MP4 file. + * Move `Muxer` interface from `media3-muxer` to `media3-transformer`. * Track Selection: * Extractors: * Fix handling of NAL units with lengths expressed in 1 or 2 bytes (rather 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 d5be46e789..cd6a684169 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java @@ -57,7 +57,6 @@ import androidx.media3.effect.PassthroughShaderProgram; import androidx.media3.effect.ScaleAndRotateTransformation; import androidx.media3.exoplayer.mediacodec.MediaCodecSelector; import androidx.media3.exoplayer.mediacodec.MediaCodecUtil; -import androidx.media3.muxer.Muxer; import androidx.media3.test.utils.BitmapPixelTestUtil; import androidx.media3.test.utils.VideoDecodingWrapper; import com.google.common.base.Ascii; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerPauseResumeTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerPauseResumeTest.java index 2e7d59fa3f..0064a76f88 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerPauseResumeTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerPauseResumeTest.java @@ -34,7 +34,6 @@ import androidx.media3.common.audio.AudioProcessor; import androidx.media3.common.audio.SonicAudioProcessor; import androidx.media3.common.util.Util; import androidx.media3.effect.RgbFilter; -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/main/java/androidx/media3/transformer/DefaultMuxer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultMuxer.java index 3c2b747fc0..9c1da83b14 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultMuxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultMuxer.java @@ -21,7 +21,6 @@ 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 34744a8c9c..bd0ce5bcbf 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java @@ -33,7 +33,6 @@ 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 7c51b8499e..4931b80268 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/InAppFragmentedMp4Muxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/InAppFragmentedMp4Muxer.java @@ -25,7 +25,6 @@ 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 659ce2aea6..53c3d09ab4 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMp4Muxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMp4Muxer.java @@ -26,7 +26,6 @@ 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/muxer/src/main/java/androidx/media3/muxer/Muxer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/Muxer.java similarity index 97% rename from libraries/muxer/src/main/java/androidx/media3/muxer/Muxer.java rename to libraries/transformer/src/main/java/androidx/media3/transformer/Muxer.java index 373c108711..b67928b54a 100644 --- a/libraries/muxer/src/main/java/androidx/media3/muxer/Muxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Muxer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.muxer; +package androidx.media3.transformer; import android.media.MediaCodec.BufferInfo; import androidx.media3.common.C; @@ -21,6 +21,7 @@ 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/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java b/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java index b8c96dcb90..01a70bfb5f 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java @@ -47,7 +47,6 @@ 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 b02d948f19..17ef154717 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/NoWriteMuxer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/NoWriteMuxer.java @@ -21,7 +21,6 @@ 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 a32460249d..44384b36f1 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java @@ -59,7 +59,6 @@ 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 c969591651..c06f44f5ee 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/CapturingMuxer.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/CapturingMuxer.java @@ -26,7 +26,6 @@ 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/TestTransformerBuilder.java b/libraries/transformer/src/test/java/androidx/media3/transformer/TestTransformerBuilder.java index 76ec104070..579157010e 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/TestTransformerBuilder.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/TestTransformerBuilder.java @@ -21,7 +21,6 @@ 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.test.utils.FakeClock; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.ArrayList; 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 8bf9b0ed42..8fe521f682 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMp4MuxerEndToEndParameterizedTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMp4MuxerEndToEndParameterizedTest.java @@ -24,7 +24,6 @@ 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.test.core.app.ApplicationProvider; 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 0baa1ca0ef..311a871a59 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMp4MuxerEndToEndTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/TransformerWithInAppMp4MuxerEndToEndTest.java @@ -34,7 +34,6 @@ 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.test.core.app.ApplicationProvider;