Merge "Revert "Use configStore for maxVirtualDisplay Size"" (ba2ab1d1) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/Android.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,12 @@ ifeq ($(TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK),true)
		LOCAL_CFLAGS += -DRUNNING_WITHOUT_SYNC_FRAMEWORK
		endif

		ifneq ($(MAX_VIRTUAL_DISPLAY_DIMENSION),)
		LOCAL_CFLAGS += -DMAX_VIRTUAL_DISPLAY_DIMENSION=$(MAX_VIRTUAL_DISPLAY_DIMENSION)
		else
		LOCAL_CFLAGS += -DMAX_VIRTUAL_DISPLAY_DIMENSION=0
		endif

		LOCAL_CFLAGS += -fvisibility=hidden -Werror=format

		LOCAL_HEADER_LIBRARIES := \

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -267,12 +267,12 @@ status_t HWComposer::allocateVirtualDisplay(uint32_t width, uint32_t height,
		return NO_MEMORY;
		}

		if (SurfaceFlinger::maxVirtualDisplaySize != 0 &&
		(width > SurfaceFlinger::maxVirtualDisplaySize \|\|
		height > SurfaceFlinger::maxVirtualDisplaySize)) {
		if (MAX_VIRTUAL_DISPLAY_DIMENSION != 0 &&
		(width > MAX_VIRTUAL_DISPLAY_DIMENSION \|\|
		height > MAX_VIRTUAL_DISPLAY_DIMENSION)) {
		ALOGE("createVirtualDisplay: Can't create a virtual display with"
		" a dimension > %" PRIu64 " (tried %u x %u)",
		SurfaceFlinger::maxVirtualDisplaySize, width, height);
		" a dimension > %u (tried %u x %u)",
		MAX_VIRTUAL_DISPLAY_DIMENSION, width, height);
		return INVALID_OPERATION;
		}

services/surfaceflinger/SurfaceFlinger.cpp

+0 −6

Original line number	Diff line number	Diff line
		@@ -99,7 +99,6 @@ EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint na

		namespace android {


		using namespace android::hardware::configstore;
		using namespace android::hardware::configstore::V1_0;

		@@ -116,7 +115,6 @@ int64_t SurfaceFlinger::sfVsyncPhaseOffsetNs;
		bool SurfaceFlinger::useContextPriority;
		int64_t SurfaceFlinger::dispSyncPresentTimeOffset;
		bool SurfaceFlinger::useHwcForRgbToYuv;
		uint64_t SurfaceFlinger::maxVirtualDisplaySize;

		SurfaceFlinger::SurfaceFlinger()
		: BnSurfaceComposer(),
		@@ -178,9 +176,6 @@ SurfaceFlinger::SurfaceFlinger()
		useHwcForRgbToYuv = getBool< ISurfaceFlingerConfigs,
		&ISurfaceFlingerConfigs::useHwcForRGBtoYUV>(false);

		maxVirtualDisplaySize = getUInt64<ISurfaceFlingerConfigs,
		&ISurfaceFlingerConfigs::maxVirtualDisplaySize>(0);

		// debugging stuff...
		char value[PROPERTY_VALUE_MAX];

		@@ -3248,7 +3243,6 @@ void SurfaceFlinger::appendSfConfigString(String8& result) const

		result.appendFormat(" PRESENT_TIME_OFFSET=%" PRId64 , dispSyncPresentTimeOffset);
		result.appendFormat(" FORCE_HWC_FOR_RBG_TO_YUV=%d", useHwcForRgbToYuv);
		result.appendFormat(" MAX_VIRT_DISPLAY_DIM=%" PRIu64, maxVirtualDisplaySize);
		result.append("]");
		}

services/surfaceflinger/SurfaceFlinger.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -105,6 +105,7 @@ class SurfaceFlinger : public BnSurfaceComposer,
		{
		public:


		// This is the phase offset in nanoseconds of the software vsync event
		// relative to the vsync event reported by HWComposer. The software vsync
		// event is when SurfaceFlinger and Choreographer-based applications run each
		@@ -141,10 +142,6 @@ public:
		// GL composition.
		static bool useHwcForRgbToYuv;

		// Maximum dimension supported by HWC for virtual display.
		// Equal to min(max_height, max_width).
		static uint64_t maxVirtualDisplaySize;

		static char const* getServiceName() ANDROID_API {
		return "SurfaceFlinger";
		}

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

+4 −10

Original line number	Diff line number	Diff line
		@@ -114,7 +114,6 @@ int64_t SurfaceFlinger::sfVsyncPhaseOffsetNs;
		bool SurfaceFlinger::useContextPriority;
		int64_t SurfaceFlinger::dispSyncPresentTimeOffset;
		bool SurfaceFlinger::useHwcForRgbToYuv;
		uint64_t SurfaceFlinger::maxVirtualDisplaySize;

		SurfaceFlinger::SurfaceFlinger()
		: BnSurfaceComposer(),
		@@ -151,17 +150,13 @@ SurfaceFlinger::SurfaceFlinger()
		mLastSwapTime(0),
		mNumLayers(0)
		{

		ALOGI("SurfaceFlinger is starting");

		vsyncPhaseOffsetNs = getInt64< ISurfaceFlingerConfigs,
		&ISurfaceFlingerConfigs::vsyncEventPhaseOffsetNs>(1000000);

		sfVsyncPhaseOffsetNs = getInt64< ISurfaceFlingerConfigs,
		&ISurfaceFlingerConfigs::vsyncSfEventPhaseOffsetNs>(1000000);

		maxVirtualDisplaySize = getUInt64<ISurfaceFlingerConfigs,
		&ISurfaceFlingerConfigs::maxVirtualDisplaySize>(0);
		ALOGI("SurfaceFlinger is starting");

		useContextPriority = getBool< ISurfaceFlingerConfigs,
		&ISurfaceFlingerConfigs::useContextPriority>(false);
		@@ -1706,9 +1701,9 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
		ALOGE_IF(status != NO_ERROR,
		"Unable to query height (%d)", status);
		if (mUseHwcVirtualDisplays &&
		(SurfaceFlinger::maxVirtualDisplaySize == 0 \|\|
		(width <= SurfaceFlinger::maxVirtualDisplaySize &&
		height <= SurfaceFlinger::maxVirtualDisplaySize))) {
		(MAX_VIRTUAL_DISPLAY_DIMENSION == 0 \|\|
		(width <= MAX_VIRTUAL_DISPLAY_DIMENSION &&
		height <= MAX_VIRTUAL_DISPLAY_DIMENSION))) {
		hwcDisplayId = allocateHwcDisplayId(state.type);
		}

		@@ -3020,7 +3015,6 @@ void SurfaceFlinger::appendSfConfigString(String8& result) const

		result.appendFormat(" PRESENT_TIME_OFFSET=%" PRId64, dispSyncPresentTimeOffset);
		result.appendFormat(" FORCE_HWC_FOR_RBG_TO_YUV=%d", useHwcForRgbToYuv);
		result.appendFormat(" MAX_VIRT_DISPLAY_DIM=%" PRIu64, maxVirtualDisplaySize);
		result.append("]");
		}