From fdf636bc7ed9550512af7a92ae8ae9ee85822533 Mon Sep 17 00:00:00 2001 From: huangdarwin Date: Mon, 13 Feb 2023 14:12:46 +0000 Subject: [PATCH] Test: Move FileUtil to mh from mh.analysis. FileUtil is only ever used in mh, and never in mh.analysis PiperOrigin-RevId: 509206721 --- .../media3/transformer/mh/{analysis => }/FileUtil.java | 4 ++-- .../transformer/mh/ForceInterpretHdrVideoAsSdrTest.java | 2 +- .../java/androidx/media3/transformer/mh/HdrEditingTest.java | 2 +- .../transformer/mh/ToneMapHdrToSdrUsingMediaCodecTest.java | 2 +- .../media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlTest.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/{analysis => }/FileUtil.java (96%) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/FileUtil.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/FileUtil.java similarity index 96% rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/FileUtil.java rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/FileUtil.java index 9b91ed53125..d1f7b05b08f 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/FileUtil.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/FileUtil.java @@ -5,7 +5,7 @@ * 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 + * https://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, @@ -14,7 +14,7 @@ * limitations under the License. */ -package androidx.media3.transformer.mh.analysis; +package androidx.media3.transformer.mh; import static androidx.media3.common.util.Assertions.checkNotNull; import static com.google.common.truth.Truth.assertThat; 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 54046e3b00e..619ed8742d2 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 @@ -19,7 +19,7 @@ import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_4_SECOND_HDR10_FORMAT; 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.mh.analysis.FileUtil.assertFileHasColorTransfer; +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 5f572289714..c5e0cba3d13 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 @@ -21,7 +21,7 @@ import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_4_SECOND_HDR10; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_5_SECOND_HLG10; import static androidx.media3.transformer.AndroidTestUtil.recordTestSkipped; -import static androidx.media3.transformer.mh.analysis.FileUtil.assertFileHasColorTransfer; +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 17b7eb2a84a..589fecd2fec 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 @@ -18,7 +18,7 @@ import static androidx.media3.common.util.Assertions.checkNotNull; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_4_SECOND_HDR10; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_5_SECOND_HLG10; -import static androidx.media3.transformer.mh.analysis.FileUtil.assertFileHasColorTransfer; +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 6f3ec4d45da..4a6861cac54 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 @@ -21,7 +21,7 @@ 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.recordTestSkipped; -import static androidx.media3.transformer.mh.analysis.FileUtil.assertFileHasColorTransfer; +import static androidx.media3.transformer.mh.FileUtil.assertFileHasColorTransfer; import static androidx.test.core.app.ApplicationProvider.getApplicationContext; import android.content.Context;