commit d9f9844aeb7534ec24132dea29153c581b49133c
author Manisha Jajoo <manisha.jajoo@ittiam.com> Wed Jun 02 11:27:07 2021 +0530
committer Wonsik Kim <wonsik@google.com> Mon Jun 13 21:44:01 2022 +0000
tree 100d61a7c12e0b041f54528635aae987f72fb631
parent cad7f4a6b12bb1deb2a24efb300e85209da48d29

RELAND C2Soft Enc: Use correct matrix and range in RGB to YUV conversion

Update avc, hevc, vp8 and vp9 encoders to pick correct conversion matrix
and range during YUV to RGB conversion.

Test: atest android.mediav2.cts.EncodeDecodeAccuracyTest
Bug: 234641213
Bug: 170747332
Change-Id: Idb83c6e6e416665405fbe498dce8d56a3cdf857c
(cherry picked from commit 8764723e8e327e32e66624b6a1bcb3f2e3847de8)
Merged-In: Idb83c6e6e416665405fbe498dce8d56a3cdf857c

media/codec2/components/avc/C2SoftAvcEnc.cpp

diff --git a/media/codec2/components/avc/C2SoftAvcEnc.cpp b/media/codec2/components/avc/C2SoftAvcEnc.cpp
index 4ffcd59..8b46d3f 100644
--- a/media/codec2/components/avc/C2SoftAvcEnc.cpp
+++ b/media/codec2/components/avc/C2SoftAvcEnc.cpp
@@ -1514,7 +1514,8 @@
             vPlane = uPlane + yPlaneSize / 4;
             yStride = width;
             uStride = vStride = yStride / 2;
-            ConvertRGBToPlanarYUV(yPlane, yStride, height, conversionBuffer.size(), *input);
+            ConvertRGBToPlanarYUV(yPlane, yStride, height, conversionBuffer.size(), *input,
+                                  mColorAspects->matrix, mColorAspects->range);
             break;
         }
         case C2PlanarLayout::TYPE_YUV: {