SurfaceFlinger: Dont show Animation on External Display (4b3f44cf) · Commits · e / devices / smdk4412 / android_frameworks_native

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+52 −36

Original line number	Diff line number	Diff line
		@@ -521,16 +521,13 @@ void HWComposer::eventControl(int disp, int event, int enabled) {
		event, disp, enabled);
		return;
		}
		if (event != EVENT_VSYNC) {
		ALOGW("eventControl got unexpected event %d (disp=%d en=%d)",
		event, disp, enabled);
		return;
		}
		status_t err = NO_ERROR;
		switch(event) {
		case EVENT_VSYNC:
		if (mHwc && !mDebugForceFakeVSync) {
		// NOTE: we use our own internal lock here because we have to call
		// into the HWC with the lock held, and we want to make sure
		// that even if HWC blocks (which it shouldn't), it won't
		// NOTE: we use our own internal lock here because we have to
		// call into the HWC with the lock held, and we want to make
		// sure that even if HWC blocks (which it shouldn't), it won't
		// affect other threads.
		Mutex::Autolock _l(mEventControlLock);
		const int32_t eventBit = 1UL << event;
		@@ -557,6 +554,17 @@ void HWComposer::eventControl(int disp, int event, int enabled) {
		if (err == NO_ERROR && mVSyncThread != NULL) {
		mVSyncThread->setEnabled(enabled);
		}
		break;
		case EVENT_ORIENTATION:
		// Orientation event
		err = mHwc->eventControl(mHwc, disp, event, enabled);
		break;
		default:
		ALOGW("eventControl got unexpected event %d (disp=%d en=%d)",
		event, disp, enabled);
		break;
		}
		return;
		}

		status_t HWComposer::createWorkList(int32_t id, size_t numLayers) {
		@@ -689,13 +697,14 @@ status_t HWComposer::prepare() {
		disp.hasFbComp = false;
		disp.hasOvComp = false;
		if (disp.list) {
		for (size_t i=0 ; i<disp.list->numHwLayers ; i++) {
		hwc_layer_1_t& l = disp.list->hwLayers[i];
		for (size_t j=0 ; j<disp.list->numHwLayers ; j++) {
		hwc_layer_1_t& l = disp.list->hwLayers[j];

		//ALOGD("prepare: %d, type=%d, handle=%p",
		// i, l.compositionType, l.handle);
		// j, l.compositionType, l.handle);

		if (l.flags & HWC_SKIP_LAYER) {
		if ((i == DisplayDevice::DISPLAY_PRIMARY) &&
		l.flags & HWC_SKIP_LAYER) {
		l.compositionType = HWC_FRAMEBUFFER;
		}
		if (l.compositionType == HWC_FRAMEBUFFER) {
		@@ -1001,6 +1010,13 @@ public:
		}
		}
		}
		virtual void setAnimating(bool animating) {
		if (animating) {
		getLayer()->flags \|= HWC_SCREENSHOT_ANIMATOR_LAYER;
		} else {
		getLayer()->flags &= ~HWC_SCREENSHOT_ANIMATOR_LAYER;
		}
		}
		virtual void setBlending(uint32_t blending) {
		getLayer()->blending = blending;
		}

services/surfaceflinger/DisplayHardware/HWComposer.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -166,6 +166,7 @@ public:
		virtual void setDefaultState() = 0;
		virtual void setSkip(bool skip) = 0;
		virtual void setIsCursorLayerHint(bool isCursor = true) = 0;
		virtual void setAnimating(bool animating) = 0;
		virtual void setBlending(uint32_t blending) = 0;
		virtual void setTransform(uint32_t transform) = 0;
		virtual void setFrame(const Rect& frame) = 0;
		@@ -249,7 +250,8 @@ public:
		// Events handling ---------------------------------------------------------

		enum {
		EVENT_VSYNC = HWC_EVENT_VSYNC
		EVENT_VSYNC = HWC_EVENT_VSYNC,
		EVENT_ORIENTATION = HWC_EVENT_ORIENTATION
		};

		void eventControl(int disp, int event, int enabled);

services/surfaceflinger/SurfaceFlinger.cpp

+40 −0

Original line number	Diff line number	Diff line
		@@ -1066,6 +1066,26 @@ void SurfaceFlinger::setUpHWComposer() {
		sp<const DisplayDevice> hw(mDisplays[dpy]);
		const int32_t id = hw->getHwcDisplayId();
		if (id >= 0) {
		// Get the layers in the current drawying state
		const LayerVector& layers(mDrawingState.layersSortedByZ);
		bool freezeSurfacePresent = false;
		const size_t layerCount = layers.size();
		char value[PROPERTY_VALUE_MAX];
		property_get("sys.disable_ext_animation", value, "0");
		if(atoi(value)) {
		for (size_t i = 0 ; i < layerCount ; ++i) {
		static int screenShotLen = strlen("ScreenshotSurface");
		const sp<Layer>& layer(layers[i]);
		if(!strncmp(layer->getName(), "ScreenshotSurface",
		screenShotLen)) {
		// Screenshot layer is present, and animation in
		// progress
		freezeSurfacePresent = true;
		break;
		}
		}
		}

		const Vector< sp<Layer> >& currentLayers(
		hw->getVisibleLayersSortedByZ());
		const size_t count = currentLayers.size();
		@@ -1078,6 +1098,26 @@ void SurfaceFlinger::setUpHWComposer() {
		*/
		const sp<Layer>& layer(currentLayers[i]);
		layer->setPerFrameData(hw, *cur);
		if(freezeSurfacePresent) {
		// if freezeSurfacePresent, set ANIMATING flag
		cur->setAnimating(true);
		} else {
		const KeyedVector<wp<IBinder>, DisplayDeviceState>&
		draw(mDrawingState.displays);
		size_t dc = draw.size();
		for (size_t i=0 ; i<dc ; i++) {
		if (draw[i].isMainDisplay()) {
		HWComposer& hwc(getHwComposer());
		if (hwc.initCheck() == NO_ERROR)
		// Pass the current orientation to HWC
		// which will be used to block animation
		// on external
		hwc.eventControl(HWC_DISPLAY_PRIMARY,
		SurfaceFlinger::EVENT_ORIENTATION,
		uint32_t(draw[i].orientation));
		}
		}
		}
		}
		}
		}

services/surfaceflinger/SurfaceFlinger.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,8 @@ public:
		void run() ANDROID_API;

		enum {
		EVENT_VSYNC = HWC_EVENT_VSYNC
		EVENT_VSYNC = HWC_EVENT_VSYNC,
		EVENT_ORIENTATION = HWC_EVENT_ORIENTATION
		};

		// post an asynchronous message to the main thread