Skip to content

SDK / exoplayer

Go to a project
Commit c827c80b by huangdarwin Committed by microkatz
Options

HDR: Add PQ support. 

Use the PQ OETF and EOTF to ensure that intermediate fragment shader operations
using PQ are in linear BT.2020 rather than PQ and HLG-1 BT.2020.

Also, swap the OETF and EOTF in shaders, as they were used incorrectly before

Manually tested by verifying transformer demo HLG and PQ videos look the same with and without this CL, including with a BitmapOverlayProcessor enabled to test flows both with one MatrixTransformationProcessor that skips HDR TFs, and with one that doesn't.

PiperOrigin-RevId: 469736067
(cherry picked from commit a2139109)
parent 8fe0cd34
Inline Side-by-side
Showing with 196 additions and 117 deletions
google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_copy_external_yuv_es3.glsl
...@@ -14,61 +14,92 @@ ...@@ -14,61 +14,92 @@
// limitations under the License. // limitations under the License.
// ES 3 fragment shader that: // ES 3 fragment shader that:
// 1. samples HLG BT.2020 YUV from an external texture with uTexSampler, where // 1. Samples electrical (HLG or PQ) BT.2020 YUV from an external texture with
// the sampler uses the EXT_YUV_target extension specified at // uTexSampler, where the sampler uses the EXT_YUV_target extension specified
// at
// https://www.khronos.org/registry/OpenGL/extensions/EXT/EXT_YUV_target.txt, // https://www.khronos.org/registry/OpenGL/extensions/EXT/EXT_YUV_target.txt,
// 2. Applies a YUV to RGB conversion using the specified color transform // 2. Applies a YUV to RGB conversion using the specified color transform
// uYuvToRgbColorTransform, yielding HLG BT.2020 RGB, // uYuvToRgbColorTransform, yielding electrical (HLG or PQ) BT.2020 RGB,
// 3. If uApplyHlgOetf is 1, outputs HLG BT.2020 RGB. If 0, outputs // 3. If uEotfGlColorTransfer is GL_COLOR_TRANSFER_NO_VALUE, outputs electrical
// linear BT.2020 RGB for intermediate shaders by applying the HLG OETF. // (HLG or PQ) BT.2020 RGB. Otherwise, outputs optical linear BT.2020 RGB for
// 4. Copies this converted texture color to the current output. // intermediate shaders by applying the HLG or PQ EOTF.
// 4. Copies this converted texture color to the current output, with alpha = 1.
#extension GL_OES_EGL_image_external : require #extension GL_OES_EGL_image_external : require
#extension GL_EXT_YUV_target : require #extension GL_EXT_YUV_target : require
precision mediump float; precision mediump float;
uniform __samplerExternal2DY2YEXT uTexSampler; uniform __samplerExternal2DY2YEXT uTexSampler;
uniform mat3 uYuvToRgbColorTransform; uniform mat3 uYuvToRgbColorTransform;
uniform float uApplyHlgOetf; // C.java#GlColorTransfer value.
uniform int uEotfGlColorTransfer;
in vec2 vTexSamplingCoord; in vec2 vTexSamplingCoord;
out vec4 outColor; out vec4 outColor;
// TODO(b/227624622): Consider using mediump to save precision, if it won't lead // TODO(b/227624622): Consider using mediump to save precision, if it won't lead
// to noticeable quantization errors. // to noticeable quantization errors.
// HLG OETF for one channel. // HLG EOTF for one channel.
highp float hlgOetfSingleChannel(highp float hlgChannel) { highp float hlgEotfSingleChannel(highp float hlgChannel) {
// Specification: // Specification:
// https://www.khronos.org/registry/DataFormat/specs/1.3/dataformat.1.3.inline.html#TRANSFER_HLG // https://www.khronos.org/registry/DataFormat/specs/1.3/dataformat.1.3.inline.html#TRANSFER_HLG
// Reference implementation: // Reference implementation:
// https://cs.android.com/android/platform/superproject/+/master:frameworks/native/libs/renderengine/gl/ProgramCache.cpp;l=529-543;drc=de09f10aa504fd8066370591a00c9ff1cafbb7fa // https://cs.android.com/android/platform/superproject/+/master:frameworks/native/libs/renderengine/gl/ProgramCache.cpp;l=265-279;drc=de09f10aa504fd8066370591a00c9ff1cafbb7fa
const highp float a = 0.17883277; const highp float a = 0.17883277;
const highp float b = 0.28466892; const highp float b = 0.28466892;
const highp float c = 0.55991073; const highp float c = 0.55991073;
return hlgChannel <= 0.5 ? hlgChannel * hlgChannel / 3.0 :
return hlgChannel <= 1.0 / 12.0 ? sqrt(3.0 * hlgChannel) : (b + exp((hlgChannel - c) / a)) / 12.0;
a * log(12.0 * hlgChannel - b) + c;
} }
// BT.2100-0 HLG OETF. Converts nonlinear relative display light to linear // BT.2100 / BT.2020 HLG EOTF.
// signal values, both normalized to [0, 1]. highp vec3 hlgEotf(highp vec3 hlgColor) {
highp vec4 hlgOetf(highp vec4 hlgColor) { return vec3(
return vec4( hlgEotfSingleChannel(hlgColor.r),
hlgOetfSingleChannel(hlgColor.r), hlgEotfSingleChannel(hlgColor.g),
hlgOetfSingleChannel(hlgColor.g), hlgEotfSingleChannel(hlgColor.b)
hlgOetfSingleChannel(hlgColor.b),
hlgColor.a
); );
} }
/** Convert YUV to RGBA. */ // BT.2100 / BT.2020 PQ EOTF.
vec4 yuvToRgba(vec3 yuv) { highp vec3 pqEotf(highp vec3 pqColor) {
// Specification:
// https://registry.khronos.org/DataFormat/specs/1.3/dataformat.1.3.inline.html#TRANSFER_PQ
// Reference implementation:
// https://cs.android.com/android/platform/superproject/+/master:frameworks/native/libs/renderengine/gl/ProgramCache.cpp;l=250-263;drc=de09f10aa504fd8066370591a00c9ff1cafbb7fa
const highp float m1 = (2610.0 / 16384.0);
const highp float m2 = (2523.0 / 4096.0) * 128.0;
const highp float c1 = (3424.0 / 4096.0);
const highp float c2 = (2413.0 / 4096.0) * 32.0;
const highp float c3 = (2392.0 / 4096.0) * 32.0;
highp vec3 temp = pow(clamp(pqColor, 0.0, 1.0), 1.0 / vec3(m2));
temp = max(temp - c1, 0.0) / (c2 - c3 * temp);
return pow(temp, 1.0 / vec3(m1));
}
// Applies the appropriate EOTF to convert nonlinear electrical values to linear
// optical values. Input and output are both normalized to [0, 1].
highp vec3 getOpticalColor(highp vec3 electricalColor) {
// LINT.IfChange(color_transfer)
const int COLOR_TRANSFER_ST2084 = 6;
const int COLOR_TRANSFER_HLG = 7;
if (uEotfGlColorTransfer == COLOR_TRANSFER_ST2084) {
return pqEotf(electricalColor);
} else if (uEotfGlColorTransfer == COLOR_TRANSFER_HLG) {
return hlgEotf(electricalColor);
} else {
return electricalColor;
}
}
vec3 yuvToRgb(vec3 yuv) {
const vec3 yuvOffset = vec3(0.0625, 0.5, 0.5); const vec3 yuvOffset = vec3(0.0625, 0.5, 0.5);
vec3 rgb = clamp(uYuvToRgbColorTransform * (yuv - yuvOffset), 0.0, 1.0); return clamp(uYuvToRgbColorTransform * (yuv - yuvOffset), 0.0, 1.0);
return vec4(rgb, 1.0);
} }
void main() { void main() {
vec3 srcYuv = texture(uTexSampler, vTexSamplingCoord).xyz; vec3 srcYuv = texture(uTexSampler, vTexSamplingCoord).xyz;
outColor = yuvToRgba(srcYuv); vec3 rgb = yuvToRgb(srcYuv);
outColor = (uApplyHlgOetf == 1.0) ? hlgOetf(outColor) : outColor; outColor = vec4(getOpticalColor(rgb), 1.0);
} }
google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_hlg_eotf_es3.glsl → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_oetf_es3.glsl
...@@ -14,42 +14,74 @@ ...@@ -14,42 +14,74 @@
// limitations under the License. // limitations under the License.
// ES 3 fragment shader that: // ES 3 fragment shader that:
// 1. samples linear BT.2020 RGB from a (non-external) texture with uTexSampler, // 1. samples optical linear BT.2020 RGB from a (non-external) texture with
// 2. applies the HLG OETF to yield HLG BT.2020 RGB, and // uTexSampler,
// 2. applies the HLG or PQ OETF to yield electrical (HLG or PQ) BT.2020 RGB,
// and
// 3. copies this converted texture color to the current output. // 3. copies this converted texture color to the current output.
precision mediump float; precision mediump float;
uniform sampler2D uTexSampler; uniform sampler2D uTexSampler;
in vec2 vTexSamplingCoord; in vec2 vTexSamplingCoord;
out vec4 outColor; out vec4 outColor;
// C.java#GlColorTransfer value.
// Only GL_COLOR_TRANSFER_ST2084 and GL_COLOR_TRANSFER_HLG are allowed.
uniform int uOetfGlColorTransfer;
uniform mat3 uColorTransform; uniform mat3 uColorTransform;
// TODO(b/227624622): Consider using mediump to save precision, if it won't lead // TODO(b/227624622): Consider using mediump to save precision, if it won't lead
// to noticeable quantization. // to noticeable quantization.
// HLG OETF for one channel. // HLG OETF for one channel.
highp float hlgEotfSingleChannel(highp float linearChannel) { highp float hlgOetfSingleChannel(highp float linearChannel) {
// Specification: // Specification:
// https://www.khronos.org/registry/DataFormat/specs/1.3/dataformat.1.3.inline.html#TRANSFER_HLG // https://www.khronos.org/registry/DataFormat/specs/1.3/dataformat.1.3.inline.html#TRANSFER_HLG
// Reference implementation: // Reference implementation:
// https://cs.android.com/android/platform/superproject/+/master:frameworks/native/libs/renderengine/gl/ProgramCache.cpp;l=265-279;drc=de09f10aa504fd8066370591a00c9ff1cafbb7fa // https://cs.android.com/android/platform/superproject/+/master:frameworks/native/libs/renderengine/gl/ProgramCache.cpp;l=529-543;drc=de09f10aa504fd8066370591a00c9ff1cafbb7fa
const highp float a = 0.17883277; const highp float a = 0.17883277;
const highp float b = 0.28466892; const highp float b = 0.28466892;
const highp float c = 0.55991073; const highp float c = 0.55991073;
return linearChannel <= 0.5 ? linearChannel * linearChannel / 3.0 :
(b + exp((linearChannel - c) / a)) / 12.0; return linearChannel <= 1.0 / 12.0 ? sqrt(3.0 * linearChannel) :
a * log(12.0 * linearChannel - b) + c;
} }
// BT.2100-0 HLG EOTF. Converts nonlinear signal values to linear relative // BT.2100 / BT.2020 HLG OETF.
// display light, both normalized to [0,1]. highp vec3 hlgOetf(highp vec3 linearColor) {
highp vec4 hlgEotf(highp vec4 linearColor) { return vec3(
return vec4( hlgOetfSingleChannel(linearColor.r),
hlgEotfSingleChannel(linearColor.r), hlgOetfSingleChannel(linearColor.g),
hlgEotfSingleChannel(linearColor.g), hlgOetfSingleChannel(linearColor.b)
hlgEotfSingleChannel(linearColor.b),
linearColor.a
); );
} }
// BT.2100 / BT.2020, PQ / ST2084 OETF.
highp vec3 pqOetf(highp vec3 linearColor) {
// Specification:
// https://registry.khronos.org/DataFormat/specs/1.3/dataformat.1.3.inline.html#TRANSFER_PQ
// Reference implementation:
// https://cs.android.com/android/platform/superproject/+/master:frameworks/native/libs/renderengine/gl/ProgramCache.cpp;l=514-527;drc=de09f10aa504fd8066370591a00c9ff1cafbb7fa
const highp float m1 = (2610.0 / 16384.0);
const highp float m2 = (2523.0 / 4096.0) * 128.0;
const highp float c1 = (3424.0 / 4096.0);
const highp float c2 = (2413.0 / 4096.0) * 32.0;
const highp float c3 = (2392.0 / 4096.0) * 32.0;
highp vec3 temp = pow(linearColor, vec3(m1));
temp = (c1 + c2 * temp) / (1.0 + c3 * temp);
return pow(temp, vec3(m2));
}
// Applies the appropriate OETF to convert linear optical signals to nonlinear
// electrical signals. Input and output are both normalzied to [0, 1].
highp vec3 getElectricalColor(highp vec3 linearColor) {
// LINT.IfChange(color_transfer)
const int GL_COLOR_TRANSFER_ST2084 = 6;
return (uOetfGlColorTransfer == GL_COLOR_TRANSFER_ST2084) ?
pqOetf(linearColor) : hlgOetf(linearColor);
}
void main() { void main() {
outColor = hlgEotf(texture(uTexSampler, vTexSamplingCoord)); vec4 inputColor = texture(uTexSampler, vTexSamplingCoord);
outColor = vec4(getElectricalColor(inputColor.rgb), inputColor.a);
} }
google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/FinalMatrixTransformationProcessorWrapper.java
...@@ -374,7 +374,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -374,7 +374,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
matrixTransformationListBuilder.build(), matrixTransformationListBuilder.build(),
sampleFromExternalTexture, sampleFromExternalTexture,
colorInfo, colorInfo,
/* outputOpticalColors= */ true); /* outputElectricalColors= */ true);
matrixTransformationProcessor.setTextureTransformMatrix(textureTransformMatrix); matrixTransformationProcessor.setTextureTransformMatrix(textureTransformMatrix);
Pair<Integer, Integer> outputSize = Pair<Integer, Integer> outputSize =
matrixTransformationProcessor.configure(inputWidth, inputHeight); matrixTransformationProcessor.configure(inputWidth, inputHeight);
......
google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlEffect.java
...@@ -35,10 +35,6 @@ public interface GlEffect extends Effect { ...@@ -35,10 +35,6 @@ public interface GlEffect extends Effect {
* @param useHdr Whether input textures come from an HDR source. If {@code true}, colors will be * @param useHdr Whether input textures come from an HDR source. If {@code true}, colors will be
* in linear RGB BT.2020. If {@code false}, colors will be in gamma RGB BT.709. * in linear RGB BT.2020. If {@code false}, colors will be in gamma RGB BT.709.
*/ */
// TODO(b/227624622): PQ input files will actually have the incorrect HLG OETF applied, so that
// the intermediate color space will be PQ with the HLG OETF applied. This means intermediate
// GlEffects affecting color will look incorrect on PQ input. Fix this by implementing proper PQ
// OETF / EOTF support.
GlTextureProcessor toGlTextureProcessor(Context context, boolean useHdr) GlTextureProcessor toGlTextureProcessor(Context context, boolean useHdr)
throws FrameProcessingException; throws FrameProcessingException;
} }
google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java
...@@ -210,7 +210,7 @@ public final class GlEffectsFrameProcessor implements FrameProcessor { ...@@ -210,7 +210,7 @@ public final class GlEffectsFrameProcessor implements FrameProcessor {
matrixTransformations, matrixTransformations,
sampleFromExternalTexture, sampleFromExternalTexture,
colorInfo, colorInfo,
/* outputOpticalColors= */ false)); /* outputElectricalColors= */ false));
matrixTransformationListBuilder = new ImmutableList.Builder<>(); matrixTransformationListBuilder = new ImmutableList.Builder<>();
sampleFromExternalTexture = false; sampleFromExternalTexture = false;
} }
...@@ -240,7 +240,7 @@ public final class GlEffectsFrameProcessor implements FrameProcessor { ...@@ -240,7 +240,7 @@ public final class GlEffectsFrameProcessor implements FrameProcessor {
ImmutableList.of(), ImmutableList.of(),
sampleFromExternalTexture, sampleFromExternalTexture,
colorInfo, colorInfo,
/* outputOpticalColors= */ false)); /* outputElectricalColors= */ false));
sampleFromExternalTexture = false; sampleFromExternalTexture = false;
} }
textureProcessorListBuilder.add( textureProcessorListBuilder.add(
......
google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/MatrixTransformationProcessor.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package androidx.media3.effect; package androidx.media3.effect;
import static com.google.android.exoplayer2.util.Assertions.checkArgument;
import static com.google.android.exoplayer2.util.Assertions.checkState; import static com.google.android.exoplayer2.util.Assertions.checkState;
import android.content.Context; import android.content.Context;
...@@ -23,6 +24,7 @@ import android.opengl.Matrix; ...@@ -23,6 +24,7 @@ import android.opengl.Matrix;
import android.util.Pair; import android.util.Pair;
import androidx.media3.common.FrameProcessingException; import androidx.media3.common.FrameProcessingException;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.GlProgram; import com.google.android.exoplayer2.util.GlProgram;
import com.google.android.exoplayer2.util.GlUtil; import com.google.android.exoplayer2.util.GlUtil;
import com.google.android.exoplayer2.video.ColorInfo; import com.google.android.exoplayer2.video.ColorInfo;
...@@ -51,8 +53,8 @@ import java.util.Arrays; ...@@ -51,8 +53,8 @@ import java.util.Arrays;
private static final String VERTEX_SHADER_TRANSFORMATION_ES3_PATH = private static final String VERTEX_SHADER_TRANSFORMATION_ES3_PATH =
"shaders/vertex_shader_transformation_es3.glsl"; "shaders/vertex_shader_transformation_es3.glsl";
private static final String FRAGMENT_SHADER_COPY_PATH = "shaders/fragment_shader_copy_es2.glsl"; private static final String FRAGMENT_SHADER_COPY_PATH = "shaders/fragment_shader_copy_es2.glsl";
private static final String FRAGMENT_SHADER_HLG_EOTF_ES3_PATH = private static final String FRAGMENT_SHADER_OETF_ES3_PATH =
"shaders/fragment_shader_hlg_eotf_es3.glsl"; "shaders/fragment_shader_oetf_es3.glsl";
private static final String FRAGMENT_SHADER_COPY_EXTERNAL_PATH = private static final String FRAGMENT_SHADER_COPY_EXTERNAL_PATH =
"shaders/fragment_shader_copy_external_es2.glsl"; "shaders/fragment_shader_copy_external_es2.glsl";
private static final String FRAGMENT_SHADER_COPY_EXTERNAL_YUV_ES3_PATH = private static final String FRAGMENT_SHADER_COPY_EXTERNAL_YUV_ES3_PATH =
...@@ -121,9 +123,9 @@ import java.util.Arrays; ...@@ -121,9 +123,9 @@ import java.util.Arrays;
this( this(
createGlProgram( createGlProgram(
context, context,
/* inputOpticalColorsFromExternalTexture= */ false, /* inputElectricalColorsFromExternalTexture= */ false,
useHdr, useHdr,
/* outputOpticalColors= */ false), /* outputElectricalColors= */ false),
ImmutableList.of(matrixTransformation), ImmutableList.of(matrixTransformation),
useHdr); useHdr);
} }
...@@ -144,9 +146,9 @@ import java.util.Arrays; ...@@ -144,9 +146,9 @@ import java.util.Arrays;
this( this(
createGlProgram( createGlProgram(
context, context,
/* inputOpticalColorsFromExternalTexture= */ false, /* inputElectricalColorsFromExternalTexture= */ false,
useHdr, useHdr,
/* outputOpticalColors= */ false), /* outputElectricalColors= */ false),
ImmutableList.of(matrixTransformation), ImmutableList.of(matrixTransformation),
useHdr); useHdr);
} }
...@@ -154,65 +156,70 @@ import java.util.Arrays; ...@@ -154,65 +156,70 @@ import java.util.Arrays;
/** /**
* Creates a new instance. * Creates a new instance.
* *
* <p>Able to convert optical {@link ColorInfo} inputs and outputs to and from the intermediate * <p>Able to convert nonlinear electrical {@link ColorInfo} inputs and outputs to and from the
* {@link GlTextureProcessor} colors of linear RGB BT.2020 for HDR, and gamma RGB BT.709 for SDR. * intermediate optical {@link GlTextureProcessor} colors of linear RGB BT.2020 for HDR, and gamma
* RGB BT.709 for SDR.
* *
* @param context The {@link Context}. * @param context The {@link Context}.
* @param matrixTransformations The {@link GlMatrixTransformation GlMatrixTransformations} to * @param matrixTransformations The {@link GlMatrixTransformation GlMatrixTransformations} to
* apply to each frame in order. * apply to each frame in order.
* @param inputOpticalColorsFromExternalTexture Whether optical color input will be provided using * @param inputElectricalColorsFromExternalTexture Whether electrical color input will be provided
* an external texture. If {@code true}, the caller should use {@link * using an external texture. If {@code true}, the caller should use {@link
* #setTextureTransformMatrix(float[])} to provide the transformation matrix associated with * #setTextureTransformMatrix(float[])} to provide the transformation matrix associated with
* the external texture. * the external texture.
* @param opticalColorInfo The optical {@link ColorInfo}, only used to transform between color * @param electricalColorInfo The electrical {@link ColorInfo}, only used to transform between
* spaces and transfers, when {@code inputOpticalColorsFromExternalTexture} or {@code * color spaces and transfers, when {@code inputElectricalColorsFromExternalTexture} or {@code
* outputOpticalColors} are {@code true}. If it {@link ColorInfo#isTransferHdr(ColorInfo)}, * outputElectricalColors} are {@code true}. If it is {@linkplain
* intermediate {@link GlTextureProcessor} colors will be in linear RGB BT.2020. Otherwise, * ColorInfo#isTransferHdr(ColorInfo) HDR}, intermediate {@link GlTextureProcessor} colors
* these colors will be in gamma RGB BT.709. * will be in linear RGB BT.2020. Otherwise, these colors will be in gamma RGB BT.709.
* @param outputOpticalColors If {@code true}, outputs {@code opticalColorInfo}. If {@code false}, * @param outputElectricalColors If {@code true}, outputs {@code electricalColorInfo}. If {@code
* outputs intermediate colors of linear RGB BT.2020 if {@code opticalColorInfo} {@link * false}, outputs intermediate colors of linear RGB BT.2020 if {@code electricalColorInfo} is
* ColorInfo#isTransferHdr(ColorInfo)}, and gamma RGB BT.709 otherwise. * {@linkplain ColorInfo#isTransferHdr(ColorInfo) HDR}, and gamma RGB BT.709 otherwise.
* @throws FrameProcessingException If a problem occurs while reading shader files or an OpenGL * @throws FrameProcessingException If a problem occurs while reading shader files or an OpenGL
* operation fails or is unsupported. * operation fails or is unsupported.
*/ */
public MatrixTransformationProcessor( public MatrixTransformationProcessor(
Context context, Context context,
ImmutableList<GlMatrixTransformation> matrixTransformations, ImmutableList<GlMatrixTransformation> matrixTransformations,
boolean inputOpticalColorsFromExternalTexture, boolean inputElectricalColorsFromExternalTexture,
ColorInfo opticalColorInfo, ColorInfo electricalColorInfo,
boolean outputOpticalColors) boolean outputElectricalColors)
throws FrameProcessingException { throws FrameProcessingException {
this( this(
createGlProgram( createGlProgram(
context, context,
inputOpticalColorsFromExternalTexture, inputElectricalColorsFromExternalTexture,
ColorInfo.isTransferHdr(opticalColorInfo), ColorInfo.isTransferHdr(electricalColorInfo),
outputOpticalColors), outputElectricalColors),
matrixTransformations, matrixTransformations,
ColorInfo.isTransferHdr(opticalColorInfo)); ColorInfo.isTransferHdr(electricalColorInfo));
if (!ColorInfo.isTransferHdr(opticalColorInfo) || !inputOpticalColorsFromExternalTexture) { if (!ColorInfo.isTransferHdr(electricalColorInfo)) {
return; return;
} }
// TODO(b/227624622): Implement YUV to RGB conversions in COLOR_RANGE_LIMITED as well, using
// opticalColorInfo.colorRange to select between them.
// In HDR editing mode the decoder output is sampled in YUV. @C.ColorTransfer int colorTransfer = electricalColorInfo.colorTransfer;
if (!GlUtil.isYuvTargetExtensionSupported()) { checkArgument(
throw new FrameProcessingException( colorTransfer == C.COLOR_TRANSFER_HLG || colorTransfer == C.COLOR_TRANSFER_ST2084);
"The EXT_YUV_target extension is required for HDR editing input."); if (inputElectricalColorsFromExternalTexture) {
} // In HDR editing mode the decoder output is sampled in YUV.
glProgram.setFloatsUniform( if (!GlUtil.isYuvTargetExtensionSupported()) {
"uYuvToRgbColorTransform", throw new FrameProcessingException(
opticalColorInfo.colorRange == C.COLOR_RANGE_FULL "The EXT_YUV_target extension is required for HDR editing input.");
? BT2020_FULL_RANGE_YUV_TO_RGB_COLOR_TRANSFORM_MATRIX }
: BT2020_LIMITED_RANGE_YUV_TO_RGB_COLOR_TRANSFORM_MATRIX); glProgram.setFloatsUniform(
"uYuvToRgbColorTransform",
electricalColorInfo.colorRange == C.COLOR_RANGE_FULL
? BT2020_FULL_RANGE_YUV_TO_RGB_COLOR_TRANSFORM_MATRIX
: BT2020_LIMITED_RANGE_YUV_TO_RGB_COLOR_TRANSFORM_MATRIX);
// TODO(b/227624622): Implement PQ and gamma TFs, and use an @IntDef to select between HLG, // TODO(b/241902517): Implement gamma transfer functions.
// PQ, and gamma, coming from opticalColorInfo.colorTransfer.
// Applying the OETF will output a linear signal. Not applying the OETF will output an optical // If electrical colors are both input and output, no EOTF is needed.
// signal. glProgram.setIntUniform(
glProgram.setFloatUniform("uApplyHlgOetf", outputOpticalColors ? 0.0f : 1.0f); "uEotfGlColorTransfer", outputElectricalColors ? Format.NO_VALUE : colorTransfer);
} else if (outputElectricalColors) {
glProgram.setIntUniform("uOetfGlColorTransfer", colorTransfer);
}
} }
/** /**
...@@ -241,14 +248,14 @@ import java.util.Arrays; ...@@ -241,14 +248,14 @@ import java.util.Arrays;
private static GlProgram createGlProgram( private static GlProgram createGlProgram(
Context context, Context context,
boolean inputOpticalColorsFromExternalTexture, boolean inputElectricalColorsFromExternalTexture,
boolean useHdr, boolean useHdr,
boolean outputOpticalColors) boolean outputElectricalColors)
throws FrameProcessingException { throws FrameProcessingException {
String vertexShaderFilePath; String vertexShaderFilePath;
String fragmentShaderFilePath; String fragmentShaderFilePath;
if (inputOpticalColorsFromExternalTexture) { if (inputElectricalColorsFromExternalTexture) {
if (useHdr) { if (useHdr) {
vertexShaderFilePath = VERTEX_SHADER_TRANSFORMATION_ES3_PATH; vertexShaderFilePath = VERTEX_SHADER_TRANSFORMATION_ES3_PATH;
fragmentShaderFilePath = FRAGMENT_SHADER_COPY_EXTERNAL_YUV_ES3_PATH; fragmentShaderFilePath = FRAGMENT_SHADER_COPY_EXTERNAL_YUV_ES3_PATH;
...@@ -256,9 +263,9 @@ import java.util.Arrays; ...@@ -256,9 +263,9 @@ import java.util.Arrays;
vertexShaderFilePath = VERTEX_SHADER_TRANSFORMATION_PATH; vertexShaderFilePath = VERTEX_SHADER_TRANSFORMATION_PATH;
fragmentShaderFilePath = FRAGMENT_SHADER_COPY_EXTERNAL_PATH; fragmentShaderFilePath = FRAGMENT_SHADER_COPY_EXTERNAL_PATH;
} }
} else if (outputOpticalColors && useHdr) { } else if (outputElectricalColors && useHdr) {
vertexShaderFilePath = VERTEX_SHADER_TRANSFORMATION_ES3_PATH; vertexShaderFilePath = VERTEX_SHADER_TRANSFORMATION_ES3_PATH;
fragmentShaderFilePath = FRAGMENT_SHADER_HLG_EOTF_ES3_PATH; fragmentShaderFilePath = FRAGMENT_SHADER_OETF_ES3_PATH;
} else { } else {
vertexShaderFilePath = VERTEX_SHADER_TRANSFORMATION_PATH; vertexShaderFilePath = VERTEX_SHADER_TRANSFORMATION_PATH;
fragmentShaderFilePath = FRAGMENT_SHADER_COPY_PATH; fragmentShaderFilePath = FRAGMENT_SHADER_COPY_PATH;
......
library/common/src/main/java/com/google/android/exoplayer2/util/GlProgram.java
...@@ -182,12 +182,17 @@ public final class GlProgram { ...@@ -182,12 +182,17 @@ public final class GlProgram {
checkNotNull(uniformByName.get(name)).setSamplerTexId(texId, texUnitIndex); checkNotNull(uniformByName.get(name)).setSamplerTexId(texId, texUnitIndex);
} }
/** Sets a float type uniform. */ /** Sets an {@code int} type uniform. */
public void setIntUniform(String name, int value) {
checkNotNull(uniformByName.get(name)).setInt(value);
}
/** Sets a {@code float} type uniform. */
public void setFloatUniform(String name, float value) { public void setFloatUniform(String name, float value) {
checkNotNull(uniformByName.get(name)).setFloat(value); checkNotNull(uniformByName.get(name)).setFloat(value);
} }
/** Sets a float array type uniform. */ /** Sets a {@code float[]} type uniform. */
public void setFloatsUniform(String name, float[] value) { public void setFloatsUniform(String name, float[] value) {
checkNotNull(uniformByName.get(name)).setFloats(value); checkNotNull(uniformByName.get(name)).setFloats(value);
} }
...@@ -321,16 +326,17 @@ public final class GlProgram { ...@@ -321,16 +326,17 @@ public final class GlProgram {
private final int location; private final int location;
private final int type; private final int type;
private final float[] value; private final float[] floatValue;
private int texId; private int intValue;
private int texIdValue;
private int texUnitIndex; private int texUnitIndex;
private Uniform(String name, int location, int type) { private Uniform(String name, int location, int type) {
this.name = name; this.name = name;
this.location = location; this.location = location;
this.type = type; this.type = type;
this.value = new float[16]; this.floatValue = new float[16];
} }
/** /**
...@@ -340,18 +346,22 @@ public final class GlProgram { ...@@ -340,18 +346,22 @@ public final class GlProgram {
* @param texUnitIndex The GL texture unit index. * @param texUnitIndex The GL texture unit index.
*/ */
public void setSamplerTexId(int texId, int texUnitIndex) { public void setSamplerTexId(int texId, int texUnitIndex) {
this.texId = texId; this.texIdValue = texId;
this.texUnitIndex = texUnitIndex; this.texUnitIndex = texUnitIndex;
} }
/** Configures {@link #bind()} to use the specified {@code int} {@code value}. */
public void setInt(int value) {
this.intValue = value;
}
/** Configures {@link #bind()} to use the specified float {@code value} for this uniform. */ /** Configures {@link #bind()} to use the specified {@code float} {@code value}. */
public void setFloat(float value) { public void setFloat(float value) {
this.value[0] = value; this.floatValue[0] = value;
} }
/** Configures {@link #bind()} to use the specified float[] {@code value} for this uniform. */ /** Configures {@link #bind()} to use the specified {@code float[]} {@code value}. */
public void setFloats(float[] value) { public void setFloats(float[] value) {
System.arraycopy(value, /* srcPos= */ 0, this.value, /* destPos= */ 0, value.length); System.arraycopy(value, /* srcPos= */ 0, this.floatValue, /* destPos= */ 0, value.length);
} }
/** /**
...@@ -362,32 +372,35 @@ public final class GlProgram { ...@@ -362,32 +372,35 @@ public final class GlProgram {
*/ */
public void bind() throws GlUtil.GlException { public void bind() throws GlUtil.GlException {
switch (type) { switch (type) {
case GLES20.GL_INT:
GLES20.glUniform1i(location, intValue);
break;
case GLES20.GL_FLOAT: case GLES20.GL_FLOAT:
GLES20.glUniform1fv(location, /* count= */ 1, value, /* offset= */ 0); GLES20.glUniform1fv(location, /* count= */ 1, floatValue, /* offset= */ 0);
GlUtil.checkGlError(); GlUtil.checkGlError();
break; break;
case GLES20.GL_FLOAT_VEC2: case GLES20.GL_FLOAT_VEC2:
GLES20.glUniform2fv(location, /* count= */ 1, value, /* offset= */ 0); GLES20.glUniform2fv(location, /* count= */ 1, floatValue, /* offset= */ 0);
GlUtil.checkGlError(); GlUtil.checkGlError();
break; break;
case GLES20.GL_FLOAT_VEC3: case GLES20.GL_FLOAT_VEC3:
GLES20.glUniform3fv(location, /* count= */ 1, value, /* offset= */ 0); GLES20.glUniform3fv(location, /* count= */ 1, floatValue, /* offset= */ 0);
GlUtil.checkGlError(); GlUtil.checkGlError();
break; break;
case GLES20.GL_FLOAT_MAT3: case GLES20.GL_FLOAT_MAT3:
GLES20.glUniformMatrix3fv( GLES20.glUniformMatrix3fv(
location, /* count= */ 1, /* transpose= */ false, value, /* offset= */ 0); location, /* count= */ 1, /* transpose= */ false, floatValue, /* offset= */ 0);
GlUtil.checkGlError(); GlUtil.checkGlError();
break; break;
case GLES20.GL_FLOAT_MAT4: case GLES20.GL_FLOAT_MAT4:
GLES20.glUniformMatrix4fv( GLES20.glUniformMatrix4fv(
location, /* count= */ 1, /* transpose= */ false, value, /* offset= */ 0); location, /* count= */ 1, /* transpose= */ false, floatValue, /* offset= */ 0);
GlUtil.checkGlError(); GlUtil.checkGlError();
break; break;
case GLES20.GL_SAMPLER_2D: case GLES20.GL_SAMPLER_2D:
case GLES11Ext.GL_SAMPLER_EXTERNAL_OES: case GLES11Ext.GL_SAMPLER_EXTERNAL_OES:
case GL_SAMPLER_EXTERNAL_2D_Y2Y_EXT: case GL_SAMPLER_EXTERNAL_2D_Y2Y_EXT:
if (texId == 0) { if (texIdValue == 0) {
throw new IllegalStateException("No call to setSamplerTexId() before bind."); throw new IllegalStateException("No call to setSamplerTexId() before bind.");
} }
GLES20.glActiveTexture(GLES20.GL_TEXTURE0 + texUnitIndex); GLES20.glActiveTexture(GLES20.GL_TEXTURE0 + texUnitIndex);
...@@ -396,7 +409,7 @@ public final class GlProgram { ...@@ -396,7 +409,7 @@ public final class GlProgram {
type == GLES20.GL_SAMPLER_2D type == GLES20.GL_SAMPLER_2D
? GLES20.GL_TEXTURE_2D ? GLES20.GL_TEXTURE_2D
: GLES11Ext.GL_TEXTURE_EXTERNAL_OES, : GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
texId); texIdValue);
GLES20.glUniform1i(location, texUnitIndex); GLES20.glUniform1i(location, texUnitIndex);
GlUtil.checkGlError(); GlUtil.checkGlError();
break; break;
......
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