Merge "C2SoftVpxDec: Replace CHECK() with error handling" into rvc-dev

4 years ago · 221055a12b
parent ee650ee329 dbaa9bc0ec
commit 221055a12b
1 changed files with 7 additions and 1 deletions
--- a/media/codec2/components/vpx/C2SoftVpxDec.cpp
+++ b/media/codec2/components/vpx/C2SoftVpxDec.cpp
@ -784,7 +784,13 @@ status_t C2SoftVpxDec::outputBuffer(
        }

    }
-    CHECK(img->fmt == VPX_IMG_FMT_I420 || img->fmt == VPX_IMG_FMT_I42016);
+    if(img->fmt != VPX_IMG_FMT_I420 && img->fmt != VPX_IMG_FMT_I42016) {
+        ALOGE("img->fmt %d not supported", img->fmt);
+        mSignalledError = true;
+        work->workletsProcessed = 1u;
+        work->result = C2_CORRUPTED;
+        return false;
+    }

    std::shared_ptr<C2GraphicBlock> block;
    uint32_t format = HAL_PIXEL_FORMAT_YV12;