Snap for 7280565 from 13bbdc0e49cd3ba4992d90511d9f26e9adb4aa7c to sc-release (d1d016b3) · Commits · e / os / android_frameworks_av

camera/ndk/impl/ACameraMetadata.cpp

+26 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,28 @@

		using namespace android;

		// Formats not listed in the public API, but still available to AImageReader
		// Enum value must match corresponding enum in ui/PublicFormat.h (which is not
		// available to VNDK)
		enum AIMAGE_PRIVATE_FORMATS {
		/**
		* Unprocessed implementation-dependent raw
		* depth measurements, opaque with 16 bit
		* samples.
		*
		*/

		AIMAGE_FORMAT_RAW_DEPTH = 0x1002,

		/**
		* Device specific 10 bits depth RAW image format.
		*
		* <p>Unprocessed implementation-dependent raw depth measurements, opaque with 10 bit samples
		* and device specific bit layout.</p>
		*/
		AIMAGE_FORMAT_RAW_DEPTH10 = 0x1003,
		};

		/**
		* ACameraMetadata Implementation
		*/
		@@ -290,6 +312,10 @@ ACameraMetadata::filterStreamConfigurations() {
		format = AIMAGE_FORMAT_DEPTH_POINT_CLOUD;
		} else if (format == HAL_PIXEL_FORMAT_Y16) {
		format = AIMAGE_FORMAT_DEPTH16;
		} else if (format == HAL_PIXEL_FORMAT_RAW16) {
		format = static_cast<int32_t>(AIMAGE_FORMAT_RAW_DEPTH);
		} else if (format == HAL_PIXEL_FORMAT_RAW10) {
		format = static_cast<int32_t>(AIMAGE_FORMAT_RAW_DEPTH10);
		}

		filteredDepthStreamConfigs.push_back(format);

camera/ndk/include/camera/NdkCameraMetadataTags.h

+11 −11

