From 063fbc7b847cf331b3283eed0eeab5267f468083 Mon Sep 17 00:00:00 2001 From: sheenachhabra Date: Tue, 20 Feb 2024 04:30:13 -0800 Subject: [PATCH] Remove FileUtil.java class PiperOrigin-RevId: 608556329 --- .../androidx/media3/test/utils/FileUtil.java | 45 ------------------- .../mh/ForceInterpretHdrVideoAsSdrTest.java | 12 +++-- .../media3/transformer/mh/HdrEditingTest.java | 37 +++++++++++---- .../ToneMapHdrToSdrUsingMediaCodecTest.java | 22 ++++++--- .../mh/ToneMapHdrToSdrUsingOpenGlTest.java | 7 ++- 5 files changed, 60 insertions(+), 63 deletions(-) delete mode 100644 libraries/test_utils/src/main/java/androidx/media3/test/utils/FileUtil.java diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/FileUtil.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FileUtil.java deleted file mode 100644 index a2bcee743d..0000000000 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/FileUtil.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2022 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 - * - * 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, - * 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. - */ - -package androidx.media3.test.utils; - -import static androidx.media3.test.utils.TestUtil.retrieveTrackFormat; - -import android.content.Context; -import androidx.annotation.Nullable; -import androidx.media3.common.C; -import androidx.media3.common.ColorInfo; -import androidx.media3.common.Format; -import androidx.media3.common.util.UnstableApi; - -/** Utilities for accessing details of media files. */ -@UnstableApi -public final class FileUtil { - - /** - * Returns {@link C.ColorTransfer} information from the media file, or {@link - * C#COLOR_TRANSFER_SDR} if the information can not be found. - */ - public static @C.ColorTransfer int retrieveColorTransfer(Context context, String filePath) { - Format videoTrackFormat = retrieveTrackFormat(context, filePath, C.TRACK_TYPE_VIDEO); - @Nullable ColorInfo colorInfo = videoTrackFormat.colorInfo; - return colorInfo == null || colorInfo.colorTransfer == Format.NO_VALUE - ? C.COLOR_TRANSFER_SDR - : colorInfo.colorTransfer; - } - - private FileUtil() {} -} 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 481fdd8186..7c082b927c 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,7 +16,7 @@ package androidx.media3.transformer.mh; import static androidx.media3.common.util.Util.SDK_INT; -import static androidx.media3.test.utils.FileUtil.retrieveColorTransfer; +import static androidx.media3.test.utils.TestUtil.retrieveTrackFormat; 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; @@ -87,7 +87,10 @@ public class ForceInterpretHdrVideoAsSdrTest { .run(testId, composition); @C.ColorTransfer - int actualColorTransfer = retrieveColorTransfer(context, exportTestResult.filePath); + int actualColorTransfer = + retrieveTrackFormat(context, exportTestResult.filePath, C.TRACK_TYPE_VIDEO) + .colorInfo + .colorTransfer; assertThat(actualColorTransfer).isEqualTo(C.COLOR_TRANSFER_SDR); } @@ -128,7 +131,10 @@ public class ForceInterpretHdrVideoAsSdrTest { .run(testId, composition); @C.ColorTransfer - int actualColorTransfer = retrieveColorTransfer(context, exportTestResult.filePath); + int actualColorTransfer = + retrieveTrackFormat(context, exportTestResult.filePath, C.TRACK_TYPE_VIDEO) + .colorInfo + .colorTransfer; assertThat(actualColorTransfer).isEqualTo(C.COLOR_TRANSFER_SDR); } } 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 fde44cd4bc..639ea5baa6 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 @@ -17,7 +17,7 @@ package androidx.media3.transformer.mh; import static androidx.media3.common.MimeTypes.VIDEO_H265; import static androidx.media3.common.util.Assertions.checkState; -import static androidx.media3.test.utils.FileUtil.retrieveColorTransfer; +import static androidx.media3.test.utils.TestUtil.retrieveTrackFormat; 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; @@ -88,7 +88,10 @@ public final class HdrEditingTest { .build() .run(testId, mediaItem); @C.ColorTransfer - int actualColorTransfer = retrieveColorTransfer(context, exportTestResult.filePath); + int actualColorTransfer = + retrieveTrackFormat(context, exportTestResult.filePath, C.TRACK_TYPE_VIDEO) + .colorInfo + .colorTransfer; assertThat(actualColorTransfer).isEqualTo(C.COLOR_TRANSFER_ST2084); } @@ -119,7 +122,10 @@ public final class HdrEditingTest { .build() .run(testId, mediaItem); @C.ColorTransfer - int actualColorTransfer = retrieveColorTransfer(context, exportTestResult.filePath); + int actualColorTransfer = + retrieveTrackFormat(context, exportTestResult.filePath, C.TRACK_TYPE_VIDEO) + .colorInfo + .colorTransfer; assertThat(actualColorTransfer).isEqualTo(C.COLOR_TRANSFER_HLG); } @@ -148,7 +154,10 @@ public final class HdrEditingTest { .build() .run(testId, editedMediaItem); @C.ColorTransfer - int actualColorTransfer = retrieveColorTransfer(context, exportTestResult.filePath); + int actualColorTransfer = + retrieveTrackFormat(context, exportTestResult.filePath, C.TRACK_TYPE_VIDEO) + .colorInfo + .colorTransfer; assertThat(actualColorTransfer).isEqualTo(C.COLOR_TRANSFER_ST2084); } @@ -177,7 +186,10 @@ public final class HdrEditingTest { .build() .run(testId, editedMediaItem); @C.ColorTransfer - int actualColorTransfer = retrieveColorTransfer(context, exportTestResult.filePath); + int actualColorTransfer = + retrieveTrackFormat(context, exportTestResult.filePath, C.TRACK_TYPE_VIDEO) + .colorInfo + .colorTransfer; assertThat(actualColorTransfer).isEqualTo(C.COLOR_TRANSFER_HLG); } @@ -206,7 +218,10 @@ public final class HdrEditingTest { .build() .run(testId, editedMediaItem); @C.ColorTransfer - int actualColorTransfer = retrieveColorTransfer(context, exportTestResult.filePath); + int actualColorTransfer = + retrieveTrackFormat(context, exportTestResult.filePath, C.TRACK_TYPE_VIDEO) + .colorInfo + .colorTransfer; assertThat(actualColorTransfer).isEqualTo(C.COLOR_TRANSFER_HLG); } @@ -256,7 +271,10 @@ public final class HdrEditingTest { .run(testId, editedMediaItem); assertThat(isToneMappingFallbackApplied.get()).isTrue(); @C.ColorTransfer - int actualColorTransfer = retrieveColorTransfer(context, exportTestResult.filePath); + int actualColorTransfer = + retrieveTrackFormat(context, exportTestResult.filePath, C.TRACK_TYPE_VIDEO) + .colorInfo + .colorTransfer; assertThat(actualColorTransfer).isEqualTo(C.COLOR_TRANSFER_SDR); } catch (ExportException exception) { if (exception.getCause() != null) { @@ -317,7 +335,10 @@ public final class HdrEditingTest { .run(testId, editedMediaItem); assertThat(isToneMappingFallbackApplied.get()).isTrue(); @C.ColorTransfer - int actualColorTransfer = retrieveColorTransfer(context, exportTestResult.filePath); + int actualColorTransfer = + retrieveTrackFormat(context, exportTestResult.filePath, C.TRACK_TYPE_VIDEO) + .colorInfo + .colorTransfer; assertThat(actualColorTransfer).isEqualTo(C.COLOR_TRANSFER_SDR); } catch (ExportException exception) { if (exception.getCause() != null) { 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 c770d88b39..78a53074a6 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,7 +15,7 @@ */ package androidx.media3.transformer.mh; -import static androidx.media3.test.utils.FileUtil.retrieveColorTransfer; +import static androidx.media3.test.utils.TestUtil.retrieveTrackFormat; 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; @@ -92,7 +92,10 @@ public class ToneMapHdrToSdrUsingMediaCodecTest { .build() .run(testId, composition); @C.ColorTransfer - int actualColorTransfer = retrieveColorTransfer(context, exportTestResult.filePath); + int actualColorTransfer = + retrieveTrackFormat(context, exportTestResult.filePath, C.TRACK_TYPE_VIDEO) + .colorInfo + .colorTransfer; assertThat(actualColorTransfer).isEqualTo(C.COLOR_TRANSFER_SDR); } catch (ExportException exception) { if (exception.getCause() != null @@ -152,7 +155,10 @@ public class ToneMapHdrToSdrUsingMediaCodecTest { .build() .run(testId, composition); @C.ColorTransfer - int actualColorTransfer = retrieveColorTransfer(context, exportTestResult.filePath); + int actualColorTransfer = + retrieveTrackFormat(context, exportTestResult.filePath, C.TRACK_TYPE_VIDEO) + .colorInfo + .colorTransfer; assertThat(actualColorTransfer).isEqualTo(C.COLOR_TRANSFER_SDR); } catch (ExportException exception) { if (exception.getCause() != null @@ -213,7 +219,10 @@ public class ToneMapHdrToSdrUsingMediaCodecTest { .build() .run(testId, composition); @C.ColorTransfer - int actualColorTransfer = retrieveColorTransfer(context, exportTestResult.filePath); + int actualColorTransfer = + retrieveTrackFormat(context, exportTestResult.filePath, C.TRACK_TYPE_VIDEO) + .colorInfo + .colorTransfer; assertThat(actualColorTransfer).isEqualTo(C.COLOR_TRANSFER_SDR); } catch (ExportException exception) { if (exception.getCause() != null @@ -274,7 +283,10 @@ public class ToneMapHdrToSdrUsingMediaCodecTest { .build() .run(testId, composition); @C.ColorTransfer - int actualColorTransfer = retrieveColorTransfer(context, exportTestResult.filePath); + int actualColorTransfer = + retrieveTrackFormat(context, exportTestResult.filePath, C.TRACK_TYPE_VIDEO) + .colorInfo + .colorTransfer; assertThat(actualColorTransfer).isEqualTo(C.COLOR_TRANSFER_SDR); } catch (ExportException exception) { if (exception.getCause() != null 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 a764b6c7ce..bf9b5acf2d 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,7 +15,7 @@ */ package androidx.media3.transformer.mh; -import static androidx.media3.test.utils.FileUtil.retrieveColorTransfer; +import static androidx.media3.test.utils.TestUtil.retrieveTrackFormat; 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; @@ -94,7 +94,10 @@ public class ToneMapHdrToSdrUsingOpenGlTest { .build() .run(testId, composition); @C.ColorTransfer - int actualColorTransfer = retrieveColorTransfer(context, exportTestResult.filePath); + int actualColorTransfer = + retrieveTrackFormat(context, exportTestResult.filePath, C.TRACK_TYPE_VIDEO) + .colorInfo + .colorTransfer; assertThat(actualColorTransfer).isEqualTo(C.COLOR_TRANSFER_SDR); } }