commit b12f55b3d996b1b67e6ffde01dc9485d64d8f8d9
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 06 23:11:54 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 06 23:11:54 2019 +0000
tree 941dc0d0b04110cf234ae93daf3d1d1172687321
parent 6c525b799c5a9f57a1f144bd454be4015c44ec45
parent 386c36ff5cc9c1185b66f4e145de450368d206ef

Merge "Fix the issue of NV12 input with wrong format VPX_IMG_FMT_I420"

media/codec2/components/vpx/C2SoftVpxEnc.cpp

diff --git a/media/codec2/components/vpx/C2SoftVpxEnc.cpp b/media/codec2/components/vpx/C2SoftVpxEnc.cpp
index 6dab70b..ebc7a8f 100644
--- a/media/codec2/components/vpx/C2SoftVpxEnc.cpp
+++ b/media/codec2/components/vpx/C2SoftVpxEnc.cpp
@@ -514,7 +514,7 @@
                         return;
                     }
                     vpx_img_wrap(&raw_frame, VPX_IMG_FMT_I420, stride, vstride,
-                                 mStrideAlign, (uint8_t*)rView->data()[0]);
+                                 mStrideAlign, mConversionBuffer.data());
                     vpx_img_set_rect(&raw_frame, 0, 0, width, height);
                 } else {
                     ALOGE("Conversion buffer is too small: %u x %u for %zu",