Snap for 8948976 from a4c58ba28d1dd553a86f57e621dd6098442c14dc to tm-qpr1-release (ed181c9c) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/CCodecBufferChannel.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -960,9 +960,9 @@ status_t CCodecBufferChannel::renderOutputBuffer(
	hdrDynamicInfo->m.data + hdrDynamicInfo->flexCount());		hdrDynamicInfo->m.data + hdrDynamicInfo->flexCount());
	}		}
	qbi.setHdrMetadata(hdr);		qbi.setHdrMetadata(hdr);

	SetHdrMetadataToGralloc4Handle(hdrStaticInfo, hdrDynamicInfo, block.handle());
	}		}
			SetMetadataToGralloc4Handle(dataSpace, hdrStaticInfo, hdrDynamicInfo, block.handle());

	// we don't have dirty regions		// we don't have dirty regions
	qbi.setSurfaceDamage(Region::INVALID_REGION);		qbi.setSurfaceDamage(Region::INVALID_REGION);
	android::IGraphicBufferProducer::QueueBufferOutput qbo;		android::IGraphicBufferProducer::QueueBufferOutput qbo;

media/codec2/sfplugin/Codec2Buffer.cpp

+15 −1

Original line number	Original line	Diff line number	Diff line
	@@ -998,9 +998,11 @@ native_handle_t *EncryptedLinearBlockBuffer::handle() const {
	}		}

	using ::aidl::android::hardware::graphics::common::Cta861_3;		using ::aidl::android::hardware::graphics::common::Cta861_3;
			using ::aidl::android::hardware::graphics::common::Dataspace;
	using ::aidl::android::hardware::graphics::common::Smpte2086;		using ::aidl::android::hardware::graphics::common::Smpte2086;

	using ::android::gralloc4::MetadataType_Cta861_3;		using ::android::gralloc4::MetadataType_Cta861_3;
			using ::android::gralloc4::MetadataType_Dataspace;
	using ::android::gralloc4::MetadataType_Smpte2086;		using ::android::gralloc4::MetadataType_Smpte2086;
	using ::android::gralloc4::MetadataType_Smpte2094_40;		using ::android::gralloc4::MetadataType_Smpte2094_40;

	@@ -1156,7 +1158,8 @@ c2_status_t GetHdrMetadataFromGralloc4Handle(
	return err;		return err;
	}		}

	c2_status_t SetHdrMetadataToGralloc4Handle(		c2_status_t SetMetadataToGralloc4Handle(
			android_dataspace_t dataSpace,
	const std::shared_ptr<const C2StreamHdrStaticMetadataInfo::output> &staticInfo,		const std::shared_ptr<const C2StreamHdrStaticMetadataInfo::output> &staticInfo,
	const std::shared_ptr<const C2StreamHdrDynamicMetadataInfo::output> &dynamicInfo,		const std::shared_ptr<const C2StreamHdrDynamicMetadataInfo::output> &dynamicInfo,
	const C2Handle *const handle) {		const C2Handle *const handle) {
	@@ -1167,6 +1170,17 @@ c2_status_t SetHdrMetadataToGralloc4Handle(
	// Gralloc4 not supported; nothing to do		// Gralloc4 not supported; nothing to do
	return err;		return err;
	}		}
			{
			hidl_vec<uint8_t> metadata;
			if (gralloc4::encodeDataspace(static_cast<Dataspace>(dataSpace), &metadata) == OK) {
			Return<Error4> ret = mapper->set(buffer.get(), MetadataType_Dataspace, metadata);
			if (!ret.isOk()) {
			err = C2_REFUSED;
			} else if (ret != Error4::NONE) {
			err = C2_CORRUPTED;
			}
			}
			}
	if (staticInfo && *staticInfo) {		if (staticInfo && *staticInfo) {
	ALOGV("Setting static HDR info as gralloc4 metadata");		ALOGV("Setting static HDR info as gralloc4 metadata");
	std::optional<Smpte2086> smpte2086 = Smpte2086{		std::optional<Smpte2086> smpte2086 = Smpte2086{

media/codec2/sfplugin/Codec2Buffer.h

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -410,14 +410,16 @@ c2_status_t GetHdrMetadataFromGralloc4Handle(
	std::shared_ptr<C2StreamHdrDynamicMetadataInfo::input> *dynamicInfo);		std::shared_ptr<C2StreamHdrDynamicMetadataInfo::input> *dynamicInfo);

	/**		/**
	* Set HDR metadata to Gralloc4 handle.		* Set metadata to Gralloc4 handle.
	*		*
			* \param[in] dataSpace Dataspace to set.
	* \param[in] staticInfo HDR static info to set. Ignored if null or invalid.		* \param[in] staticInfo HDR static info to set. Ignored if null or invalid.
	* \param[in] dynamicInfo HDR dynamic info to set. Ignored if null or invalid.		* \param[in] dynamicInfo HDR dynamic info to set. Ignored if null or invalid.
	* \param[out] handle handle of the allocation.		* \param[out] handle handle of the allocation.
	* \return C2_OK if successful		* \return C2_OK if successful
	*/		*/
	c2_status_t SetHdrMetadataToGralloc4Handle(		c2_status_t SetMetadataToGralloc4Handle(
			const android_dataspace_t dataSpace,
	const std::shared_ptr<const C2StreamHdrStaticMetadataInfo::output> &staticInfo,		const std::shared_ptr<const C2StreamHdrStaticMetadataInfo::output> &staticInfo,
	const std::shared_ptr<const C2StreamHdrDynamicMetadataInfo::output> &dynamicInfo,		const std::shared_ptr<const C2StreamHdrDynamicMetadataInfo::output> &dynamicInfo,
	const C2Handle *const handle);		const C2Handle *const handle);

media/libmediaplayerservice/StagefrightRecorder.cpp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1966,6 +1966,10 @@ status_t StagefrightRecorder::setupVideoEncoder(
	format->setString("mime", MEDIA_MIMETYPE_VIDEO_HEVC);		format->setString("mime", MEDIA_MIMETYPE_VIDEO_HEVC);
	break;		break;

			case VIDEO_ENCODER_DOLBY_VISION:
			format->setString("mime", MEDIA_MIMETYPE_VIDEO_DOLBY_VISION);
			break;

	default:		default:
	CHECK(!"Should not be here, unsupported video encoding.");		CHECK(!"Should not be here, unsupported video encoding.");
	break;		break;