diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/FileUtil.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FileUtil.java similarity index 95% rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/FileUtil.java rename to libraries/test_utils/src/main/java/androidx/media3/test/utils/FileUtil.java index 63a6f460c4..01e8101604 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/FileUtil.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FileUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package androidx.media3.transformer.mh; +package androidx.media3.test.utils; import static com.google.common.truth.Truth.assertThat; @@ -25,12 +25,14 @@ import androidx.media3.common.ColorInfo; import androidx.media3.common.Format; import androidx.media3.common.MediaItem; import androidx.media3.common.TrackGroup; +import androidx.media3.common.util.UnstableApi; import androidx.media3.exoplayer.MetadataRetriever; import androidx.media3.exoplayer.source.TrackGroupArray; import java.util.concurrent.ExecutionException; /** Utilities for accessing details of media files. */ -/* package */ class FileUtil { +@UnstableApi +public final class FileUtil { /** * Asserts that the file has a certain color transfer. diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ForceInterpretHdrVideoAsSdrTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ForceInterpretHdrVideoAsSdrTest.java index fcb5ed47fc..06bb651a67 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ForceInterpretHdrVideoAsSdrTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ForceInterpretHdrVideoAsSdrTest.java @@ -16,13 +16,13 @@ package androidx.media3.transformer.mh; import static androidx.media3.common.util.Util.SDK_INT; +import static androidx.media3.test.utils.FileUtil.assertFileHasColorTransfer; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_5_SECOND_HLG10; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_5_SECOND_HLG10_FORMAT; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_720P_4_SECOND_HDR10; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_720P_4_SECOND_HDR10_FORMAT; import static androidx.media3.transformer.AndroidTestUtil.recordTestSkipped; import static androidx.media3.transformer.AndroidTestUtil.skipAndLogIfFormatsUnsupported; -import static androidx.media3.transformer.mh.FileUtil.assertFileHasColorTransfer; import android.content.Context; import android.net.Uri; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/HdrEditingTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/HdrEditingTest.java index bc598c8a83..df054fe3c1 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/HdrEditingTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/HdrEditingTest.java @@ -16,6 +16,7 @@ package androidx.media3.transformer.mh; import static androidx.media3.common.MimeTypes.VIDEO_H265; +import static androidx.media3.test.utils.FileUtil.assertFileHasColorTransfer; import static androidx.media3.transformer.AndroidTestUtil.FORCE_TRANSCODE_VIDEO_EFFECTS; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_5_SECOND_HLG10; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_5_SECOND_HLG10_FORMAT; @@ -26,7 +27,6 @@ import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_DOLBY_VISION import static androidx.media3.transformer.AndroidTestUtil.recordTestSkipped; import static androidx.media3.transformer.Composition.HDR_MODE_KEEP_HDR; import static androidx.media3.transformer.Composition.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL; -import static androidx.media3.transformer.mh.FileUtil.assertFileHasColorTransfer; import static com.google.common.truth.Truth.assertThat; import android.content.Context; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingMediaCodecTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingMediaCodecTest.java index 2c3c3f13fa..e8ddde4b7e 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingMediaCodecTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingMediaCodecTest.java @@ -15,12 +15,12 @@ */ package androidx.media3.transformer.mh; +import static androidx.media3.test.utils.FileUtil.assertFileHasColorTransfer; import static androidx.media3.transformer.AndroidTestUtil.FORCE_TRANSCODE_VIDEO_EFFECTS; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_5_SECOND_HLG10; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_5_SECOND_HLG10_FORMAT; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_720P_4_SECOND_HDR10; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_720P_4_SECOND_HDR10_FORMAT; -import static androidx.media3.transformer.mh.FileUtil.assertFileHasColorTransfer; import static com.google.common.truth.Truth.assertThat; import android.content.Context; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlTest.java index 94d7e4ca1f..57adf2f589 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlTest.java @@ -15,13 +15,13 @@ */ package androidx.media3.transformer.mh; +import static androidx.media3.test.utils.FileUtil.assertFileHasColorTransfer; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_5_SECOND_HLG10; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_5_SECOND_HLG10_FORMAT; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_720P_4_SECOND_HDR10; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_720P_4_SECOND_HDR10_FORMAT; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_DOLBY_VISION_HDR; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_DOLBY_VISION_HDR_FORMAT; -import static androidx.media3.transformer.mh.FileUtil.assertFileHasColorTransfer; import static androidx.media3.transformer.mh.HdrCapabilitiesUtil.skipAndLogIfOpenGlToneMappingUnsupported; import android.content.Context;