From 38d3fb5382867c2d49ee16d22cd3a677e060912c Mon Sep 17 00:00:00 2001 From: huangdarwin Date: Fri, 5 May 2023 16:18:39 +0000 Subject: [PATCH] HDR: Don't register unsupported HDR bitmap input. Minimal fix for HDR test postsubmit breakage PiperOrigin-RevId: 529734521 --- .../androidx/media3/effect/DefaultVideoFrameProcessor.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 f16bc20bf3..a3c8f18b34 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java @@ -560,7 +560,11 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor { textureOutputListener); inputSwitcher.registerInput(INPUT_TYPE_SURFACE); - inputSwitcher.registerInput(INPUT_TYPE_BITMAP); + if (!ColorInfo.isTransferHdr(inputColorInfo)) { + // HDR bitmaps are not supported. + inputSwitcher.registerInput(INPUT_TYPE_BITMAP); + } + inputSwitcher.setDownstreamShaderProgram(effectsShaderPrograms.get(0)); setGlObjectProviderOnShaderPrograms(effectsShaderPrograms, glObjectsProvider);