| commit | a8236b4742f6752363a4590441776cbe3cd843ff | [log] [tgz] |
|---|---|---|
| author | James Zern <jzern@google.com> | Tue Jun 29 21:38:12 2021 +0000 |
| committer | James Zern <jzern@google.com> | Tue Jun 29 23:54:17 2021 +0000 |
| tree | 6776139657cccb41222156b74935f08cefdc4d13 | |
| parent | bfd9a2101864c1cbfc1bbe08840b825fccd84e7b [diff] [blame] |
Merge changes I54a7af62,I98364ee9,I394e3e65 am: bb155b3aae Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1743308 Bug: 188395904 Test: None Merged-In: I4fb2ac5b917d5ef4cfd411559ae74d2c99f267fd Change-Id: I4fb2ac5b917d5ef4cfd411559ae74d2c99f267fd (cherry picked from commit 30a42ebc2bf0a04369fb576d0f6cc18fedcaad13)
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;