| commit | 4884ed4eb9ea9d6285501df53668d62817c8aed2 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Jun 26 22:42:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 26 22:42:00 2023 +0000 |
| tree | 8e9861f122f42211f98822967854ea9c60d26446 | |
| parent | 47e799e35b7ba557071645a496e5c0a9299f9b80 [diff] | |
| parent | ee4e7fa59500348d13762e7208f2b1d0b713970b [diff] |
Merge "Reset staticInfo if static meta fetch fails" am: c09e47c27a am: ee4e7fa595 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2638955 Change-Id: Ia3598323d7b0928911a98d91f71f3534a4ab72e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/sfplugin/Codec2Buffer.cpp b/media/codec2/sfplugin/Codec2Buffer.cpp index 3eb2e63..228ad7e 100644 --- a/media/codec2/sfplugin/Codec2Buffer.cpp +++ b/media/codec2/sfplugin/Codec2Buffer.cpp
@@ -1175,6 +1175,11 @@ err = C2_CORRUPTED; } } + + if (err != C2_OK) { + staticInfo->reset(); + } + if (dynamicInfo) { ALOGV("Grabbing dynamic HDR info from gralloc4 metadata"); dynamicInfo->reset();