codecs: use bit field to check graphic or linear buffer

The pool id now has other bits irrelevant to graphic or linear type.
Just checking the bit field is the right way.

Also fixed a typo that has been forcing hardware decoder to decode
to bytebuffer.

Bug: 232881288
Bug: 234447627

Test:
atest android.media.decoder.cts.ImageReaderDecoderTest
some of them should use host color buffer and some of
them should use byte buffer

Change-Id: I0eaef4eedb1a65e64ec70e440f09640df4de77f9

1 files changed, 3 insertions, 2 deletions

diff --git a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
index 7aac56f8..7008bd5d 100644
--- a/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
+++ b/system/codecs/c2/decoders/hevcdec/C2GoldfishHevcDec.cpp
@@ -661,10 +661,11 @@ C2GoldfishHevcDec::ensureDecoderState(const std::shared_ptr<C2BlockPool> &pool)
 void C2GoldfishHevcDec::checkMode(const std::shared_ptr<C2BlockPool> &pool) {
     mWidth = mIntf->width();
     mHeight = mIntf->height();
-    const bool isGraphic = (pool->getAllocatorId() == C2Allocator::GRAPHIC);
+    const bool isGraphic = (pool->getAllocatorId() & C2Allocator::GRAPHIC);
+    DDD("buffer id %d", (int)(pool->getAllocatorId()));
     if (isGraphic) {
         DDD("decoding to host color buffer");
-        mEnableAndroidNativeBuffers = false;
+        mEnableAndroidNativeBuffers = true;
     } else {
         DDD("decoding to guest byte buffer");
         mEnableAndroidNativeBuffers = false;