Snap for 7639977 from d579b203e4bb6dfa4c06f226e345902dd4f4abc9 to sc-v2-release (ad796a23) · Commits · e / os / android_frameworks_av

drm/libdrmframework/DrmManagerClientImpl.cpp

+1 −3

Original line number	Diff line number	Diff line
		@@ -53,10 +53,8 @@ const sp<IDrmManagerService>& DrmManagerClientImpl::getDrmManagerService() {
		Mutex::Autolock lock(sMutex);
		if (NULL == sDrmManagerService.get()) {
		sp<IServiceManager> sm = defaultServiceManager();
		sp<IBinder> binder = sm->getService(String16("drm.drmManager"));
		sp<IBinder> binder = sm->checkService(String16("drm.drmManager"));
		if (binder == NULL) {
		// Do NOT retry; IServiceManager already waits for ~5 seconds
		// in getService if a service doesn't yet exist.
		return sDrmManagerService;
		}
		if (NULL == sDeathNotifier.get()) {

media/codec2/sfplugin/CCodec.cpp

+26 −7

Original line number	Diff line number	Diff line
		@@ -1566,15 +1566,36 @@ status_t CCodec::setupInputSurface(const std::shared_ptr<InputSurfaceWrapper> &s
		// we are now using surface - apply default color aspects to input format - as well as
		// get dataspace
		bool inputFormatChanged = config->updateFormats(Config::IS_INPUT);
		ALOGD("input format %s to %s",
		inputFormatChanged ? "changed" : "unchanged",
		config->mInputFormat->debugString().c_str());

		// configure dataspace
		static_assert(sizeof(int32_t) == sizeof(android_dataspace), "dataspace size mismatch");
		android_dataspace dataSpace = HAL_DATASPACE_UNKNOWN;
		(void)config->mInputFormat->findInt32("android._dataspace", (int32_t*)&dataSpace);

		// The output format contains app-configured color aspects, and the input format
		// has the default color aspects. Use the default for the unspecified params.
		ColorAspects inputColorAspects, colorAspects;
		getColorAspectsFromFormat(config->mOutputFormat, colorAspects);
		getColorAspectsFromFormat(config->mInputFormat, inputColorAspects);
		if (colorAspects.mRange == ColorAspects::RangeUnspecified) {
		colorAspects.mRange = inputColorAspects.mRange;
		}
		if (colorAspects.mPrimaries == ColorAspects::PrimariesUnspecified) {
		colorAspects.mPrimaries = inputColorAspects.mPrimaries;
		}
		if (colorAspects.mTransfer == ColorAspects::TransferUnspecified) {
		colorAspects.mTransfer = inputColorAspects.mTransfer;
		}
		if (colorAspects.mMatrixCoeffs == ColorAspects::MatrixUnspecified) {
		colorAspects.mMatrixCoeffs = inputColorAspects.mMatrixCoeffs;
		}
		android_dataspace dataSpace = getDataSpaceForColorAspects(
		colorAspects, /* mayExtend = */ false);
		surface->setDataSpace(dataSpace);
		setColorAspectsIntoFormat(colorAspects, config->mInputFormat, /* force = */ true);
		config->mInputFormat->setInt32("android._dataspace", int32_t(dataSpace));

		ALOGD("input format %s to %s",
		inputFormatChanged ? "changed" : "unchanged",
		config->mInputFormat->debugString().c_str());

		status_t err = mChannel->setInputSurface(surface);
		if (err != OK) {
		@@ -2262,8 +2283,6 @@ void CCodec::onMessageReceived(const sp<AMessage> &msg) {
		const C2ConstGraphicBlock &block = blocks[0];
		updates.emplace_back(new C2StreamCropRectInfo::output(
		stream, block.crop()));
		updates.emplace_back(new C2StreamPictureSizeInfo::output(
		stream, block.crop().width, block.crop().height));
		}
		++stream;
		}