commit 7931cbd1bb9e2044aa65f9e8b28daa65eaac8f6d
author Andy Hung <hunga@google.com> Sat Feb 26 05:04:37 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 26 05:04:37 2022 +0000
tree 74355ef5ab256617dd43209b0bf9989ba5db4a8e
parent a946fb3a41b9bc67264053b824aa58c2d4ffa88e
parent efc56a7283900d5d03aa33606fd4c3e5c94bc2d3

Merge "MediaMetrics: Fix clang-tidy narrowing warning"

media/codec2/vndk/C2AllocatorGralloc.cpp

diff --git a/media/codec2/vndk/C2AllocatorGralloc.cpp b/media/codec2/vndk/C2AllocatorGralloc.cpp
index b5200a5..d8d6f06 100644
--- a/media/codec2/vndk/C2AllocatorGralloc.cpp
+++ b/media/codec2/vndk/C2AllocatorGralloc.cpp
@@ -265,6 +265,7 @@
 
         for (const PlaneLayoutComponent &component : plane.components) {
             if (!gralloc4::isStandardPlaneLayoutComponentType(component.type)) {
+                mapper.unlock(handle);
                 return C2_CANNOT_DO;
             }
 
@@ -287,6 +288,7 @@
                     channel = C2PlaneInfo::CHANNEL_CR;
                     break;
                 default:
+                    mapper.unlock(handle);
                     return C2_CORRUPTED;
             }