commit eecee8c38746cea0774fc8302052d17dbb8cbe4e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 12 22:33:30 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 12 22:33:30 2020 +0000
tree c1b9f6a3854b7796bd2740d7ab5cafc8b0c3b0fa
parent e07266221e076a55ff44883bb2dae35f82a4cc55
parent 8bdb1726f4bd83afc1c8d72794de92a8105703d0

Merge "C2SoftGav1Dec,convertYUV420Planar16ToY410: fix dst stride" am: 27863d88df am: f3e1d998c1 am: 4fdecdcb9a am: 8bdb1726f4

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1393891

Change-Id: I37e728d5bb07014082dbbde6123734e3a7702cb9

media/codec2/components/gav1/C2SoftGav1Dec.cpp

diff --git a/media/codec2/components/gav1/C2SoftGav1Dec.cpp b/media/codec2/components/gav1/C2SoftGav1Dec.cpp
index b638a04..5dffa50 100644
--- a/media/codec2/components/gav1/C2SoftGav1Dec.cpp
+++ b/media/codec2/components/gav1/C2SoftGav1Dec.cpp
@@ -689,7 +689,7 @@
     if (format == HAL_PIXEL_FORMAT_RGBA_1010102) {
       convertYUV420Planar16ToY410(
           (uint32_t *)dstY, srcY, srcU, srcV, srcYStride / 2, srcUStride / 2,
-          srcVStride / 2, align(mWidth, 16), mWidth, mHeight);
+          srcVStride / 2, dstYStride / sizeof(uint32_t), mWidth, mHeight);
     } else {
       convertYUV420Planar16ToYUV420Planar(dstY, dstU, dstV,
                                           srcY, srcU, srcV,