commit 2a6557f4614c165352ef74cd917a258fcbd32f90
author Lajos Molnar <lajos@google.com> Thu Jul 01 16:43:01 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 01 16:43:01 2021 +0000
tree b572a7e7ab90209f3892547b4328e1b8ee906a26
parent 6a7bbeed45280625eef939e48e10502fcc1fc640
parent a8236b4742f6752363a4590441776cbe3cd843ff

Merge "Merge changes I54a7af62,I98364ee9,I394e3e65 am: bb155b3aae" into sc-dev

media/codec2/components/gav1/C2SoftGav1Dec.cpp

diff --git a/media/codec2/components/gav1/C2SoftGav1Dec.cpp b/media/codec2/components/gav1/C2SoftGav1Dec.cpp
index ff59490..f857e87 100644
--- a/media/codec2/components/gav1/C2SoftGav1Dec.cpp
+++ b/media/codec2/components/gav1/C2SoftGav1Dec.cpp
@@ -651,8 +651,14 @@
     }
   }
 
-  CHECK(buffer->image_format == libgav1::kImageFormatYuv420 ||
-        buffer->image_format == libgav1::kImageFormatMonochrome400);
+  if (!(buffer->image_format == libgav1::kImageFormatYuv420 ||
+        buffer->image_format == libgav1::kImageFormatMonochrome400)) {
+    ALOGE("image_format %d not supported", buffer->image_format);
+    mSignalledError = true;
+    work->workletsProcessed = 1u;
+    work->result = C2_CORRUPTED;
+    return false;
+  }
   const bool isMonochrome =
       buffer->image_format == libgav1::kImageFormatMonochrome400;