diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/AndroidTestUtil.java similarity index 98% rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/AndroidTestUtil.java index b82a1e8f2e..89487497d1 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/AndroidTestUtil.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.transformer.mh; import static com.google.common.truth.Truth.assertWithMessage; import static java.util.concurrent.TimeUnit.SECONDS; @@ -23,6 +23,7 @@ import android.net.Uri; import androidx.annotation.Nullable; import androidx.media3.common.MediaItem; import androidx.media3.common.util.Assertions; +import androidx.media3.transformer.Transformer; import androidx.test.platform.app.InstrumentationRegistry; import java.io.File; import java.io.IOException; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/RemoveAudioTransformationTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RemoveAudioTransformationTest.java similarity index 84% rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/RemoveAudioTransformationTest.java rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RemoveAudioTransformationTest.java index fcc0546b19..17200613a1 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/RemoveAudioTransformationTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RemoveAudioTransformationTest.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer; +package androidx.media3.transformer.mh; -import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_URI_STRING; -import static androidx.media3.transformer.AndroidTestUtil.runTransformer; +import static androidx.media3.transformer.mh.AndroidTestUtil.MP4_ASSET_URI_STRING; +import static androidx.media3.transformer.mh.AndroidTestUtil.runTransformer; import android.content.Context; +import androidx.media3.transformer.Transformer; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/RemoveVideoTransformationTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RemoveVideoTransformationTest.java similarity index 84% rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/RemoveVideoTransformationTest.java rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RemoveVideoTransformationTest.java index bd096b5b59..73e1138de4 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/RemoveVideoTransformationTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RemoveVideoTransformationTest.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer; +package androidx.media3.transformer.mh; -import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_URI_STRING; -import static androidx.media3.transformer.AndroidTestUtil.runTransformer; +import static androidx.media3.transformer.mh.AndroidTestUtil.MP4_ASSET_URI_STRING; +import static androidx.media3.transformer.mh.AndroidTestUtil.runTransformer; import android.content.Context; +import androidx.media3.transformer.Transformer; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/RepeatedTranscodeTransformationTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RepeatedTranscodeTransformationTest.java similarity index 96% rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/RepeatedTranscodeTransformationTest.java rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RepeatedTranscodeTransformationTest.java index bac7fc6841..f4999b4803 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/RepeatedTranscodeTransformationTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RepeatedTranscodeTransformationTest.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer; +package androidx.media3.transformer.mh; -import static androidx.media3.transformer.AndroidTestUtil.runTransformer; +import static androidx.media3.transformer.mh.AndroidTestUtil.runTransformer; import static com.google.common.truth.Truth.assertWithMessage; import android.content.Context; import androidx.media3.common.MimeTypes; +import androidx.media3.transformer.Transformer; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import java.util.HashSet; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/SefTransformationTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SefTransformationTest.java similarity index 84% rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/SefTransformationTest.java rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SefTransformationTest.java index dc515e0017..f071450801 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/SefTransformationTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SefTransformationTest.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer; +package androidx.media3.transformer.mh; -import static androidx.media3.transformer.AndroidTestUtil.SEF_ASSET_URI_STRING; -import static androidx.media3.transformer.AndroidTestUtil.runTransformer; +import static androidx.media3.transformer.mh.AndroidTestUtil.SEF_ASSET_URI_STRING; +import static androidx.media3.transformer.mh.AndroidTestUtil.runTransformer; import android.content.Context; +import androidx.media3.transformer.Transformer; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformationTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformationTest.java similarity index 83% rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformationTest.java rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformationTest.java index 81519f3e75..f69674bfb0 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformationTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformationTest.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer; +package androidx.media3.transformer.mh; -import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_URI_STRING; -import static androidx.media3.transformer.AndroidTestUtil.runTransformer; +import static androidx.media3.transformer.mh.AndroidTestUtil.MP4_ASSET_URI_STRING; +import static androidx.media3.transformer.mh.AndroidTestUtil.runTransformer; import android.content.Context; +import androidx.media3.transformer.Transformer; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/package-info.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/package-info.java new file mode 100644 index 0000000000..0b5171ad33 --- /dev/null +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/package-info.java @@ -0,0 +1,19 @@ +/* + * Copyright 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +@NonNullApi +package androidx.media3.transformer.mh; + +import androidx.media3.common.util.NonNullApi;