From fcec5a29c1ae464115e8f708a068aa7c417a267e Mon Sep 17 00:00:00 2001
From: claincly <claincly@google.com>
Date: Mon, 24 Apr 2023 11:53:10 +0100
Subject: [PATCH] Fix not ignoring invalid color info.

PiperOrigin-RevId: 526595567
---
 .../java/androidx/media3/transformer/VideoSamplePipeline.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java
index b48c85d6df..297362acfb 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java
@@ -391,8 +391,8 @@ import org.checkerframework.dataflow.qual.Pure;
         // populate default color info, which depends on the resolution.
         return ColorInfo.SDR_BT709_LIMITED;
       }
-      if (inputFormat.colorInfo == null) {
-        Log.d(TAG, "colorInfo is null. Defaulting to SDR_BT709_LIMITED.");
+      if (inputFormat.colorInfo == null || !inputFormat.colorInfo.isValid()) {
+        Log.d(TAG, "colorInfo is null or invalid. Defaulting to SDR_BT709_LIMITED.");
         return ColorInfo.SDR_BT709_LIMITED;
       }
       return inputFormat.colorInfo;