commit 3d70030bff8a4bc8d68ffd51afbb6c8521217ced
author Fyodor Kyslov <kyslov@google.com> Wed Feb 22 22:01:53 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 22 22:01:53 2023 +0000
tree bf49c80ba704a4ab40f6752b888105bbed9a8005
parent b0e2e8e5fc2ee689d73d7e856c1ef58a269a461e
parent 698e2f2e5e745096ce775370391ad48528f09451

Merge "C2SoftAomEnc: Fix encoding issues with 10bit av1 clips" into udc-dev

media/codec2/components/aom/C2SoftAomEnc.cpp

diff --git a/media/codec2/components/aom/C2SoftAomEnc.cpp b/media/codec2/components/aom/C2SoftAomEnc.cpp
index 9102a97..d147fb4 100644
--- a/media/codec2/components/aom/C2SoftAomEnc.cpp
+++ b/media/codec2/components/aom/C2SoftAomEnc.cpp
@@ -774,10 +774,12 @@
                     if (mConversionBuffer.size() >= stride * vstride * 3) {
                         uint16_t *dstY, *dstU, *dstV;
                         dstY = (uint16_t*)mConversionBuffer.data();
-                        dstU = ((uint16_t*)mConversionBuffer.data()) + stride * vstride;
-                        dstV = ((uint16_t*)mConversionBuffer.data()) + (stride * vstride) / 4;
+                        dstU = dstY + stride * vstride;
+                        dstV = dstU + (stride * vstride) / 4;
                         convertP010ToYUV420Planar16(dstY, dstU, dstV, (uint16_t*)(rView->data()[0]),
-                                                    (uint16_t*)(rView->data()[1]), stride, stride,
+                                                    (uint16_t*)(rView->data()[1]),
+                                                    layout.planes[layout.PLANE_Y].rowInc / 2,
+                                                    layout.planes[layout.PLANE_U].rowInc / 2,
                                                     stride, stride / 2, stride / 2, stride,
                                                     vstride);
                         aom_img_wrap(&raw_frame, AOM_IMG_FMT_I42016, stride, vstride, mStrideAlign,