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 not ignoring invalid color info.

Browse Source 
PiperOrigin-RevId: 526595567
This commit is contained in:
claincly 2023-04-24 11:53:10 +01:00 committed by Ian Baker
parent 6aacbc6bbb
commit fcec5a29c1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java
View File

@ -391,8 +391,8 @@ import org.checkerframework.dataflow.qual.Pure;
// populate default color info, which depends on the resolution. // populate default color info, which depends on the resolution.
return ColorInfo.SDR_BT709_LIMITED; return ColorInfo.SDR_BT709_LIMITED;
} }
if (inputFormat.colorInfo == null) { if (inputFormat.colorInfo == null || !inputFormat.colorInfo.isValid()) {
Log.d(TAG, "colorInfo is null. Defaulting to SDR_BT709_LIMITED."); Log.d(TAG, "colorInfo is null or invalid. Defaulting to SDR_BT709_LIMITED.");
return ColorInfo.SDR_BT709_LIMITED; return ColorInfo.SDR_BT709_LIMITED;
} }
return inputFormat.colorInfo; return inputFormat.colorInfo;