Snap for 12632686 from 91f4d3034919bef427bab34c001973a83c8716d5 to 25Q1-release (b35922c3) · Commits · e / os / android_frameworks_av

camera/camera_platform.aconfig

+8 −0

Original line number	Diff line number	Diff line
		@@ -218,3 +218,11 @@ flag {
		description: "Indicates when to activate Night Mode Camera Extension"
		bug: "335902696"
		}

		flag {
		namespace: "camera_platform"
		name: "zoom_method"
		is_exported: true
		description: "Gives apps explicit control on reflects zoom via ZOOM_RATIO capture result"
		bug: "298899993"
		}

camera/ndk/impl/ACameraMetadata.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -562,6 +562,7 @@ ACameraMetadata::isCaptureRequestTag(const uint32_t tag) {
		case ACAMERA_CONTROL_ZOOM_RATIO:
		case ACAMERA_CONTROL_SETTINGS_OVERRIDE:
		case ACAMERA_CONTROL_AUTOFRAMING:
		case ACAMERA_CONTROL_ZOOM_METHOD:
		case ACAMERA_EDGE_MODE:
		case ACAMERA_FLASH_MODE:
		case ACAMERA_FLASH_STRENGTH_LEVEL:

camera/ndk/include/camera/NdkCameraMetadataTags.h

+34 −0

Original line number	Diff line number	Diff line
		@@ -2401,6 +2401,40 @@ typedef enum acamera_metadata_tag {
		*/
		ACAMERA_CONTROL_LOW_LIGHT_BOOST_STATE = // byte (acamera_metadata_enum_android_control_low_light_boost_state_t)
		ACAMERA_CONTROL_START + 59,
		/**
		* <p>Whether the application uses ACAMERA_SCALER_CROP_REGION or ACAMERA_CONTROL_ZOOM_RATIO
		* to control zoom levels.</p>
		*
		* @see ACAMERA_CONTROL_ZOOM_RATIO
		* @see ACAMERA_SCALER_CROP_REGION
		*
		* <p>Type: byte (acamera_metadata_enum_android_control_zoom_method_t)</p>
		*
		* <p>This tag may appear in:
		* <ul>
		* <li>ACameraMetadata from ACameraCaptureSession_captureCallback_result callbacks</li>
		* <li>ACaptureRequest</li>
		* </ul></p>
		*
		* <p>If set to AUTO, the camera device detects which capture request key the application uses
		* to do zoom, ACAMERA_SCALER_CROP_REGION or ACAMERA_CONTROL_ZOOM_RATIO. If
		* the application doesn't set android.scaler.zoomRatio or sets it to 1.0 in the capture
		* request, the effective zoom level is reflected in ACAMERA_SCALER_CROP_REGION in capture
		* results. If ACAMERA_CONTROL_ZOOM_RATIO is set to values other than 1.0, the effective
		* zoom level is reflected in ACAMERA_CONTROL_ZOOM_RATIO. AUTO is the default value
		* for this control, and also the behavior of the OS before Android version
		* <a href="https://developer.android.com/reference/android/os/Build.VERSION_CODES.html#BAKLAVA">BAKLAVA</a>.</p>
		* <p>If set to ZOOM_RATIO, the application explicitly specifies zoom level be controlled
		* by ACAMERA_CONTROL_ZOOM_RATIO, and the effective zoom level is reflected in
		* ACAMERA_CONTROL_ZOOM_RATIO in capture results. This addresses an ambiguity with AUTO,
		* with which the camera device cannot know if the application is using cropRegion or
		* zoomRatio at 1.0x.</p>
		*
		* @see ACAMERA_CONTROL_ZOOM_RATIO
		* @see ACAMERA_SCALER_CROP_REGION
		*/
		ACAMERA_CONTROL_ZOOM_METHOD = // byte (acamera_metadata_enum_android_control_zoom_method_t)
		ACAMERA_CONTROL_START + 60,
		ACAMERA_CONTROL_END,

		/**

media/codec2/components/apv/C2SoftApvDec.cpp

+5 −2

Original line number	Diff line number	Diff line
		@@ -493,10 +493,13 @@ C2SoftApvDec::C2SoftApvDec(const char* name, c2_node_id_t id,
		mOutBufferFlush(nullptr),
		mIvColorformat(IV_YUV_420P),
		mOutputDelay(kDefaultOutputDelay),
		mHeaderDecoded(false),
		mOutIndex(0u),
		mHalPixelFormat(HAL_PIXEL_FORMAT_YV12),
		mWidth(320),
		mHeight(240),
		mHeaderDecoded(false),
		mOutIndex(0u) {
		mSignalledOutputEos(false),
		mSignalledError(false) {
		oapvdHandle = NULL;
		oapvmHandle = NULL;
		outputCsp = OUTPUT_CSP_NATIVE;

media/codec2/components/apv/C2SoftApvDec.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ typedef struct {

		namespace android {

		struct C2SoftApvDec : public SimpleC2Component {
		struct C2SoftApvDec final : public SimpleC2Component {
		class IntfImpl;

		C2SoftApvDec(const char* name, c2_node_id_t id, const std::shared_ptr<IntfImpl>& intfImpl);