commit fad4c79db311d7b878c331cba044c1faab418108
author Chong Zhang <chz@google.com> Wed Oct 30 06:37:48 2019 -0700
committer Pawin Vongmasa <pawin@google.com> Wed Oct 30 06:39:54 2019 -0700
tree 4454c3ea980d34052f73ffe8596efba8c9d1df5e
parent 16f57911d74a197c0102c8ba05589592799ad1f5

C2AllocatorGralloc: Fix stride in map()

This is a continuation of the CL with change-id
I1a587544fcf864d4a239252a8a2dc2569161e279.

The code has another typo where "if" should be an "else if",
which causes the stride on mapper2 always set to 0.

bug: 143551816
test:
- play vp9 test clip in the bug for sw renderer on Pixel3
(modify xml to force sw decoding), video should look normal.
- run MediaMetadataRetrieverTest#testThumbnailVP9Hdr with output
file dump, output should look normal.

Change-Id: Ia384dfa1cf37947cd20709ecebacd0158ae3329f

media/codec2/vndk/C2AllocatorGralloc.cpp

diff --git a/media/codec2/vndk/C2AllocatorGralloc.cpp b/media/codec2/vndk/C2AllocatorGralloc.cpp
index b6552f5..8fffa5e 100644
--- a/media/codec2/vndk/C2AllocatorGralloc.cpp
+++ b/media/codec2/vndk/C2AllocatorGralloc.cpp
@@ -769,7 +769,7 @@
             int32_t stride;
             if (mMapper2) {
                 stride = int32_t(mInfo2.stride);
-            } if (mMapper3) {
+            } else if (mMapper3) {
                 stride = int32_t(mInfo3.stride);
             } else {
                 stride = int32_t(mInfo4.stride);