Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dd0f804 authored Jun 10, 2015 by Caio Schnepper Committed by Ethan Chen Jun 29, 2015

libstagefright: back off exynos4_enhancements HWC_HWOVERLAY usage

The open source hwc doesn't support the
GRALLOC_USAGE_HW_FIMC1 | GRALLOC_USAGE_HWC_HWOVERLAY
combination. Removing HWC_HWOVERLAY allows FIMC1 to do
decode/color conversion.

Change-Id: Ibdfa9e5dd170e99e0d994540979e88e519931641

parent 143ed19c

media/libstagefright/OMXCodec.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2337,7 +2337,7 @@ status_t OMXCodec::allocateOutputBuffersFromNativeWindow() {
	#ifdef EXYNOS4_ENHANCEMENTS		#ifdef EXYNOS4_ENHANCEMENTS
	err = native_window_set_usage(		err = native_window_set_usage(
	mNativeWindow.get(), usage \| GRALLOC_USAGE_HW_TEXTURE \| GRALLOC_USAGE_EXTERNAL_DISP		mNativeWindow.get(), usage \| GRALLOC_USAGE_HW_TEXTURE \| GRALLOC_USAGE_EXTERNAL_DISP
	\| GRALLOC_USAGE_HW_FIMC1 \| GRALLOC_USAGE_HWC_HWOVERLAY);		\| GRALLOC_USAGE_HW_FIMC1);
	#else		#else
	err = native_window_set_usage(		err = native_window_set_usage(
	mNativeWindow.get(), usage \| GRALLOC_USAGE_HW_TEXTURE \| GRALLOC_USAGE_EXTERNAL_DISP);		mNativeWindow.get(), usage \| GRALLOC_USAGE_HW_TEXTURE \| GRALLOC_USAGE_EXTERNAL_DISP);

media/libstagefright/colorconversion/SoftwareRenderer.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -138,7 +138,7 @@ void SoftwareRenderer::resetFormatIfChanged(const sp<AMessage> &format) {
	mNativeWindow.get(),		mNativeWindow.get(),
	GRALLOC_USAGE_SW_READ_NEVER \| GRALLOC_USAGE_SW_WRITE_OFTEN		GRALLOC_USAGE_SW_READ_NEVER \| GRALLOC_USAGE_SW_WRITE_OFTEN
	\| GRALLOC_USAGE_HW_TEXTURE \| GRALLOC_USAGE_EXTERNAL_DISP		\| GRALLOC_USAGE_HW_TEXTURE \| GRALLOC_USAGE_EXTERNAL_DISP
	\| GRALLOC_USAGE_HW_FIMC1 \| GRALLOC_USAGE_HWC_HWOVERLAY));		\| GRALLOC_USAGE_HW_FIMC1));
	#else		#else
	CHECK_EQ(0,		CHECK_EQ(0,
	native_window_set_usage(		native_window_set_usage(