Skip to content

SDK / exoplayer

Go to a project
Commit 54ebfa98 by tofunmi Committed by Ian Baker
Options

disable transfer colors in DefaultShaderProgram.createApplyingOetf 

PiperOrigin-RevId: 522347729
parent 24ca6828
Inline Side-by-side
Showing with 16 additions and 3 deletions
libraries/effect/src/main/java/androidx/media3/effect/DefaultShaderProgram.java
...@@ -294,7 +294,8 @@ import java.util.List; ...@@ -294,7 +294,8 @@ import java.util.List;
Context context, Context context,
List<GlMatrixTransformation> matrixTransformations, List<GlMatrixTransformation> matrixTransformations,
List<RgbMatrix> rgbMatrices, List<RgbMatrix> rgbMatrices,
ColorInfo outputColorInfo) ColorInfo outputColorInfo,
boolean enableColorTransfers)
throws VideoFrameProcessingException { throws VideoFrameProcessingException {
boolean outputIsHdr = ColorInfo.isTransferHdr(outputColorInfo); boolean outputIsHdr = ColorInfo.isTransferHdr(outputColorInfo);
String vertexShaderFilePath = String vertexShaderFilePath =
...@@ -303,6 +304,9 @@ import java.util.List; ...@@ -303,6 +304,9 @@ import java.util.List;
outputIsHdr outputIsHdr
? FRAGMENT_SHADER_OETF_ES3_PATH ? FRAGMENT_SHADER_OETF_ES3_PATH
: FRAGMENT_SHADER_TRANSFORMATION_SDR_OETF_ES2_PATH; : FRAGMENT_SHADER_TRANSFORMATION_SDR_OETF_ES2_PATH;
if (!enableColorTransfers) {
fragmentShaderFilePath = FRAGMENT_SHADER_TRANSFORMATION_PATH;
}
GlProgram glProgram = createGlProgram(context, vertexShaderFilePath, fragmentShaderFilePath); GlProgram glProgram = createGlProgram(context, vertexShaderFilePath, fragmentShaderFilePath);
@C.ColorTransfer int outputColorTransfer = outputColorInfo.colorTransfer; @C.ColorTransfer int outputColorTransfer = outputColorInfo.colorTransfer;
...@@ -310,8 +314,9 @@ import java.util.List; ...@@ -310,8 +314,9 @@ import java.util.List;
checkArgument( checkArgument(
outputColorTransfer == C.COLOR_TRANSFER_HLG outputColorTransfer == C.COLOR_TRANSFER_HLG
|| outputColorTransfer == C.COLOR_TRANSFER_ST2084); || outputColorTransfer == C.COLOR_TRANSFER_ST2084);
checkArgument(enableColorTransfers);
glProgram.setIntUniform("uOutputColorTransfer", outputColorTransfer); glProgram.setIntUniform("uOutputColorTransfer", outputColorTransfer);
} else { } else if (enableColorTransfers) {
checkArgument( checkArgument(
outputColorTransfer == C.COLOR_TRANSFER_SDR outputColorTransfer == C.COLOR_TRANSFER_SDR
|| outputColorTransfer == C.COLOR_TRANSFER_GAMMA_2_2); || outputColorTransfer == C.COLOR_TRANSFER_GAMMA_2_2);
......
libraries/effect/src/main/java/androidx/media3/effect/FinalShaderProgramWrapper.java
...@@ -509,7 +509,11 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -509,7 +509,11 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
} else { } else {
defaultShaderProgram = defaultShaderProgram =
DefaultShaderProgram.createApplyingOetf( DefaultShaderProgram.createApplyingOetf(
context, expandedMatrixTransformations, rgbMatrices, outputColorInfo); context,
expandedMatrixTransformations,
rgbMatrices,
outputColorInfo,
enableColorTransfers);
} }
defaultShaderProgram.setTextureTransformMatrix(textureTransformMatrix); defaultShaderProgram.setTextureTransformMatrix(textureTransformMatrix);
...@@ -527,12 +531,16 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -527,12 +531,16 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
.maybeRenderToSurfaceView( .maybeRenderToSurfaceView(
() -> { () -> {
GlUtil.clearOutputFrame(); GlUtil.clearOutputFrame();
if (enableColorTransfers) {
@C.ColorTransfer @C.ColorTransfer
int configuredColorTransfer = defaultShaderProgram.getOutputColorTransfer(); int configuredColorTransfer = defaultShaderProgram.getOutputColorTransfer();
defaultShaderProgram.setOutputColorTransfer( defaultShaderProgram.setOutputColorTransfer(
debugSurfaceViewWrapper.outputColorTransfer); debugSurfaceViewWrapper.outputColorTransfer);
defaultShaderProgram.drawFrame(inputTexture.texId, presentationTimeUs); defaultShaderProgram.drawFrame(inputTexture.texId, presentationTimeUs);
defaultShaderProgram.setOutputColorTransfer(configuredColorTransfer); defaultShaderProgram.setOutputColorTransfer(configuredColorTransfer);
} else {
defaultShaderProgram.drawFrame(inputTexture.texId, presentationTimeUs);
}
}, },
glObjectsProvider); glObjectsProvider);
} catch (VideoFrameProcessingException | GlUtil.GlException e) { } catch (VideoFrameProcessingException | GlUtil.GlException e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment