Snap for 11954976 from 2a757af0266b79c9bcf46178d6b1bc0acead1287 to 24Q3-release (9c36ee49) · Commits · e / devices / smdk4412 / android_frameworks_av

camera/ndk/include/camera/NdkCameraMetadataTags.h

+3 −7

Original line number	Diff line number	Diff line
		@@ -2287,12 +2287,11 @@ typedef enum acamera_metadata_tag {
		* <p>When low light boost is enabled by setting the AE mode to
		* 'ON_LOW_LIGHT_BOOST_BRIGHTNESS_PRIORITY', it can dynamically apply a low light
		* boost when the light level threshold is exceeded.</p>
		* <p>This field is present in the CaptureResult when the AE mode is set to
		* 'ON_LOW_LIGHT_BOOST_BRIGHTNESS_PRIORITY'. Otherwise, the field is not present.</p>
		* <p>This state indicates when low light boost is 'ACTIVE' and applied. Similarly, it can
		* indicate when it is not being applied by returning 'INACTIVE'.</p>
		* <p>This key will be absent from the CaptureResult if AE mode is not set to
		* 'ON_LOW_LIGHT_BOOST_BRIGHTNESS_PRIORITY.</p>
		* <p>The default value will always be 'INACTIVE'.</p>
		*/
		ACAMERA_CONTROL_LOW_LIGHT_BOOST_STATE = // byte (acamera_metadata_enum_android_control_low_light_boost_state_t)
		ACAMERA_CONTROL_START + 59,
		@@ -8311,11 +8310,8 @@ typedef enum acamera_metadata_enum_acamera_control_ae_mode {
		* <p>If the session configuration is not supported, the AE mode reported in the
		* CaptureResult will be 'ON' instead of 'ON_LOW_LIGHT_BOOST_BRIGHTNESS_PRIORITY'.</p>
		* <p>When this AE mode is enabled, the CaptureResult field
		* ACAMERA_CONTROL_LOW_LIGHT_BOOST_STATE will be present and not null. Otherwise, the
		* ACAMERA_CONTROL_LOW_LIGHT_BOOST_STATE field will not be present in the CaptureResult.</p>
		* <p>The application can observe the CaptureResult field
		* ACAMERA_CONTROL_LOW_LIGHT_BOOST_STATE to determine when low light boost is 'ACTIVE' or
		* 'INACTIVE'.</p>
		* ACAMERA_CONTROL_LOW_LIGHT_BOOST_STATE will indicate when low light boost is 'ACTIVE'
		* or 'INACTIVE'. By default ACAMERA_CONTROL_LOW_LIGHT_BOOST_STATE will be 'INACTIVE'.</p>
		* <p>The low light boost is 'ACTIVE' once the scene lighting condition is less than the
		* upper bound lux value defined by ACAMERA_CONTROL_LOW_LIGHT_BOOST_INFO_LUMINANCE_RANGE.
		* This mode will be 'INACTIVE' once the scene lighting condition is greater than the

include/media/Interpolator.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -289,7 +289,7 @@ public:

		std::string toString() const {
		std::stringstream ss;
		ss << "Interpolator{mInterpolatorType=" << static_cast<int32_t>(mInterpolatorType);
		ss << "Interpolator{mInterpolatorType=" << media::toString(mInterpolatorType);
		ss << ", mFirstSlope=" << mFirstSlope;
		ss << ", mLastSlope=" << mLastSlope;
		ss << ", {";

include/media/VolumeShaper.h

+48 −3

Original line number	Diff line number	Diff line
		@@ -116,6 +116,16 @@ public:
		TYPE_SCALE,
		};

		static std::string toString(Type type) {
		switch (type) {
		case TYPE_ID: return "TYPE_ID";
		case TYPE_SCALE: return "TYPE_SCALE";
		default:
		return std::string("Unknown Type: ")
		.append(std::to_string(static_cast<int>(type)));
		}
		}

		// Must match with VolumeShaper.java in frameworks/base.
		enum OptionFlag : int32_t {
		OPTION_FLAG_NONE = 0,
		@@ -125,6 +135,22 @@ public:
		OPTION_FLAG_ALL = (OPTION_FLAG_VOLUME_IN_DBFS \| OPTION_FLAG_CLOCK_TIME),
		};

		static std::string toString(OptionFlag flag) {
		std::string s;
		for (const auto& flagPair : std::initializer_list<std::pair<OptionFlag, const char*>>{
		{OPTION_FLAG_VOLUME_IN_DBFS, "OPTION_FLAG_VOLUME_IN_DBFS"},
		{OPTION_FLAG_CLOCK_TIME, "OPTION_FLAG_CLOCK_TIME"},
		}) {
		if (flag & flagPair.first) {
		if (!s.empty()) {
		s.append("\|");
		}
		s.append(flagPair.second);
		}
		}
		return s;
		}

		// Bring from base class; must match with VolumeShaper.java in frameworks/base.
		using InterpolatorType = Interpolator<S, T>::InterpolatorType;

		@@ -329,10 +355,10 @@ public:
		// Returns a string for debug printing.
		std::string toString() const {
		std::stringstream ss;
		ss << "VolumeShaper::Configuration{mType=" << static_cast<int32_t>(mType);
		ss << "VolumeShaper::Configuration{mType=" << toString(mType);
		ss << ", mId=" << mId;
		if (mType != TYPE_ID) {
		ss << ", mOptionFlags=" << static_cast<int32_t>(mOptionFlags);
		ss << ", mOptionFlags=" << toString(mOptionFlags);
		ss << ", mDurationMs=" << mDurationMs;
		ss << ", " << Interpolator<S, T>::toString().c_str();
		}
		@@ -414,6 +440,25 @@ public:
		\| FLAG_CREATE_IF_NECESSARY),
		};

		static std::string toString(Flag flag) {
		std::string s;
		for (const auto& flagPair : std::initializer_list<std::pair<Flag, const char*>>{
		{FLAG_REVERSE, "FLAG_REVERSE"},
		{FLAG_TERMINATE, "FLAG_TERMINATE"},
		{FLAG_JOIN, "FLAG_JOIN"},
		{FLAG_DELAY, "FLAG_DELAY"},
		{FLAG_CREATE_IF_NECESSARY, "FLAG_CREATE_IF_NECESSARY"},
		}) {
		if (flag & flagPair.first) {
		if (!s.empty()) {
		s.append("\|");
		}
		s.append(flagPair.second);
		}
		}
		return s;
		}

		Operation()
		: Operation(FLAG_NONE, -1 /* replaceId */) {
		}
		@@ -508,7 +553,7 @@ public:

		std::string toString() const {
		std::stringstream ss;
		ss << "VolumeShaper::Operation{mFlags=" << static_cast<int32_t>(mFlags) ;
		ss << "VolumeShaper::Operation{mFlags=" << toString(mFlags);
		ss << ", mReplaceId=" << mReplaceId;
		ss << ", mXOffset=" << mXOffset;
		ss << "}";

media/audio/aconfig/audio.aconfig

+7 −0

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

		flag {
		name: "music_fx_edge_to_edge"
		namespace: "media_audio"
		description: "Enable Edge-to-edge feature for MusicFx and handle insets"
		bug: "336204940"
		}

		flag {
		name: "port_to_piid_simplification"
		namespace: "media_audio"

media/audio/aconfig/audioserver.aconfig

+7 −0

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

		flag {
		name: "effect_chain_callback_improve"
		namespace: "media_audio"
		description: "Improve effect chain callback mutex logic."
		bug: "342413767"
		}

		flag {
		name: "fdtostring_timeout_fix"
		namespace: "media_audio"