sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-28 09:55:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix outputHeight pass-through condition.

Browse source 
The outputHeight in the TransformationRequest is the height of
the frame as it would be displayed (i.e., after applying any
rotation specified in the format). So pass-through should only
be used if the requested outputHeight matches the input
format's height after applying the rotation.

PiperOrigin-RevId: 457934867
(cherry picked from commit c74cf1f1aa)
This commit is contained in:
hschlueter 2022-06-29 10:28:54 +00:00 committed by microkatz
parent c812c80a2f
commit 47cc8aaf92
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerVideoRenderer.java
View file

@ -148,8 +148,11 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
if (transformationRequest.scaleY != 1f) {
return false;
}
// The decoder rotates encoded frames for display by inputFormat.rotationDegrees.
int decodedHeight =
(inputFormat.rotationDegrees % 180 == 0) ? inputFormat.height : inputFormat.width;
if (transformationRequest.outputHeight != C.LENGTH_UNSET
&& transformationRequest.outputHeight != inputFormat.height) {
&& transformationRequest.outputHeight != decodedHeight) {
return false;
}
if (!effects.isEmpty()) {