Update image transcoding pipeline to signal input COLOR_TRANSFER_SRGB

The production code changes are in transformer, but the tests in effect have also been updated to confirm the is no color regression `inputColorInfo.colorTransfer=C.COLOR_TRANSFER_SRGB`

PiperOrigin-RevId: 526950435

libraries/common/src/main/java/androidx/media3/common/ColorInfo.java

@@ -134,7 +134,7 @@ public final class ColorInfo implements Bundleable {
    * Color info representing SDR sRGB in accordance with {@link
    * android.hardware.DataSpace#DATASPACE_SRGB}, which is a common SDR image color format.
    */
-  public static final ColorInfo SRGB_FULL =
+  public static final ColorInfo SRGB_BT709_FULL =
       new ColorInfo.Builder()
           .setColorSpace(C.COLOR_SPACE_BT709)
           .setColorRange(C.COLOR_RANGE_FULL)

libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java

@@ -21,6 +21,7 @@ import static androidx.media3.test.utils.BitmapPixelTestUtil.readBitmap;
 import static com.google.common.truth.Truth.assertThat;
 
 import androidx.media3.common.C;
+import androidx.media3.common.ColorInfo;
 import androidx.media3.test.utils.VideoFrameProcessorTestRunner;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.util.Queue;
@@ -126,6 +127,7 @@ public class DefaultVideoFrameProcessorImageFrameOutputTest {
         .setTestId(testId)
         .setVideoFrameProcessorFactory(new DefaultVideoFrameProcessor.Factory.Builder().build())
         .setInputType(INPUT_TYPE_BITMAP)
+        .setInputColorInfo(ColorInfo.SRGB_BT709_FULL)
         .setOnOutputFrameAvailableListener(
             unused -> checkNotNull(framesProduced).incrementAndGet());
   }

libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java

@@ -27,6 +27,7 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
 import androidx.media3.common.C;
+import androidx.media3.common.ColorInfo;
 import androidx.media3.common.Effect;
 import androidx.media3.common.VideoFrameProcessingException;
 import androidx.media3.common.util.Size;
@@ -111,7 +112,10 @@ public final class DefaultVideoFrameProcessorPixelTest {
   public void noEffects_withImageInput_matchesGoldenFile() throws Exception {
     String testId = "noEffects_withImageInput_matchesGoldenFile";
     videoFrameProcessorTestRunner =
-        getDefaultFrameProcessorTestRunnerBuilder(testId).setInputType(INPUT_TYPE_BITMAP).build();
+        getDefaultFrameProcessorTestRunnerBuilder(testId)
+            .setInputType(INPUT_TYPE_BITMAP)
+            .setInputColorInfo(ColorInfo.SRGB_BT709_FULL)
+            .build();
     Bitmap originalBitmap = readBitmap(IMAGE_PNG_ASSET_PATH);
     Bitmap expectedBitmap = readBitmap(IMAGE_TO_VIDEO_PNG_ASSET_PATH);
 
@@ -131,6 +135,7 @@ public final class DefaultVideoFrameProcessorPixelTest {
     videoFrameProcessorTestRunner =
         getDefaultFrameProcessorTestRunnerBuilder(testId)
             .setInputType(INPUT_TYPE_BITMAP)
+            .setInputColorInfo(ColorInfo.SRGB_BT709_FULL)
             .setEffects(
                 new GlEffectWrapper(
                     new Crop(

libraries/transformer/src/main/java/androidx/media3/transformer/ImageAssetLoader.java

@@ -29,6 +29,7 @@ import android.graphics.Bitmap;
 import android.os.Looper;
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
+import androidx.media3.common.ColorInfo;
 import androidx.media3.common.Format;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.MimeTypes;
@@ -115,6 +116,7 @@ public final class ImageAssetLoader implements AssetLoader {
                       .setHeight(bitmap.getHeight())
                       .setWidth(bitmap.getWidth())
                       .setSampleMimeType(MIME_TYPE_IMAGE_ALL)
+                      .setColorInfo(ColorInfo.SRGB_BT709_FULL)
                       .build();
               listener.onTrackAdded(format, SUPPORTED_OUTPUT_TYPE_DECODED);
               scheduledExecutorService.submit(() -> queueBitmapInternal(bitmap, format));

libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java

@@ -17,6 +17,7 @@
 package androidx.media3.transformer;
 
 import static androidx.media3.common.ColorInfo.SDR_BT709_LIMITED;
+import static androidx.media3.common.ColorInfo.SRGB_BT709_FULL;
 import static androidx.media3.common.ColorInfo.isTransferHdr;
 import static androidx.media3.common.VideoFrameProcessor.INPUT_TYPE_BITMAP;
 import static androidx.media3.common.VideoFrameProcessor.INPUT_TYPE_SURFACE;
@@ -123,17 +124,25 @@ import org.checkerframework.dataflow.qual.Pure;
     boolean isGlToneMapping =
         ColorInfo.isTransferHdr(decoderInputColor)
             && transformationRequest.hdrMode == HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_OPEN_GL;
-    // For consistency with the Android platform, OpenGL tone mapping outputs colors with
+    ColorInfo videoFrameProcessorOutputColor;
-    // C.COLOR_TRANSFER_GAMMA_2_2 instead of C.COLOR_TRANSFER_SDR, and outputs this as
+    if (videoFrameProcessorInputColor.colorTransfer == C.COLOR_TRANSFER_SRGB) {
-    // C.COLOR_TRANSFER_SDR to the encoder.
+      // The sRGB color transfer is only used for images, so when an image gets transcoded into a
-    ColorInfo videoFrameProcessorOutputColor =
+      // video, we use the SMPTE 170M transfer function for the resulting video.
-        isGlToneMapping
+      videoFrameProcessorOutputColor = SDR_BT709_LIMITED;
-            ? new ColorInfo.Builder()
+    } else if (isGlToneMapping) {
-                .setColorSpace(C.COLOR_SPACE_BT709)
+      // For consistency with the Android platform, OpenGL tone mapping outputs colors with
-                .setColorRange(C.COLOR_RANGE_LIMITED)
+      // C.COLOR_TRANSFER_GAMMA_2_2 instead of C.COLOR_TRANSFER_SDR, and outputs this as
-                .setColorTransfer(C.COLOR_TRANSFER_GAMMA_2_2)
+      // C.COLOR_TRANSFER_SDR to the encoder.
-                .build()
+      videoFrameProcessorOutputColor =
-            : videoFrameProcessorInputColor;
+          new ColorInfo.Builder()
+              .setColorSpace(C.COLOR_SPACE_BT709)
+              .setColorRange(C.COLOR_RANGE_LIMITED)
+              .setColorTransfer(C.COLOR_TRANSFER_GAMMA_2_2)
+              .build();
+    } else {
+      videoFrameProcessorOutputColor = videoFrameProcessorInputColor;
+    }
+
     List<Effect> effectsWithPresentation = new ArrayList<>(effects);
     if (presentation != null) {
       effectsWithPresentation.add(presentation);
@@ -409,6 +418,9 @@ import org.checkerframework.dataflow.qual.Pure;
         // populate default color info, which depends on the resolution.
         return ColorInfo.SDR_BT709_LIMITED;
       }
+      if (SRGB_BT709_FULL.equals(inputFormat.colorInfo)) {
+        return ColorInfo.SDR_BT709_LIMITED;
+      }
       return checkNotNull(inputFormat.colorInfo);
     }