| commit | bd2ced7f2c8d41a29744e558d16d419348bbe8b8 | [log] [tgz] |
|---|---|---|
| author | Jongchan Choi <jchan.choi@samsung.corp-partner.google.com> | Mon Jun 26 19:36:11 2023 +0000 |
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Mon Jun 26 19:36:11 2023 +0000 |
| tree | 80f25f003f4eebe75b1b7ae71cb6ba918070e705 | |
| parent | 0f6f28be9b7ff9cbd1ccee4b1aca8857b02bb62c [diff] |
Reset staticInfo if static meta fetch fails Invaild HDR metadata will be fed into encoder, if not reset. Bug: 262503726 Test: presubmit (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:df54e93d72c611c2f5920b4c88e5006e3662df34) Merged-In: I33fba8a568cd195dfac0e438f8cae4a411bd04da Change-Id: I33fba8a568cd195dfac0e438f8cae4a411bd04da
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();