commit 8d37333813b1b1fa984a5a3e7346626622117153
author John Bauman <jbauman@google.com> Wed Mar 30 19:34:23 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 30 19:34:23 2022 +0000
tree 4c2c04a2fd6ffd858fcc6fddce5a379752564edc
parent 05eca560eb6a8e5250da4a7bc6bca9759856d151
parent 3ac83611917c5d51c4031c584a7308cdacdff644

Merge "Change | to || for booleans" into main

media_driver/agnostic/common/codec/hal/codechal_decode_vc1.cpp

diff --git a/media_driver/agnostic/common/codec/hal/codechal_decode_vc1.cpp b/media_driver/agnostic/common/codec/hal/codechal_decode_vc1.cpp
index 998875c..314a4de 100644
--- a/media_driver/agnostic/common/codec/hal/codechal_decode_vc1.cpp
+++ b/media_driver/agnostic/common/codec/hal/codechal_decode_vc1.cpp
@@ -3219,13 +3219,11 @@
         m_resBitplaneBuffer = *(m_decodeParams.m_bitplaneBuffer);
     }
 
-    bool pictureIsI = m_mfxInterface->IsVc1IPicture(currPic, m_vc1PicParams->picture_fields.is_first_field, picType) ? true : false;
-    bool pictureIsP = m_mfxInterface->IsVc1PPicture(currPic, m_vc1PicParams->picture_fields.is_first_field, picType) ? true : false;
+    bool pictureIsI = m_mfxInterface->IsVc1IPicture(currPic, m_vc1PicParams->picture_fields.is_first_field, picType);
+    bool pictureIsP = m_mfxInterface->IsVc1PPicture(currPic, m_vc1PicParams->picture_fields.is_first_field, picType);
     bool pictureIsB =
-        (m_mfxInterface->IsVc1BPicture(currPic, m_vc1PicParams->picture_fields.is_first_field, picType) |
-            m_mfxInterface->IsVc1BIPicture(currPic, m_vc1PicParams->picture_fields.is_first_field, picType))
-            ? true
-            : false;
+        (m_mfxInterface->IsVc1BPicture(currPic, m_vc1PicParams->picture_fields.is_first_field, picType) ||
+            m_mfxInterface->IsVc1BIPicture(currPic, m_vc1PicParams->picture_fields.is_first_field, picType));
 
     // Save anchor picture type and field structure (TFF/BFF)
     if (!pictureIsB)