commit ef5fc71fc53aa69a6aaf4a17d4b447afdd371866
author Vinay Kalia <vinaykalia@google.com> Wed Sep 15 23:59:50 2021 +0000
committer Vinay Kalia <vinaykalia@google.com> Thu Sep 16 20:07:08 2021 +0000
tree 91df7e4b99eca795049305e550d2d60d071bf8cc
parent e63e1471c4dc8bb9b0e7632069b705c74a877ea5

CCodecBuffers: Update KEY_WIDTH and KEY_HEIGHT to correct values

Update the KEY_WIDTH and KEY_HEIGHT according to the MediaImage.
Applications KEY_WIDTH and KEY_HEIGHT to interpret the MediaImage
so they must be aligned.

bug: 197699850
bug: 198104271

Signed-off-by: Vinay Kalia <vinaykalia@google.com>
Change-Id: I05c9d15ff20caefd5a2784849e23b9b0464b5f2e

media/codec2/sfplugin/CCodecBuffers.cpp

diff --git a/media/codec2/sfplugin/CCodecBuffers.cpp b/media/codec2/sfplugin/CCodecBuffers.cpp
index 29cc564..333a2ca 100644
--- a/media/codec2/sfplugin/CCodecBuffers.cpp
+++ b/media/codec2/sfplugin/CCodecBuffers.cpp
@@ -96,7 +96,10 @@
         if (img->mNumPlanes > 0 && img->mType != img->MEDIA_IMAGE_TYPE_UNKNOWN) {
             int32_t stride = img->mPlane[0].mRowInc;
             mFormatWithImageData->setInt32(KEY_STRIDE, stride);
-            ALOGD("[%s] updating stride = %d", mName, stride);
+            mFormatWithImageData->setInt32(KEY_WIDTH, img->mWidth);
+            mFormatWithImageData->setInt32(KEY_HEIGHT, img->mHeight);
+            ALOGD("[%s] updating stride = %d, width: %d, height: %d",
+                  mName, stride, img->mWidth, img->mHeight);
             if (img->mNumPlanes > 1 && stride > 0) {
                 int64_t offsetDelta =
                     (int64_t)img->mPlane[1].mOffset - (int64_t)img->mPlane[0].mOffset;