Merge "Camera: Remove flag 'surface_ipc'" into main (3a711421) · Commits · e / os / android_frameworks_av

camera/camera_platform.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -114,16 +114,6 @@ flag {
		bug: "282814430"
		}

		flag {
		namespace: "camera_platform"
		name: "surface_ipc"
		description: "Optimize Surface binder IPC"
		bug: "323292530"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "camera_platform"
		name: "extension_10_bit"

+2 −6

Original line number	Diff line number	Diff line
		@@ -687,11 +687,7 @@ status_t Camera3OutputStream::configureConsumerQueueLocked(bool allowPreviewResp
		}
		}

		if (flags::surface_ipc()) {
		res = mConsumer->setMaxDequeuedBufferCount(mTotalBufferCount - maxConsumerBuffers);
		} else {
		res = native_window_set_buffer_count(mConsumer.get(), mTotalBufferCount);
		}
		if (res != OK) {
		ALOGE("%s: Unable to set buffer count for stream %d",
		__FUNCTION__, mId);
		@@ -1035,7 +1031,7 @@ void Camera3OutputStream::applyZSLUsageQuirk(int format, uint64_t *consumerUsage
		status_t Camera3OutputStream::getEndpointUsageForSurface(uint64_t *usage,
		const sp<Surface>& surface) {
		bool internalConsumer = (mConsumer.get() != nullptr) && (mConsumer == surface);
		if (mConsumerUsageCachedValue.has_value() && flags::surface_ipc() && internalConsumer) {
		if (mConsumerUsageCachedValue.has_value() && internalConsumer) {
		*usage = mConsumerUsageCachedValue.value();
		return OK;
		}