From 3aca3ad170198add1c6a1d21a63908ef872c1294 Mon Sep 17 00:00:00 2001 From: claincly Date: Tue, 14 Feb 2023 10:28:33 +0000 Subject: [PATCH] Use ColorInfo.Builder in transformer and common. Because the ColorInfo constructor is deprecated. PiperOrigin-RevId: 509468663 --- .../media3/common/util/MediaFormatUtil.java | 7 ++++++- .../effect/GlEffectsFrameProcessor.java | 7 +++++-- .../media3/transformer/AndroidTestUtil.java | 20 +++++++++---------- .../media3/transformer/mh/HdrEditingTest.java | 20 +++++++++---------- .../transformer/VideoSamplePipeline.java | 10 +++++----- 5 files changed, 36 insertions(+), 28 deletions(-) diff --git a/libraries/common/src/main/java/androidx/media3/common/util/MediaFormatUtil.java b/libraries/common/src/main/java/androidx/media3/common/util/MediaFormatUtil.java index 26b0decb6f..0bf588c27c 100644 --- a/libraries/common/src/main/java/androidx/media3/common/util/MediaFormatUtil.java +++ b/libraries/common/src/main/java/androidx/media3/common/util/MediaFormatUtil.java @@ -230,7 +230,12 @@ public final class MediaFormatUtil { || colorRange != Format.NO_VALUE || colorTransfer != Format.NO_VALUE || hdrStaticInfo != null) { - return new ColorInfo(colorSpace, colorRange, colorTransfer, hdrStaticInfo); + return new ColorInfo.Builder() + .setColorSpace(colorSpace) + .setColorRange(colorRange) + .setColorTransfer(colorTransfer) + .setHdrStaticInfo(hdrStaticInfo) + .build(); } return null; } diff --git a/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java b/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java index 8ed4eadc64..5b5c3ad449 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java @@ -260,8 +260,11 @@ public final class GlEffectsFrameProcessor implements FrameProcessor { ImmutableList.Builder rgbMatrixListBuilder = new ImmutableList.Builder<>(); boolean sampleFromInputTexture = true; ColorInfo linearColorInfo = - new ColorInfo( - outputColorInfo.colorSpace, outputColorInfo.colorRange, C.COLOR_TRANSFER_LINEAR, null); + outputColorInfo + .buildUpon() + .setColorTransfer(C.COLOR_TRANSFER_LINEAR) + .setHdrStaticInfo(null) + .build(); for (int i = 0; i < effects.size(); i++) { Effect effect = effects.get(i); checkArgument(effect instanceof GlEffect, "GlEffectsFrameProcessor only supports GlEffects"); diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java index d496f411e6..8b75757675 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java @@ -103,11 +103,11 @@ public final class AndroidTestUtil { .setHeight(1080) .setFrameRate(30.000f) .setColorInfo( - new ColorInfo( - C.COLOR_SPACE_BT2020, - C.COLOR_RANGE_LIMITED, - C.COLOR_TRANSFER_HLG, - /* hdrStaticInfo= */ null)) + new ColorInfo.Builder() + .setColorSpace(C.COLOR_SPACE_BT2020) + .setColorRange(C.COLOR_RANGE_LIMITED) + .setColorTransfer(C.COLOR_TRANSFER_HLG) + .build()) .build(); public static final String MP4_ASSET_1080P_4_SECOND_HDR10 = "asset:///media/mp4/hdr10-1080p.mp4"; public static final Format MP4_ASSET_1080P_4_SECOND_HDR10_FORMAT = @@ -117,11 +117,11 @@ public final class AndroidTestUtil { .setHeight(1080) .setFrameRate(23.517f) .setColorInfo( - new ColorInfo( - C.COLOR_SPACE_BT2020, - C.COLOR_RANGE_LIMITED, - C.COLOR_TRANSFER_ST2084, - /* hdrStaticInfo= */ null)) + new ColorInfo.Builder() + .setColorSpace(C.COLOR_SPACE_BT2020) + .setColorRange(C.COLOR_RANGE_LIMITED) + .setColorTransfer(C.COLOR_TRANSFER_ST2084) + .build()) .build(); public static final String MP4_ASSET_1080P_1_SECOND_HDR10_VIDEO_SDR_CONTAINER = "asset:///media/mp4/hdr10-video-with-sdr-container.mp4"; 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 cadefa5752..44c9df2597 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 @@ -56,17 +56,17 @@ import org.junit.runner.RunWith; public class HdrEditingTest { public static final String TAG = "HdrEditingTest"; private static final ColorInfo HDR10_DEFAULT_COLOR_INFO = - new ColorInfo( - C.COLOR_SPACE_BT2020, - C.COLOR_RANGE_LIMITED, - C.COLOR_TRANSFER_ST2084, - /* hdrStaticInfo= */ null); + new ColorInfo.Builder() + .setColorSpace(C.COLOR_SPACE_BT2020) + .setColorRange(C.COLOR_RANGE_LIMITED) + .setColorTransfer(C.COLOR_TRANSFER_ST2084) + .build(); private static final ColorInfo HLG10_DEFAULT_COLOR_INFO = - new ColorInfo( - C.COLOR_SPACE_BT2020, - C.COLOR_RANGE_LIMITED, - C.COLOR_TRANSFER_HLG, - /* hdrStaticInfo= */ null); + new ColorInfo.Builder() + .setColorSpace(C.COLOR_SPACE_BT2020) + .setColorRange(C.COLOR_RANGE_LIMITED) + .setColorTransfer(C.COLOR_TRANSFER_HLG) + .build(); @Test public void transform_noRequestedTranscode_hdr10File_transformsOrThrows() throws Exception { diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java index 163f0c7c5c..43e1a1e98f 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java @@ -128,11 +128,11 @@ import org.checkerframework.dataflow.qual.Pure; // C.COLOR_TRANSFER_SDR to the encoder. ColorInfo frameProcessorOutputColor = isGlToneMapping - ? new ColorInfo( - C.COLOR_SPACE_BT709, - C.COLOR_RANGE_LIMITED, - C.COLOR_TRANSFER_GAMMA_2_2, - /* hdrStaticInfo= */ null) + ? new ColorInfo.Builder() + .setColorSpace(C.COLOR_SPACE_BT709) + .setColorRange(C.COLOR_RANGE_LIMITED) + .setColorTransfer(C.COLOR_TRANSFER_GAMMA_2_2) + .build() : encoderInputColor; try { frameProcessor =