Make MatrixTransformationsProcessor constructor to take in Lists.
* Replace ImmutableLists to List interface for constructors PiperOrigin-RevId: 472433434
This commit is contained in:
parent
c0ad9f51fa
commit
ce0e3a4fa3
@ -31,6 +31,7 @@ import com.google.android.exoplayer2.video.ColorInfo;
|
|||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Applies a sequence of {@link MatrixTransformation MatrixTransformations} in the vertex shader and
|
* Applies a sequence of {@link MatrixTransformation MatrixTransformations} in the vertex shader and
|
||||||
@ -134,8 +135,8 @@ import java.util.Arrays;
|
|||||||
*/
|
*/
|
||||||
public static MatrixTransformationProcessor create(
|
public static MatrixTransformationProcessor create(
|
||||||
Context context,
|
Context context,
|
||||||
ImmutableList<GlMatrixTransformation> matrixTransformations,
|
List<GlMatrixTransformation> matrixTransformations,
|
||||||
ImmutableList<RgbMatrix> rgbMatrices,
|
List<RgbMatrix> rgbMatrices,
|
||||||
boolean useHdr)
|
boolean useHdr)
|
||||||
throws FrameProcessingException {
|
throws FrameProcessingException {
|
||||||
GlProgram glProgram =
|
GlProgram glProgram =
|
||||||
@ -143,7 +144,11 @@ import java.util.Arrays;
|
|||||||
context, VERTEX_SHADER_TRANSFORMATION_PATH, FRAGMENT_SHADER_TRANSFORMATION_PATH);
|
context, VERTEX_SHADER_TRANSFORMATION_PATH, FRAGMENT_SHADER_TRANSFORMATION_PATH);
|
||||||
|
|
||||||
// No transfer functions needed, because input and output are both optical colors.
|
// No transfer functions needed, because input and output are both optical colors.
|
||||||
return new MatrixTransformationProcessor(glProgram, matrixTransformations, rgbMatrices, useHdr);
|
return new MatrixTransformationProcessor(
|
||||||
|
glProgram,
|
||||||
|
ImmutableList.copyOf(matrixTransformations),
|
||||||
|
ImmutableList.copyOf(rgbMatrices),
|
||||||
|
useHdr);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -171,8 +176,8 @@ import java.util.Arrays;
|
|||||||
*/
|
*/
|
||||||
public static MatrixTransformationProcessor createWithExternalSamplerApplyingEotf(
|
public static MatrixTransformationProcessor createWithExternalSamplerApplyingEotf(
|
||||||
Context context,
|
Context context,
|
||||||
ImmutableList<GlMatrixTransformation> matrixTransformations,
|
List<GlMatrixTransformation> matrixTransformations,
|
||||||
ImmutableList<RgbMatrix> rgbMatrices,
|
List<RgbMatrix> rgbMatrices,
|
||||||
ColorInfo electricalColorInfo)
|
ColorInfo electricalColorInfo)
|
||||||
throws FrameProcessingException {
|
throws FrameProcessingException {
|
||||||
boolean useHdr = ColorInfo.isTransferHdr(electricalColorInfo);
|
boolean useHdr = ColorInfo.isTransferHdr(electricalColorInfo);
|
||||||
@ -203,7 +208,11 @@ import java.util.Arrays;
|
|||||||
glProgram.setIntUniform("uEotfColorTransfer", colorTransfer);
|
glProgram.setIntUniform("uEotfColorTransfer", colorTransfer);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new MatrixTransformationProcessor(glProgram, matrixTransformations, rgbMatrices, useHdr);
|
return new MatrixTransformationProcessor(
|
||||||
|
glProgram,
|
||||||
|
ImmutableList.copyOf(matrixTransformations),
|
||||||
|
ImmutableList.copyOf(rgbMatrices),
|
||||||
|
useHdr);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -227,8 +236,8 @@ import java.util.Arrays;
|
|||||||
*/
|
*/
|
||||||
public static MatrixTransformationProcessor createApplyingOetf(
|
public static MatrixTransformationProcessor createApplyingOetf(
|
||||||
Context context,
|
Context context,
|
||||||
ImmutableList<GlMatrixTransformation> matrixTransformations,
|
List<GlMatrixTransformation> matrixTransformations,
|
||||||
ImmutableList<RgbMatrix> rgbMatrices,
|
List<RgbMatrix> rgbMatrices,
|
||||||
ColorInfo electricalColorInfo)
|
ColorInfo electricalColorInfo)
|
||||||
throws FrameProcessingException {
|
throws FrameProcessingException {
|
||||||
boolean useHdr = ColorInfo.isTransferHdr(electricalColorInfo);
|
boolean useHdr = ColorInfo.isTransferHdr(electricalColorInfo);
|
||||||
@ -246,7 +255,11 @@ import java.util.Arrays;
|
|||||||
glProgram.setIntUniform("uOetfColorTransfer", colorTransfer);
|
glProgram.setIntUniform("uOetfColorTransfer", colorTransfer);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new MatrixTransformationProcessor(glProgram, matrixTransformations, rgbMatrices, useHdr);
|
return new MatrixTransformationProcessor(
|
||||||
|
glProgram,
|
||||||
|
ImmutableList.copyOf(matrixTransformations),
|
||||||
|
ImmutableList.copyOf(rgbMatrices),
|
||||||
|
useHdr);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -270,8 +283,8 @@ import java.util.Arrays;
|
|||||||
*/
|
*/
|
||||||
public static MatrixTransformationProcessor createWithExternalSamplerApplyingEotfThenOetf(
|
public static MatrixTransformationProcessor createWithExternalSamplerApplyingEotfThenOetf(
|
||||||
Context context,
|
Context context,
|
||||||
ImmutableList<GlMatrixTransformation> matrixTransformations,
|
List<GlMatrixTransformation> matrixTransformations,
|
||||||
ImmutableList<RgbMatrix> rgbMatrices,
|
List<RgbMatrix> rgbMatrices,
|
||||||
ColorInfo electricalColorInfo)
|
ColorInfo electricalColorInfo)
|
||||||
throws FrameProcessingException {
|
throws FrameProcessingException {
|
||||||
boolean useHdr = ColorInfo.isTransferHdr(electricalColorInfo);
|
boolean useHdr = ColorInfo.isTransferHdr(electricalColorInfo);
|
||||||
@ -300,7 +313,11 @@ import java.util.Arrays;
|
|||||||
glProgram.setIntUniform("uEotfColorTransfer", Format.NO_VALUE);
|
glProgram.setIntUniform("uEotfColorTransfer", Format.NO_VALUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new MatrixTransformationProcessor(glProgram, matrixTransformations, rgbMatrices, useHdr);
|
return new MatrixTransformationProcessor(
|
||||||
|
glProgram,
|
||||||
|
ImmutableList.copyOf(matrixTransformations),
|
||||||
|
ImmutableList.copyOf(rgbMatrices),
|
||||||
|
useHdr);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user