commit 7875f687efc883c2df813f339b4b5dd3b614d5a3
author Chong Zhang <chz@google.com> Tue Oct 29 17:06:14 2019 -0700
committer Chong Zhang <chz@google.com> Tue Oct 29 17:09:34 2019 -0700
tree a40e30bb28938ff0ff9d395cc14161be6fb73336
parent 8c5bb45d25c2dd4299f544b03e905c7a4e83ca35

Fix stride number in C2AllocationGralloc::map

The code has a 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: I1a587544fcf864d4a239252a8a2dc2569161e279

media/codec2/vndk/C2AllocatorGralloc.cpp

diff --git a/media/codec2/vndk/C2AllocatorGralloc.cpp b/media/codec2/vndk/C2AllocatorGralloc.cpp
index 3a715b1..b6552f5 100644
--- a/media/codec2/vndk/C2AllocatorGralloc.cpp
+++ b/media/codec2/vndk/C2AllocatorGralloc.cpp
@@ -633,7 +633,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);