commit 5e82a6c579979b2c3e36c0aa77eaadbe49846346
author Aayush Soni <aayush.soni@ittiam.com> Mon Feb 27 18:34:23 2023 +0530
committer Fyodor Kyslov <kyslov@google.com> Thu Mar 02 20:03:25 2023 +0000
tree a960915ecfe4acaec511bf1c40d1be4bd64f5b04
parent 934297de9942c209248494dce526a577a35144c5

C2SoftAomEnc: Add support for RGBA1010102 to YUV420Planar16 format

Bug: 267373580
Test: atest android.mediav2.cts.CodecEncoderSurfaceTest

Change-Id: Ifdaef70bda6e33af76c86bdfbffdb9120dfd4214

media/codec2/components/aom/C2SoftAomEnc.cpp

diff --git a/media/codec2/components/aom/C2SoftAomEnc.cpp b/media/codec2/components/aom/C2SoftAomEnc.cpp
index d147fb4..81c593f 100644
--- a/media/codec2/components/aom/C2SoftAomEnc.cpp
+++ b/media/codec2/components/aom/C2SoftAomEnc.cpp
@@ -799,6 +799,28 @@
             }
             break;
         }
+        case C2PlanarLayout::TYPE_YUVA: {
+            if (mConversionBuffer.size() >= stride * vstride * 3) {
+                uint16_t *dstY, *dstU, *dstV;
+                dstY = (uint16_t*)mConversionBuffer.data();
+                dstU = dstY + stride * vstride;
+                dstV = dstU + (stride * vstride) / 4;
+                convertRGBA1010102ToYUV420Planar16(dstY, dstU, dstV, (uint32_t*)(rView->data()[0]),
+                                                   layout.planes[layout.PLANE_Y].rowInc / 4, stride,
+                                                   vstride, mColorAspects->matrix,
+                                                   mColorAspects->range);
+                aom_img_wrap(&raw_frame, AOM_IMG_FMT_I42016, stride, vstride, mStrideAlign,
+                                mConversionBuffer.data());
+                aom_img_set_rect(&raw_frame, 0, 0, width, height, 0);
+            } else {
+                ALOGE("Conversion buffer is too small: %u x %u for %zu", stride, vstride,
+                        mConversionBuffer.size());
+                work->result = C2_BAD_VALUE;
+                return;
+            }
+            break;
+        }
+
         default:
             ALOGE("Unrecognized plane type: %d", layout.type);
             work->result = C2_BAD_VALUE;