Merge "Fix potential thread violation in applying gainmaps" into udc-qpr-dev (7e9773de) · Commits · e / os / android_frameworks_base

libs/hwui/effects/GainmapRenderer.cpp

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -54,14 +54,13 @@ float getTargetHdrSdrRatio(const SkColorSpace* destColorspace) {
	return maxPQLux / GenericSdrWhiteNits;		return maxPQLux / GenericSdrWhiteNits;
	} else if (skcms_TransferFunction_isHLGish(&destTF)) {		} else if (skcms_TransferFunction_isHLGish(&destTF)) {
	return maxHLGLux / GenericSdrWhiteNits;		return maxHLGLux / GenericSdrWhiteNits;
	} else {
	#ifdef __ANDROID__		#ifdef __ANDROID__
			} else if (RenderThread::isCurrent()) {
	CanvasContext* context = CanvasContext::getActiveContext();		CanvasContext* context = CanvasContext::getActiveContext();
	return context ? context->targetSdrHdrRatio() : 1.f;		return context ? context->targetSdrHdrRatio() : 1.f;
	#else
	return 1.f;
	#endif		#endif
	}		}
			return 1.f;
	}		}

	void DrawGainmapBitmap(SkCanvas* c, const sk_sp<const SkImage>& image, const SkRect& src,		void DrawGainmapBitmap(SkCanvas* c, const sk_sp<const SkImage>& image, const SkRect& src,