From 61603f90f33de38c2423b7c4757e23405ceb3b6c Mon Sep 17 00:00:00 2001 From: sheenachhabra Date: Wed, 31 Jan 2024 05:58:26 -0800 Subject: [PATCH] Refactor track retrieval into a separate method This will be be required when we add more method which required video track. PiperOrigin-RevId: 603024260 --- .../androidx/media3/test/utils/FileUtil.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) 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 index 01e8101604..fda6bf4f5f 100644 --- 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 @@ -43,6 +43,17 @@ public final class FileUtil { */ public static void assertFileHasColorTransfer( Context context, @Nullable String filePath, @C.ColorTransfer int expectedColorTransfer) { + Format videoTrackFormat = retrieveVideoTrackFormat(context, filePath); + @Nullable ColorInfo colorInfo = videoTrackFormat.colorInfo; + @C.ColorTransfer + int actualColorTransfer = + colorInfo == null || colorInfo.colorTransfer == Format.NO_VALUE + ? C.COLOR_TRANSFER_SDR + : colorInfo.colorTransfer; + assertThat(actualColorTransfer).isEqualTo(expectedColorTransfer); + } + + private static Format retrieveVideoTrackFormat(Context context, @Nullable String filePath) { TrackGroupArray trackGroupArray; try { trackGroupArray = @@ -59,14 +70,7 @@ public final class FileUtil { TrackGroup trackGroup = trackGroupArray.get(i); if (trackGroup.type == C.TRACK_TYPE_VIDEO) { assertThat(trackGroup.length).isEqualTo(1); - @Nullable ColorInfo colorInfo = trackGroup.getFormat(0).colorInfo; - @C.ColorTransfer - int actualColorTransfer = - colorInfo == null || colorInfo.colorTransfer == Format.NO_VALUE - ? C.COLOR_TRANSFER_SDR - : colorInfo.colorTransfer; - assertThat(actualColorTransfer).isEqualTo(expectedColorTransfer); - return; + return trackGroup.getFormat(0); } } throw new IllegalStateException("Couldn't find video track");