From b814404c561adada85cec366d1ca8f38d7ad25b9 Mon Sep 17 00:00:00 2001 From: huangdarwin Date: Thu, 17 Aug 2023 14:32:07 +0100 Subject: [PATCH] Effect: Update rgba matrix reference to rgb. The 4x4 matrix only updates the RGB channels, so it should be referred to as an rgb matrix, not an rgba matrix. PiperOrigin-RevId: 557804613 --- .../java/androidx/media3/effect/DefaultShaderProgram.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/effect/src/main/java/androidx/media3/effect/DefaultShaderProgram.java b/libraries/effect/src/main/java/androidx/media3/effect/DefaultShaderProgram.java index bd182a9f3d..1ec8192eec 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/DefaultShaderProgram.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/DefaultShaderProgram.java @@ -460,7 +460,7 @@ import java.util.List; @Override public void drawFrame(int inputTexId, long presentationTimeUs) throws VideoFrameProcessingException { - updateCompositeRgbaMatrixArray(presentationTimeUs); + updateCompositeRgbMatrixArray(presentationTimeUs); updateCompositeTransformationMatrixAndVisiblePolygon(presentationTimeUs); if (visiblePolygon.size() < 3) { return; // Need at least three visible vertices for a triangle. @@ -562,7 +562,7 @@ import java.util.List; } /** Updates {@link #compositeRgbMatrixArray} based on the given frame timestamp. */ - private void updateCompositeRgbaMatrixArray(long presentationTimeUs) { + private void updateCompositeRgbMatrixArray(long presentationTimeUs) { float[][] matricesCurrTimestamp = new float[rgbMatrices.size()][16]; for (int i = 0; i < rgbMatrices.size(); i++) { matricesCurrTimestamp[i] = rgbMatrices.get(i).getMatrix(presentationTimeUs, useHdr);