diff options
| author | Ankit Goyal <layog@google.com> | 2022-04-13 21:51:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-13 21:51:21 +0000 |
| commit | baffd3cc82d5f8c3cf121f6ccd269f2521a7b1dd (patch) | |
| tree | 863ab62e25b1f2f7ed7a6ed922a4a0082df39ed6 | |
| parent | 38d031ebbb36714e02ebb945e67a670ed4f00c56 (diff) | |
| parent | f2923260f48e8ca752a8e4040d3a438b96d7b263 (diff) | |
| download | gchips-baffd3cc82d5f8c3cf121f6ccd269f2521a7b1dd.tar.gz | |
Allow empty SMPTE2094-40 metadata am: 647eca137a am: f2923260f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/17746118
Change-Id: I4c05e6bc1b71d096ab3e7b29c4936c15d554151b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | gralloc4/src/hidl_common/SharedMetadata.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/gralloc4/src/hidl_common/SharedMetadata.cpp b/gralloc4/src/hidl_common/SharedMetadata.cpp index 4247bd8..b5964f7 100644 --- a/gralloc4/src/hidl_common/SharedMetadata.cpp +++ b/gralloc4/src/hidl_common/SharedMetadata.cpp @@ -146,12 +146,6 @@ void get_smpte2094_40(const private_handle_t *hnd, std::optional<std::vector<uin android::status_t set_smpte2094_40(const private_handle_t *hnd, const std::optional<std::vector<uint8_t>> &smpte2094_40) { - if (!smpte2094_40.has_value() || smpte2094_40->size() == 0) - { - MALI_GRALLOC_LOGE("Empty SMPTE 2094-40 data"); - return android::BAD_VALUE; - } - auto *metadata = reinterpret_cast<shared_metadata *>(hnd->attr_base); const size_t size = smpte2094_40.has_value() ? smpte2094_40->size() : 0; if (size > metadata->smpte2094_40.capacity()) |