Merge "SF: Use std::string for layer names" (f8c61c30) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/BufferLayer.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ BufferLayer::BufferLayer(const LayerCreationArgs& args)
		mTextureName(args.textureName),
		mCompositionLayer{mFlinger->getCompositionEngine().createLayer(
		compositionengine::LayerCreationArgs{this})} {
		ALOGV("Creating Layer %s", args.name.string());
		ALOGV("Creating Layer %s", getDebugName());

		mPremultipliedAlpha = !(args.flags & ISurfaceComposerClient::eNonPremultiplied);

services/surfaceflinger/BufferQueueLayer.cpp

+7 −9

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ std::vector<OccupancyTracker::Segment> BufferQueueLayer::getOccupancyHistory(boo
		std::vector<OccupancyTracker::Segment> history;
		status_t result = mConsumer->getOccupancyHistory(forceFlush, &history);
		if (result != NO_ERROR) {
		ALOGW("[%s] Failed to obtain occupancy history (%d)", mName.string(), result);
		ALOGW("[%s] Failed to obtain occupancy history (%d)", getDebugName(), result);
		return {};
		}
		return history;
		@@ -110,7 +110,7 @@ bool BufferQueueLayer::shouldPresentNow(nsecs_t expectedPresentTime) const {
		ALOGW_IF(!isPlausible,
		"[%s] Timestamp %" PRId64 " seems implausible "
		"relative to expectedPresent %" PRId64,
		mName.string(), addedTime, expectedPresentTime);
		getDebugName(), addedTime, expectedPresentTime);

		const bool isDue = addedTime < expectedPresentTime;
		return isDue \|\| !isPlausible;
		@@ -225,7 +225,7 @@ status_t BufferQueueLayer::updateTexImage(bool& recomputeVisibleRegions, nsecs_t
		bool queuedBuffer = false;
		const int32_t layerID = getSequence();
		LayerRejecter r(mDrawingState, getCurrentState(), recomputeVisibleRegions,
		getProducerStickyTransform() != 0, mName.string(), mOverrideScalingMode,
		getProducerStickyTransform() != 0, mName, mOverrideScalingMode,
		getTransformToDisplayInverse());

		if (isRemovedFromCurrentState()) {
		@@ -398,7 +398,7 @@ void BufferQueueLayer::onFrameAvailable(const BufferItem& item) {
		while (item.mFrameNumber != mLastFrameNumberReceived + 1) {
		status_t result = mQueueItemCondition.waitRelative(mQueueItemLock, ms2ns(500));
		if (result != NO_ERROR) {
		ALOGE("[%s] Timed out waiting on callback", mName.string());
		ALOGE("[%s] Timed out waiting on callback", getDebugName());
		}
		}

		@@ -426,7 +426,7 @@ void BufferQueueLayer::onFrameReplaced(const BufferItem& item) {
		while (item.mFrameNumber != mLastFrameNumberReceived + 1) {
		status_t result = mQueueItemCondition.waitRelative(mQueueItemLock, ms2ns(500));
		if (result != NO_ERROR) {
		ALOGE("[%s] Timed out waiting on callback", mName.string());
		ALOGE("[%s] Timed out waiting on callback", getDebugName());
		}
		}

		@@ -466,7 +466,7 @@ void BufferQueueLayer::onFirstRef() {
		mTextureName, this);
		mConsumer->setConsumerUsageBits(getEffectiveUsage(0));
		mConsumer->setContentsChangedListener(this);
		mConsumer->setName(mName);
		mConsumer->setName(String8(mName.data(), mName.size()));

		// BufferQueueCore::mMaxDequeuedBufferCount is default to 1
		if (!mFlinger->isLayerTripleBufferingDisabled()) {
		@@ -529,9 +529,7 @@ void BufferQueueLayer::gatherBufferInfo() {
		}

		sp<Layer> BufferQueueLayer::createClone() {
		const String8 name = mName + " (Mirror)";
		LayerCreationArgs args =
		LayerCreationArgs(mFlinger.get(), nullptr, name, 0, 0, 0, LayerMetadata());
		LayerCreationArgs args(mFlinger.get(), nullptr, mName + " (Mirror)", 0, 0, 0, LayerMetadata());
		args.textureName = mTextureName;
		sp<BufferQueueLayer> layer = mFlinger->getFactory().createBufferQueueLayer(args);
		layer->setInitialValuesForClone(this);

services/surfaceflinger/BufferStateLayer.cpp

+3 −5

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ void BufferStateLayer::pushPendingState() {
		return;
		}
		mPendingStates.push_back(mCurrentState);
		ATRACE_INT(mTransactionName.string(), mPendingStates.size());
		ATRACE_INT(mTransactionName.c_str(), mPendingStates.size());
		}

		bool BufferStateLayer::applyPendingStates(Layer::State* stateToCommit) {
		@@ -479,7 +479,7 @@ status_t BufferStateLayer::updateTexImage(bool& /recomputeVisibleRegions/, nse
		(s.active.w != bufferWidth \|\| s.active.h != bufferHeight)) {
		ALOGE("[%s] rejecting buffer: "
		"bufferWidth=%d, bufferHeight=%d, front.active.{w=%d, h=%d}",
		mName.string(), bufferWidth, bufferHeight, s.active.w, s.active.h);
		getDebugName(), bufferWidth, bufferHeight, s.active.w, s.active.h);
		mFlinger->mTimeStats->removeTimeRecord(layerID, mFrameNumber);
		return BAD_VALUE;
		}
		@@ -669,9 +669,7 @@ Rect BufferStateLayer::computeCrop(const State& s) {
		}

		sp<Layer> BufferStateLayer::createClone() {
		const String8 name = mName + " (Mirror)";
		LayerCreationArgs args =
		LayerCreationArgs(mFlinger.get(), nullptr, name, 0, 0, 0, LayerMetadata());
		LayerCreationArgs args(mFlinger.get(), nullptr, mName + " (Mirror)", 0, 0, 0, LayerMetadata());
		args.textureName = mTextureName;
		sp<BufferStateLayer> layer = mFlinger->getFactory().createBufferStateLayer(args);
		layer->mHwcSlotGenerator = mHwcSlotGenerator;

services/surfaceflinger/ColorLayer.cpp

+3 −5

Original line number	Diff line number	Diff line
		@@ -108,13 +108,11 @@ ui::Dataspace ColorLayer::getDataSpace() const {
		}

		sp<Layer> ColorLayer::createClone() {
		String8 name = mName + " (Mirror)";
		sp<ColorLayer> layer = mFlinger->getFactory().createColorLayer(
		LayerCreationArgs(mFlinger.get(), nullptr, name, 0, 0, 0, LayerMetadata()));
		LayerCreationArgs(mFlinger.get(), nullptr, mName + " (Mirror)", 0, 0, 0,
		LayerMetadata()));
		layer->setInitialValuesForClone(this);
		return layer;
		}

		// ---------------------------------------------------------------------------

		}; // namespace android
		} // namespace android

services/surfaceflinger/ContainerLayer.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -31,10 +31,11 @@ bool ContainerLayer::isVisible() const {
		}

		sp<Layer> ContainerLayer::createClone() {
		String8 name = mName + " (Mirror)";
		sp<ContainerLayer> layer = mFlinger->getFactory().createContainerLayer(
		LayerCreationArgs(mFlinger.get(), nullptr, name, 0, 0, 0, LayerMetadata()));
		LayerCreationArgs(mFlinger.get(), nullptr, mName + " (Mirror)", 0, 0, 0,
		LayerMetadata()));
		layer->setInitialValuesForClone(this);
		return layer;
		}

		} // namespace android