commit 6f8f2c88c6351218d249c8676ed351fb17c6e17f
author Chong Zhang <chz@google.com> Mon May 21 13:27:11 2018 -0700
committer Chong Zhang <chz@google.com> Mon May 21 20:33:22 2018 +0000
tree e4d2d4a88be18326ba12fb41400a5272c96e2db3
parent 7bb4333ff2298d0cc1a2125e18a21c174bced01d

Fix typo in dataspace change handling

Sources's dataspace should be used when ColorAspects doesn't
specify the field. Current code doesn't match the comments.

bug: 80091629
Change-Id: I3302a18bd5db00116418790e37e9c3fb6b7a2817

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 2abea9e..bf5ae2c 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -5322,13 +5322,13 @@
     convertCodecColorAspectsToPlatformAspects(aspects, &range, &standard, &transfer);
 
     // if some aspects are unspecified, use dataspace fields
-    if (range != 0) {
+    if (range == 0) {
         range = (dataSpace & HAL_DATASPACE_RANGE_MASK) >> HAL_DATASPACE_RANGE_SHIFT;
     }
-    if (standard != 0) {
+    if (standard == 0) {
         standard = (dataSpace & HAL_DATASPACE_STANDARD_MASK) >> HAL_DATASPACE_STANDARD_SHIFT;
     }
-    if (transfer != 0) {
+    if (transfer == 0) {
         transfer = (dataSpace & HAL_DATASPACE_TRANSFER_MASK) >> HAL_DATASPACE_TRANSFER_SHIFT;
     }