Snap for 12348750 from 7f7ab67a22907800a5e3e691c7bb535a8cff97d5 to 24Q4-release (482da138) · Commits · e / os / android_frameworks_av

camera/camera2/SessionConfiguration.cpp

+15 −21

Original line number	Diff line number	Diff line
		@@ -72,7 +72,6 @@ status_t SessionConfiguration::readFromParcel(const android::Parcel* parcel) {

		bool hasSessionParameters = false;
		CameraMetadata settings;
		if (flags::feature_combination_query()) {
		if ((err = parcel->readBool(&hasSessionParameters)) != OK) {
		ALOGE("%s: Failed to read hasSessionParameters flag from parcel", __FUNCTION__);
		return err;
		@@ -84,7 +83,6 @@ status_t SessionConfiguration::readFromParcel(const android::Parcel* parcel) {
		return err;
		}
		}
		}

		mOperatingMode = operatingMode;
		mInputWidth = inputWidth;
		@@ -94,10 +92,8 @@ status_t SessionConfiguration::readFromParcel(const android::Parcel* parcel) {
		for (auto& stream : outputStreams) {
		mOutputStreams.push_back(stream);
		}
		if (flags::feature_combination_query()) {
		mHasSessionParameters = hasSessionParameters;
		mSessionParameters = std::move(settings);
		}

		return err;
		}
		@@ -125,7 +121,6 @@ status_t SessionConfiguration::writeToParcel(android::Parcel* parcel) const {
		err = parcel->writeParcelableVector(mOutputStreams);
		if (err != OK) return err;

		if (flags::feature_combination_query()) {
		err = parcel->writeBool(mHasSessionParameters);
		if (err != OK) return err;

		@@ -133,7 +128,6 @@ status_t SessionConfiguration::writeToParcel(android::Parcel* parcel) const {
		err = mSessionParameters.writeToParcel(parcel);
		if (err != OK) return err;
		}
		}

		return OK;
		}

+8 −25

Original line number	Diff line number	Diff line
		@@ -25,13 +25,6 @@ flag {
		bug: "309627704"
		}

		flag {
		namespace: "camera_platform"
		name: "watch_foreground_changes"
		description: "Request AppOps to notify changes in the foreground status of the client"
		bug: "290086710"
		}

		flag {
		namespace: "camera_platform"
		name: "camera_manual_flash_strength_control"
		@@ -47,13 +40,6 @@ flag {
		bug: "285546208"
		}

		flag {
		namespace: "camera_platform"
		name: "log_zoom_override_usage"
		description: "Enable measuring how much usage there is for zoom settings overrde"
		bug: "307409002"
		}

		flag {
		namespace: "camera_platform"
		name: "session_hal_buf_manager"
		@@ -128,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"
		@@ -280,3 +256,10 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "camera_platform"
		name: "enable_hal_abort_from_cameraservicewatchdog"
		description: "Enable CameraServiceWatchdog to abort camera HAL to generate HAL tombstones"
		bug: "349652177"
		}

+10 −0

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

		flag {
		name: "dataspace_v0_partial"
		namespace: "codec_fwk"
		description: "Bugfix flag for using V0 dataspace in some cases"
		bug: "313827126"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "dynamic_color_aspects"
		is_exported: true

+6 −1

Original line number	Diff line number	Diff line
		@@ -512,9 +512,14 @@ public:
		uint64_t usage = mConfig.mUsage;
		(void)(*node)->setConsumerUsage((int64_t)usage);

		// AIDL does not define legacy dataspace.
		android_dataspace_t dataspace = mDataSpace;
		if (android::media::codec::provider_->dataspace_v0_partial()) {
		ColorUtils::convertDataSpaceToV0(dataspace);
		}
		return fromAidlStatus(mSource->configure(
		(*node), static_cast<::aidl::android::hardware::graphics::common::Dataspace>(
		mDataSpace)));
		dataspace)));
		}

		void disconnect() override {

+7 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@
		#include <utils/Log.h>
		#include <utils/Trace.h>

		#include <android_media_codec.h>

		#include <aidl/android/hardware/graphics/common/Cta861_3.h>
		#include <aidl/android/hardware/graphics/common/Smpte2086.h>
		#include <android-base/no_destructor.h>
		@@ -33,6 +35,7 @@
		#include <media/stagefright/foundation/ABuffer.h>
		#include <media/stagefright/foundation/AMessage.h>
		#include <media/stagefright/foundation/AUtils.h>
		#include <media/stagefright/foundation/ColorUtils.h>
		#include <mediadrm/ICrypto.h>
		#include <nativebase/nativebase.h>
		#include <ui/GraphicBufferMapper.h>
		@@ -735,6 +738,10 @@ c2_status_t SetMetadataToGralloc4Handle(
		// Gralloc4 not supported; nothing to do
		return err;
		}
		// Use V0 dataspaces for Gralloc4+
		if (android::media::codec::provider_->dataspace_v0_partial()) {
		ColorUtils::convertDataSpaceToV0(dataSpace);
		}
		status_t status = mapper.setDataspace(buffer.get(), static_cast<ui::Dataspace>(dataSpace));
		if (status != OK) {
		err = C2_CORRUPTED;