loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix recreation of DefaultShaderProgram in FinalWrapper

Browse Source 
`outputSurfaceInfoChanged` is not reset when `defaultShaderProgram` is null.
That is, on the first time `ensureConfigured()` is called with output size
changed, `outputSurfaceInfoChanged` is not set to false after creating the
`defaultShaderProgram`, and `defaultShaderProgram` will be created again on the
second time `ensureConfigured()` is called.

PiperOrigin-RevId: 537870404
(cherry picked from commit 133943a63520fbc872c3960647144fde8a918df8)
This commit is contained in:
claincly 2023-06-05 14:32:57 +00:00 committed by Tofunmi Adigun-Hameed
parent a8dbea74ce
commit 39ec69fe66
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/effect/src/main/java/androidx/media3/effect/FinalShaderProgramWrapper.java
View File

@ -461,14 +461,15 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
defaultShaderProgram = null; defaultShaderProgram = null;
outputSurfaceInfoChanged = false; outputSurfaceInfoChanged = false;
} }
if (defaultShaderProgram == null) { if (defaultShaderProgram == null) {
defaultShaderProgram = defaultShaderProgram =
createDefaultShaderProgram( createDefaultShaderProgram(
outputSurfaceInfo == null ? 0 : outputSurfaceInfo.orientationDegrees, outputSurfaceInfo == null ? 0 : outputSurfaceInfo.orientationDegrees,
outputWidth, outputWidth,
outputHeight); outputHeight);
outputSurfaceInfoChanged = false;
} }
return true; return true;
} }