From 9bad0d7e726e6b264c528a3dd13d0c58fd92c0e1 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Tue, 19 Dec 2017 12:34:34 -0700 Subject: Add plumbing for HDR metadata Allow a ANativeWindow client to send HDR metadata to SurfaceFlinger. The metadata can be queried with BufferLayerConsumer::getCurrentHdrMetadata. Written by Courtney. Updated by olv@. Bug: 63710530 Test: builds Change-Id: I23192d4750950664b57863a533bffd72397255b4 --- libs/gui/BufferItem.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'libs/gui/BufferItem.cpp') diff --git a/libs/gui/BufferItem.cpp b/libs/gui/BufferItem.cpp index 69b5962441..f7409dc344 100644 --- a/libs/gui/BufferItem.cpp +++ b/libs/gui/BufferItem.cpp @@ -98,6 +98,7 @@ size_t BufferItem::getFlattenedSize() const { size = FlattenableUtils::align<4>(size); } size += mSurfaceDamage.getFlattenedSize(); + size += mHdrMetadata.getFlattenedSize(); size = FlattenableUtils::align<8>(size); return size + getPodSize(); } @@ -151,6 +152,10 @@ status_t BufferItem::flatten( if (err) return err; FlattenableUtils::advance(buffer, size, mSurfaceDamage.getFlattenedSize()); + err = mHdrMetadata.flatten(buffer, size); + if (err) return err; + FlattenableUtils::advance(buffer, size, mHdrMetadata.getFlattenedSize()); + // Check we still have enough space if (size < getPodSize()) { return NO_MEMORY; @@ -212,6 +217,10 @@ status_t BufferItem::unflatten( if (err) return err; FlattenableUtils::advance(buffer, size, mSurfaceDamage.getFlattenedSize()); + err = mHdrMetadata.unflatten(buffer, size); + if (err) return err; + FlattenableUtils::advance(buffer, size, mHdrMetadata.getFlattenedSize()); + // Check we still have enough space if (size < getPodSize()) { return NO_MEMORY; -- cgit v1.2.3-59-g8ed1b