From 00d5031dcfbea8c62555828452f714b8cb8a63b3 Mon Sep 17 00:00:00 2001 From: tofunmi Date: Tue, 9 May 2023 17:50:20 +0000 Subject: [PATCH] Disable texture input when input is HDR Verified by running all the tests in mh (excluding the analysis tests) on a pixel 7 pro PiperOrigin-RevId: 530655237 --- .../media3/effect/DefaultVideoFrameProcessor.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java b/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java index 946ab9775d..228b483253 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java @@ -572,12 +572,12 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor { inputSwitcher.registerInput(INPUT_TYPE_SURFACE); if (!ColorInfo.isTransferHdr(inputColorInfo)) { - // HDR bitmaps are not supported. + // HDR bitmap or texture input is not supported. inputSwitcher.registerInput(INPUT_TYPE_BITMAP); - } - if (inputColorInfo.colorTransfer != C.COLOR_TRANSFER_SRGB) { - // Image and textureId concatenation not supported. - inputSwitcher.registerInput(INPUT_TYPE_TEXTURE_ID); + if (inputColorInfo.colorTransfer != C.COLOR_TRANSFER_SRGB) { + // Image and textureId concatenation not supported. + inputSwitcher.registerInput(INPUT_TYPE_TEXTURE_ID); + } } inputSwitcher.setDownstreamShaderProgram(effectsShaderPrograms.get(0));