Snap for 10354447 from 148eb32e8c6ec1c824bae94c74fa74cfff0e5cf0 to udc-qpr1-release (550e8e35) · Commits · e / os / android_frameworks_av

camera/ndk/include/camera/NdkCameraMetadataTags.h

+16 −9

Original line number	Diff line number	Diff line
		@@ -4487,8 +4487,8 @@ typedef enum acamera_metadata_tag {
		* <p>The guaranteed stream combinations related to stream use case for a camera device with
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE">CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE</a>
		* capability is documented in the camera device
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#createCaptureSession">guideline</a>. The
		* application is strongly recommended to use one of the guaranteed stream combinations.
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#stream-use-case-capability-additional-guaranteed-configurations">guideline</a>. The application is strongly recommended to use one of the guaranteed stream
		* combinations.
		* If the application creates a session with a stream combination not in the guaranteed
		* list, or with mixed DEFAULT and non-DEFAULT use cases within the same session,
		* the camera device may ignore some stream use cases due to hardware constraints
		@@ -9866,9 +9866,10 @@ typedef enum acamera_metadata_enum_acamera_request_available_capabilities {
		* </ul>
		* <p><a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#SCALER_AVAILABLE_STREAM_USE_CASES">CameraCharacteristics#SCALER_AVAILABLE_STREAM_USE_CASES</a>
		* lists all of the supported stream use cases.</p>
		* <p>Refer to <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#createCaptureSession">CameraDevice#createCaptureSession</a> for the
		* mandatory stream combinations involving stream use cases, which can also be queried
		* via <a href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.html">MandatoryStreamCombination</a>.</p>
		* <p>Refer to
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#stream-use-case-capability-additional-guaranteed-configurations">CameraDevice#stream-use-case-capability-additional-guaranteed-configurations</a>
		* for the mandatory stream combinations involving stream use cases, which can also be
		* queried via <a href="https://developer.android.com/reference/android/hardware/camera2/params/MandatoryStreamCombination.html">MandatoryStreamCombination</a>.</p>
		*/
		ACAMERA_REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE = 19,

		@@ -10728,7 +10729,8 @@ typedef enum acamera_metadata_enum_acamera_info_supported_hardware_level {
		* <p>This camera device does not have enough capabilities to qualify as a <code>FULL</code> device or
		* better.</p>
		* <p>Only the stream configurations listed in the <code>LEGACY</code> and <code>LIMITED</code> tables in the
		* {@link ACameraDevice_createCaptureSession createCaptureSession} documentation are guaranteed to be supported.</p>
		* {@link ACameraDevice_createCaptureSession }
		* documentation are guaranteed to be supported.</p>
		* <p>All <code>LIMITED</code> devices support the <code>BACKWARDS_COMPATIBLE</code> capability, indicating basic
		* support for color image capture. The only exception is that the device may
		* alternatively support only the <code>DEPTH_OUTPUT</code> capability, if it can only output depth
		@@ -10754,7 +10756,8 @@ typedef enum acamera_metadata_enum_acamera_info_supported_hardware_level {
		/**
		* <p>This camera device is capable of supporting advanced imaging applications.</p>
		* <p>The stream configurations listed in the <code>FULL</code>, <code>LEGACY</code> and <code>LIMITED</code> tables in the
		* {@link ACameraDevice_createCaptureSession createCaptureSession} documentation are guaranteed to be supported.</p>
		* {@link ACameraDevice_createCaptureSession }
		* documentation are guaranteed to be supported.</p>
		* <p>A <code>FULL</code> device will support below capabilities:</p>
		* <ul>
		* <li><code>BURST_CAPTURE</code> capability (ACAMERA_REQUEST_AVAILABLE_CAPABILITIES contains
		@@ -10781,7 +10784,9 @@ typedef enum acamera_metadata_enum_acamera_info_supported_hardware_level {

		/**
		* <p>This camera device is running in backward compatibility mode.</p>
		* <p>Only the stream configurations listed in the <code>LEGACY</code> table in the {@link ACameraDevice_createCaptureSession createCaptureSession} documentation are supported.</p>
		* <p>Only the stream configurations listed in the <code>LEGACY</code> table in the
		* {@link ACameraDevice_createCaptureSession }
		* documentation are supported.</p>
		* <p>A <code>LEGACY</code> device does not support per-frame control, manual sensor control, manual
		* post-processing, arbitrary cropping regions, and has relaxed performance constraints.
		* No additional capabilities beyond <code>BACKWARD_COMPATIBLE</code> will ever be listed by a
		@@ -10803,7 +10808,9 @@ typedef enum acamera_metadata_enum_acamera_info_supported_hardware_level {
		* <p>This camera device is capable of YUV reprocessing and RAW data capture, in addition to
		* FULL-level capabilities.</p>
		* <p>The stream configurations listed in the <code>LEVEL_3</code>, <code>RAW</code>, <code>FULL</code>, <code>LEGACY</code> and
		* <code>LIMITED</code> tables in the {@link ACameraDevice_createCaptureSession createCaptureSession} documentation are guaranteed to be supported.</p>
		* <code>LIMITED</code> tables in the
		* {@link ACameraDevice_createCaptureSession }
		* documentation are guaranteed to be supported.</p>
		* <p>The following additional capabilities are guaranteed to be supported:</p>
		* <ul>
		* <li><code>YUV_REPROCESSING</code> capability (ACAMERA_REQUEST_AVAILABLE_CAPABILITIES contains

services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -183,7 +183,8 @@ status_t AudioPolicyMixCollection::registerMix(const AudioMix& mix,
		for (size_t i = 0; i < size(); i++) {
		const sp<AudioPolicyMix>& registeredMix = itemAt(i);
		if (mix.mDeviceType == registeredMix->mDeviceType
		&& mix.mDeviceAddress.compare(registeredMix->mDeviceAddress) == 0) {
		&& mix.mDeviceAddress.compare(registeredMix->mDeviceAddress) == 0
		&& is_mix_loopback(mix.mRouteFlags)) {
		ALOGE("registerMix(): mix already registered for dev=0x%x addr=%s",
		mix.mDeviceType, mix.mDeviceAddress.string());
		return BAD_VALUE;

services/audiopolicy/tests/audiopolicymanager_tests.cpp

+6 −5

Original line number	Diff line number	Diff line
		@@ -1350,13 +1350,14 @@ TEST_F(AudioPolicyManagerTestDynamicPolicy, RegisterPolicyMixes) {
		AUDIO_DEVICE_OUT_REMOTE_SUBMIX, "", audioConfig);
		ASSERT_EQ(INVALID_OPERATION, ret);

		// The first time to register valid policy mixes should succeed.
		// The first time to register valid loopback policy mix should succeed.
		clearPolicyMix();
		ret = addPolicyMix(MIX_TYPE_PLAYERS, MIX_ROUTE_FLAG_RENDER,
		AUDIO_DEVICE_OUT_SPEAKER, "", audioConfig);
		ret = addPolicyMix(MIX_TYPE_PLAYERS, MIX_ROUTE_FLAG_LOOP_BACK,
		AUDIO_DEVICE_OUT_REMOTE_SUBMIX, "addr", audioConfig);
		ASSERT_EQ(NO_ERROR, ret);
		// Registering the same policy mixes should fail.
		ret = mManager->registerPolicyMixes(mAudioMixes);
		// Registering the render policy for the loopback address should succeed.
		ret = addPolicyMix(MIX_TYPE_PLAYERS, MIX_ROUTE_FLAG_RENDER,
		AUDIO_DEVICE_OUT_REMOTE_SUBMIX, "addr", audioConfig);
		ASSERT_EQ(INVALID_OPERATION, ret);
		}