| commit | 79530493017aa7f6cf8e1c5bdca6522aeea57205 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Aug 03 18:47:26 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 03 18:47:26 2022 +0000 |
| tree | 38c82e9d4504152f1f2e07da0e5f7123b4a777bf | |
| parent | e967a3e816285f2c4fd4153b036183dd5414fe38 [diff] | |
| parent | 4b08d1275f633b65f277bc42f7fed28a62209075 [diff] |
Merge "C2SoftHevcDec: Initialize mStride after first header decode" am: 9e2e53d5bf am: 1329bd5a0d am: 03d20a0ccc am: 4b08d1275f Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2172717 Change-Id: I88395bf9fb32e638c23fb0c7049b8919a4a3fc0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/components/hevc/C2SoftHevcDec.cpp b/media/codec2/components/hevc/C2SoftHevcDec.cpp index 5a660c5..a27c218 100644 --- a/media/codec2/components/hevc/C2SoftHevcDec.cpp +++ b/media/codec2/components/hevc/C2SoftHevcDec.cpp
@@ -917,7 +917,8 @@ if (0 < ps_decode_op->u4_pic_wd && 0 < ps_decode_op->u4_pic_ht) { if (mHeaderDecoded == false) { mHeaderDecoded = true; - setParams(ALIGN128(ps_decode_op->u4_pic_wd), IVD_DECODE_FRAME); + mStride = ALIGN128(ps_decode_op->u4_pic_wd); + setParams(mStride, IVD_DECODE_FRAME); } if (ps_decode_op->u4_pic_wd != mWidth || ps_decode_op->u4_pic_ht != mHeight) { mWidth = ps_decode_op->u4_pic_wd;