commit 28af1154b5f52c1f1a3687ff099ca609218bd78a
author Marcus Huang <marcus.huang@mediatek.com> Fri Oct 18 15:51:35 2019 +0800
committer JeiFeng Lee <linger.lee@mediatek.com> Thu Dec 19 13:11:54 2019 +0800
tree e3a0d9a80b8f163c481300313e9a4b199f2e1768
parent 81bfa6303d4b0b7289dc211a34bdfe33b382faf7

Fix android.media.cts.ImageReaderDecoderTest fail on MT6580 project

Root Cause:
Google C2 H264/H265 decoder request 64-aligned stride from graphic block; but ARM GPU would return
with 128-aligned stride when input height ONLY satisfies 2-aligned (e.g. 130).

Solution:
Revise stride alignment from 64 to 128 of C2 H264/H265 decoder

Bug: 142924202
Test: Build C2 Codec
Test:
run cts -m CtsMediaTestCases -t android.media.cts.ImageReaderDecoderTest#testGoogH264Image
run cts -m CtsMediaTestCases -t android.media.cts.ImageReaderDecoderTest#testGoogH264ImageReader
run cts -m CtsMediaTestCases -t android.media.cts.ImageReaderDecoderTest#testGoogH265Image
run cts -m CtsMediaTestCases -t android.media.cts.ImageReaderDecoderTest#testGoogH265ImageReader

Change-Id: I6eaff1b858e031b64744bc67d8aee5cc51cfd92d

media/codec2/components/hevc/C2SoftHevcDec.cpp

diff --git a/media/codec2/components/hevc/C2SoftHevcDec.cpp b/media/codec2/components/hevc/C2SoftHevcDec.cpp
index df677c2..389ea61 100644
--- a/media/codec2/components/hevc/C2SoftHevcDec.cpp
+++ b/media/codec2/components/hevc/C2SoftHevcDec.cpp
@@ -752,8 +752,8 @@
         ALOGE("not supposed to be here, invalid decoder context");
         return C2_CORRUPTED;
     }
-    if (mStride != ALIGN64(mWidth)) {
-        mStride = ALIGN64(mWidth);
+    if (mStride != ALIGN128(mWidth)) {
+        mStride = ALIGN128(mWidth);
         if (OK != setParams(mStride, IVD_DECODE_FRAME)) return C2_CORRUPTED;
     }
     if (mOutBlock &&