Original line number	Diff line number	Diff line
		@@ -3502,7 +3502,7 @@ typedef enum acamera_metadata_tag {
		* preCorrectionActiveArraySize covers the camera device's field of view "after" zoom. See
		* ACAMERA_CONTROL_ZOOM_RATIO for details.</p>
		* <p>For camera devices with the
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* capability, ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION /
		* ACAMERA_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION must be used as the
		* coordinate system for requests where ACAMERA_SENSOR_PIXEL_MODE is set to
		@@ -3964,7 +3964,7 @@ typedef enum acamera_metadata_tag {
		* configurations which belong to this physical camera, and it will advertise and will only
		* advertise the maximum supported resolutions for a particular format.</p>
		* <p>If this camera device isn't a physical camera device constituting a logical camera,
		* but a standalone <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* but a standalone <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* camera, this field represents the multi-resolution input/output stream configurations of
		* default mode and max resolution modes. The sizes will be the maximum resolution of a
		* particular format for default mode and max resolution mode.</p>
		@@ -4867,12 +4867,12 @@ typedef enum acamera_metadata_tag {
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_DEFAULT">CameraMetadata#SENSOR_PIXEL_MODE_DEFAULT</a> mode.
		* When operating in
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_DEFAULT">CameraMetadata#SENSOR_PIXEL_MODE_DEFAULT</a> mode, sensors
		* with <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* with <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* capability would typically perform pixel binning in order to improve low light
		* performance, noise reduction etc. However, in
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>
		* mode (supported only
		* by <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* by <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* sensors), sensors typically operate in unbinned mode allowing for a larger image size.
		* The stream configurations supported in
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>
		@@ -4905,7 +4905,7 @@ typedef enum acamera_metadata_tag {
		* </ul></p>
		*
		* <p>This key will only be present in devices advertisting the
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* capability which also advertise <code>REMOSAIC_REPROCESSING</code> capability. On all other devices
		* RAW targets will have a regular bayer pattern.</p>
		*/
		@@ -5231,7 +5231,7 @@ typedef enum acamera_metadata_tag {
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>
		* counterparts.
		* This key will only be present for devices which advertise the
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* capability.</p>
		* <p>The data representation is <code>int[4]</code>, which maps to <code>(left, top, width, height)</code>.</p>
		*
		@@ -5263,7 +5263,7 @@ typedef enum acamera_metadata_tag {
		* is, when ACAMERA_SENSOR_PIXEL_MODE is set to
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>.
		* This key will only be present for devices which advertise the
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* capability.</p>
		*
		* @see ACAMERA_SENSOR_INFO_PHYSICAL_SIZE
		@@ -5291,7 +5291,7 @@ typedef enum acamera_metadata_tag {
		* when ACAMERA_SENSOR_PIXEL_MODE is set to
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION">CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION</a>.
		* This key will only be present for devices which advertise the
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* capability.</p>
		* <p>The data representation is <code>int[4]</code>, which maps to <code>(left, top, width, height)</code>.</p>
		*
		@@ -5321,7 +5321,7 @@ typedef enum acamera_metadata_tag {
		* <p>This key will not be present if REMOSAIC_REPROCESSING is not supported, since RAW images
		* will have a regular bayer pattern.</p>
		* <p>This key will not be present for sensors which don't have the
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>
		* capability.</p>
		*/
		ACAMERA_SENSOR_INFO_BINNING_FACTOR = // int32[2]
		@@ -9264,13 +9264,13 @@ typedef enum acamera_metadata_enum_acamera_sensor_pixel_mode {
		/**
		* <p>This is the default sensor pixel mode. This is the only sensor pixel mode
		* supported unless a camera device advertises
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>.</p>
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>.</p>
		*/
		ACAMERA_SENSOR_PIXEL_MODE_DEFAULT = 0,

		/**
		* <p>This sensor pixel mode is offered by devices with capability
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILTIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>.
		* <a href="https://developer.android.com/reference/android/hardware/camera2/CameraMetadata.html#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR">CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR</a>.
		* In this mode, sensors typically do not bin pixels, as a result can offer larger
		* image sizes.</p>
		*/

media/codec2/components/aac/C2SoftAacEnc.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -272,8 +272,9 @@ status_t C2SoftAacEnc::setAudioParams() {
		return UNKNOWN_ERROR;
		}

		if (sbrMode != -1 && aacProfile == C2Config::PROFILE_AAC_ELD) {
		if (AACENC_OK != aacEncoder_SetParam(mAACEncoder, AACENC_SBR_MODE, sbrMode)) {
		if (sbrMode != C2Config::AAC_SBR_AUTO && aacProfile == C2Config::PROFILE_AAC_ELD) {
		int aacSbrMode = sbrMode != C2Config::AAC_SBR_OFF;
		if (AACENC_OK != aacEncoder_SetParam(mAACEncoder, AACENC_SBR_MODE, aacSbrMode)) {
		ALOGE("Failed to set AAC encoder parameters");
		return UNKNOWN_ERROR;
		}

media/codec2/sfplugin/CCodecConfig.cpp

+19 −0

Original line number	Diff line number	Diff line
		@@ -733,6 +733,17 @@ void CCodecConfig::initializeStandardParams() {
		return C2Value();
		}));

		add(ConfigMapper(KEY_AAC_PROFILE, C2_PARAMKEY_PROFILE_LEVEL, "profile")
		.limitTo(D::AUDIO & D::ENCODER & (D::CONFIG \| D::PARAM))
		.withMapper([mapper](C2Value v) -> C2Value {
		C2Config::profile_t c2 = PROFILE_UNUSED;
		int32_t sdk;
		if (mapper && v.get(&sdk) && mapper->mapProfile(sdk, &c2)) {
		return c2;
		}
		return PROFILE_UNUSED;
		}));

		// convert to dBFS and add default
		add(ConfigMapper(KEY_AAC_DRC_TARGET_REFERENCE_LEVEL, C2_PARAMKEY_DRC_TARGET_REFERENCE_LEVEL, "value")
		.limitTo(D::AUDIO & D::DECODER & (D::CONFIG \| D::PARAM \| D::READ))
		@@ -1325,6 +1336,14 @@ sp<AMessage> CCodecConfig::getFormatForDomain(
		}
		}

		// Remove KEY_AAC_SBR_MODE from SDK message if it is outside supported range
		// as SDK doesn't have a way to signal default sbr mode based on profile and
		// requires that the key isn't present in format to signal that
		int sbrMode;
		if (msg->findInt32(KEY_AAC_SBR_MODE, &sbrMode) && (sbrMode < 0 \|\| sbrMode > 2)) {
		msg->removeEntryAt(msg->findEntryByName(KEY_AAC_SBR_MODE));
		}

		{ // convert color info
		// move default color to color aspect if not read from the component
		int32_t tmp;

media/libmediatranscoding/TEST_MAPPING

+3 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,9 @@
		},
		{
		"name": "VideoTrackTranscoderTests"
		},
		{
		"name": "CtsMediaTranscodingTestCases"
		}
		]
		}