diff options
Diffstat (limited to 'libs/gui/Surface.cpp')
| -rw-r--r-- | libs/gui/Surface.cpp | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp index 80216bc63e..a4aec6e6aa 100644 --- a/libs/gui/Surface.cpp +++ b/libs/gui/Surface.cpp @@ -667,6 +667,9 @@ int Surface::queueBuffer(android_native_buffer_t* buffer, int fenceFd) { mDataSpace, crop, mScalingMode, mTransform ^ mStickyTransform, fence, mStickyTransform, mEnableFrameTimestamps); + // we should send HDR metadata as needed if this becomes a bottleneck + input.setHdrMetadata(mHdrMetadata); + if (mConnectedToCpu || mDirtyRegion.bounds() == Rect::INVALID_RECT) { input.setSurfaceDamage(Region::INVALID_REGION); } else { @@ -944,6 +947,12 @@ int Surface::perform(int operation, va_list args) case NATIVE_WINDOW_SET_BUFFERS_DATASPACE: res = dispatchSetBuffersDataSpace(args); break; + case NATIVE_WINDOW_SET_BUFFERS_SMPTE2086_METADATA: + res = dispatchSetBuffersSmpte2086Metadata(args); + break; + case NATIVE_WINDOW_SET_BUFFERS_CTA861_3_METADATA: + res = dispatchSetBuffersCta8613Metadata(args); + break; case NATIVE_WINDOW_SET_SURFACE_DAMAGE: res = dispatchSetSurfaceDamage(args); break; @@ -1088,6 +1097,18 @@ int Surface::dispatchSetBuffersDataSpace(va_list args) { return setBuffersDataSpace(dataspace); } +int Surface::dispatchSetBuffersSmpte2086Metadata(va_list args) { + const android_smpte2086_metadata* metadata = + va_arg(args, const android_smpte2086_metadata*); + return setBuffersSmpte2086Metadata(metadata); +} + +int Surface::dispatchSetBuffersCta8613Metadata(va_list args) { + const android_cta861_3_metadata* metadata = + va_arg(args, const android_cta861_3_metadata*); + return setBuffersCta8613Metadata(metadata); +} + int Surface::dispatchSetSurfaceDamage(va_list args) { android_native_rect_t* rects = va_arg(args, android_native_rect_t*); size_t numRects = va_arg(args, size_t); @@ -1512,6 +1533,30 @@ int Surface::setBuffersDataSpace(android_dataspace dataSpace) return NO_ERROR; } +int Surface::setBuffersSmpte2086Metadata(const android_smpte2086_metadata* metadata) { + ALOGV("Surface::setBuffersSmpte2086Metadata"); + Mutex::Autolock lock(mMutex); + if (metadata) { + mHdrMetadata.smpte2086 = *metadata; + mHdrMetadata.validTypes |= HdrMetadata::SMPTE2086; + } else { + mHdrMetadata.validTypes &= ~HdrMetadata::SMPTE2086; + } + return NO_ERROR; +} + +int Surface::setBuffersCta8613Metadata(const android_cta861_3_metadata* metadata) { + ALOGV("Surface::setBuffersCta8613Metadata"); + Mutex::Autolock lock(mMutex); + if (metadata) { + mHdrMetadata.cta8613 = *metadata; + mHdrMetadata.validTypes |= HdrMetadata::CTA861_3; + } else { + mHdrMetadata.validTypes &= ~HdrMetadata::CTA861_3; + } + return NO_ERROR; +} + android_dataspace_t Surface::getBuffersDataSpace() { ALOGV("Surface::getBuffersDataSpace"); Mutex::Autolock lock(mMutex); |