Snap for 5443223 from de83aa7d657e4c0beaddc756d9da9f6d2ccb282d to qt-release (d7fce0f7) · Commits · e / os / android_frameworks_av

apex/testing/test_manifest.json

+1 −1

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "com.android.media.swcodec",
		"version": 2
		"version": 300000000
		}

+3 −13

Original line number	Diff line number	Diff line
		@@ -47,24 +47,14 @@ ACameraMetadata::ACameraMetadata(camera_metadata_t* buffer, ACAMERA_METADATA_TYP
		bool
		ACameraMetadata::isNdkSupportedCapability(int32_t capability) {
		switch (capability) {
		case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE:
		case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR:
		case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING:
		case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_RAW:
		case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS:
		case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE:
		case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT:
		case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA:
		return true;
		case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING:
		case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_PRIVATE_REPROCESSING:
		case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO:
		return false;
		default:
		// Newly defined capabilities will be unsupported by default (blacklist)
		// TODO: Should we do whitelist or blacklist here?
		ALOGE("%s: Unknonwn capability %d", __FUNCTION__, capability);
		return false;
		// Assuming every capability passed to this function is actually a
		// valid capability.
		return true;
		}
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,8 @@ struct ACameraMetadata : public RefBase {

		private:

		// This function does not check whether the capability passed to it is valid.
		// The caller must make sure that it is.
		bool isNdkSupportedCapability(const int32_t capability);
		static inline bool isVendorTag(const uint32_t tag);
		static bool isCaptureRequestTag(const uint32_t tag);

+8 −0

Original line number	Diff line number	Diff line
		@@ -657,6 +657,14 @@ camera_status_t ACaptureSessionOutputContainer_remove(
		* target combinations with sizes outside of these guarantees, but this can only be tested for
		* by attempting to create a session with such targets.</p>
		*
		* <p>Exception on 176x144 (QCIF) resolution:
		* Camera devices usually have a fixed capability for downscaling from larger resolution to
		* smaller, and the QCIF resolution sometimes cannot be fully supported due to this
		* limitation on devices with high-resolution image sensors. Therefore, trying to configure a
		* QCIF resolution stream together with any other stream larger than 1920x1080 resolution
		* (either width or height) might not be supported, and capture session creation will fail if it
		* is not.</p>
		*
		* @param device the camera device of interest.
		* @param outputs the {@link ACaptureSessionOutputContainer} describes all output streams.
		* @param callbacks the {@link ACameraCaptureSession_stateCallbacks capture session state callbacks}.