| commit | 197c6e5c04d4005a5c4e35f6a15d421c3693b10c | [log] [tgz] |
|---|---|---|
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | Fri Dec 01 20:48:34 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 01 20:48:34 2023 +0000 |
| tree | e797341749de92fd73369a9e74f8dbfc5b9ea46f | |
| parent | cf83b43c6a86b8f6621a2612d37e51c5728691c0 [diff] | |
| parent | abbb2177de020e74f210325b64b294164a66b699 [diff] |
C2SoftGav1Dec: Disallow bitdepth > 10 am: abbb2177de Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2849966 Change-Id: Ib4a4ebc3580e348df9066c4b4c529ab244c85810 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/components/gav1/C2SoftGav1Dec.cpp b/media/codec2/components/gav1/C2SoftGav1Dec.cpp index f056759..3e0dbaf 100644 --- a/media/codec2/components/gav1/C2SoftGav1Dec.cpp +++ b/media/codec2/components/gav1/C2SoftGav1Dec.cpp
@@ -781,6 +781,14 @@ return false; } + if (buffer->bitdepth > 10) { + ALOGE("bitdepth %d is not supported", buffer->bitdepth); + mSignalledError = true; + work->workletsProcessed = 1u; + work->result = C2_CORRUPTED; + return false; + } + const int width = buffer->displayed_width[0]; const int height = buffer->displayed_height[0]; if (width != mWidth || height != mHeight) {