commit 6494b4c9a66107c019de042c63a2615286ed80b0
author Amy Zhang <amyjojo@google.com> Wed Sep 25 19:56:03 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 25 19:56:03 2019 +0000
tree 341fda45a0e5b0deb4e2547800cf8c3afcc60308
parent 59b31c9b90adac077240290ce45656920fd4118d
parent df3746daeb5a4157b2034bafacf77880efdce754

Merge changes from topic "frontend"

* changes:
  Playback VTS modulization
  Add DVBC/DVBS/ISDBT/ISDBS/ISDBS3/ATSC3 support default implementation
  Add DVBC/DVBS/ISDBT/ISDBS/ISDBS3/ATSC3 support

graphics/mapper/2.0/utils/passthrough/include/mapper-passthrough/2.0/Gralloc1Hal.h

diff --git a/graphics/mapper/2.0/utils/passthrough/include/mapper-passthrough/2.0/Gralloc1Hal.h b/graphics/mapper/2.0/utils/passthrough/include/mapper-passthrough/2.0/Gralloc1Hal.h
index d9beb4f..db7e67d 100644
--- a/graphics/mapper/2.0/utils/passthrough/include/mapper-passthrough/2.0/Gralloc1Hal.h
+++ b/graphics/mapper/2.0/utils/passthrough/include/mapper-passthrough/2.0/Gralloc1Hal.h
@@ -282,14 +282,16 @@
         }
 
         if (flex.planes[0].component != FLEX_COMPONENT_Y ||
-            flex.planes[1].component != FLEX_COMPONENT_Cb ||
-            flex.planes[2].component != FLEX_COMPONENT_Cr) {
+           ((flex.planes[1].component != FLEX_COMPONENT_Cb || flex.planes[2].component != FLEX_COMPONENT_Cr) &&
+           (flex.planes[2].component != FLEX_COMPONENT_Cb || flex.planes[1].component != FLEX_COMPONENT_Cr))) {
             return false;
         }
 
         const auto& y = flex.planes[0];
-        const auto& cb = flex.planes[1];
-        const auto& cr = flex.planes[2];
+        const auto& cb = (flex.planes[1].component == FLEX_COMPONENT_Cb)?
+                          flex.planes[1] : flex.planes[2];
+        const auto& cr = (flex.planes[2].component == FLEX_COMPONENT_Cr)?
+                          flex.planes[2] : flex.planes[1];
 
         if (cb.h_increment != cr.h_increment || cb.v_increment != cr.v_increment) {
             return false;