commit 3fdfaa3c2755fb7ac643f2356d153a171d5d9120
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Fri Aug 02 15:44:30 2019 -0700
committer Harish Mahendrakar <harish.mahendrakar@ittiam.com> Mon Mar 23 23:31:19 2020 +0000
tree 252283f8300fb894aa0d797567b81f37d0ed17ad
parent fd2fb97a3f96e62bbcd63e484aa266090a70b6ce

C2SoftVpxDec: Replace CHECK() with error handling

CHECK() for color format has been replaced with appropriate error
handling.

Bug: 117625412
Bug: 152070124
Test: stagefright -s -S /sdcard/cformat.webm
Test: stagefright -s -S /sdcard/crowd_640x360p50f32_frmPar_1x1.webm
Change-Id: I1fe0be54f9910fd98ff4db9240b4dcfd09888ffb

media/codec2/components/vpx/C2SoftVpxDec.cpp

diff --git a/media/codec2/components/vpx/C2SoftVpxDec.cpp b/media/codec2/components/vpx/C2SoftVpxDec.cpp
index a759e8f..fbc9c8a 100644
--- a/media/codec2/components/vpx/C2SoftVpxDec.cpp
+++ b/media/codec2/components/vpx/C2SoftVpxDec.cpp
@@ -783,7 +783,13 @@
         }
 
     }
-    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;