summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnkit Goyal <layog@google.com>2022-04-13 21:37:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-13 21:37:26 +0000
commitf2923260f48e8ca752a8e4040d3a438b96d7b263 (patch)
tree863ab62e25b1f2f7ed7a6ed922a4a0082df39ed6
parentd3822f10ba32b67621d7d5be4681f57565f0af25 (diff)
parent647eca137a4a4c15f77395c0e00a019deef0f439 (diff)
downloadgchips-f2923260f48e8ca752a8e4040d3a438b96d7b263.tar.gz
Allow empty SMPTE2094-40 metadata am: 647eca137a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/17746118 Change-Id: Id191d39efe087d684b3376674baf8f5f13ac7990 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--gralloc4/src/hidl_common/SharedMetadata.cpp6
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())