Snap for 11853201 from c330bc7d86fea234e68d5e4258dd340b1b4d636d to 24Q3-release (e3d060b6) · Commits · e / os / android_frameworks_av

camera/ndk/include/camera/NdkCameraMetadataTags.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -2287,6 +2287,8 @@ 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
		@@ -8292,7 +8294,10 @@ typedef enum acamera_metadata_enum_acamera_control_ae_mode {
		* FPS.</p>
		* <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>The application can observe the CapturerResult field
		* <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>
		* <p>The low light boost is 'ACTIVE' once the scene lighting condition is less than the

+8 −3

Original line number	Diff line number	Diff line
		@@ -48,7 +48,12 @@
		// Postsubmit tests for TV devices
		"tv-postsubmit": [
		{
		"name": "DecoderRenderTest"
		"name": "CtsMediaDecoderTestCases",
		"options": [
		{
		"include-filter": "android.media.decoder.cts.DecoderRenderTest"
		}
		]
		}
		]
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,8 @@ SampleRateConverter::SampleRateConverter(int32_t channelCount,

		void SampleRateConverter::reset() {
		FlowGraphNode::reset();
		mInputCursor = kInitialCallCount;
		mInputCallCount = kInitialCallCount;
		mInputCursor = 0;
		}

		// Return true if there is a sample available.

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ private:
		int32_t mNumValidInputFrames = 0; // number of valid frames currently in the input port buffer
		// We need our own callCount for upstream calls because calls occur at a different rate.
		// This means we cannot have cyclic graphs or merges that contain an SRC.
		int64_t mInputCallCount = 0;
		int64_t mInputCallCount = kInitialCallCount;

		};

+4 −4

Original line number	Diff line number	Diff line
		@@ -1680,14 +1680,14 @@ status_t AudioTrack::setOutputDevice(audio_port_handle_t deviceId) {
		mSelectedDeviceId = deviceId;
		if (mStatus == NO_ERROR) {
		if (isOffloadedOrDirect_l()) {
		if (mState == STATE_STOPPED \|\| mState == STATE_FLUSHED) {
		ALOGD("%s(%d): creating a new AudioTrack", __func__, mPortId);
		result = restoreTrack_l("setOutputDevice", true /* forceRestore */);
		} else {
		if (isPlaying_l()) {
		ALOGW("%s(%d). Offloaded or Direct track is not STOPPED or FLUSHED. "
		"State: %s.",
		__func__, mPortId, stateToString(mState));
		result = INVALID_OPERATION;
		} else {
		ALOGD("%s(%d): creating a new AudioTrack", __func__, mPortId);
		result = restoreTrack_l("setOutputDevice", true /* forceRestore */);
		}
		} else {
		// allow track invalidation when track is not playing to propagate