Snap for 9325773 from ed7469bbdff6de3281ad9dd33e3af069e06ac809 to tm-qpr2-release (91f4f2d5) · Commits · e / os / android_frameworks_av

media/libstagefright/rtsp/AAVCAssembler.cpp

+6 −2

Original line number	Diff line number	Diff line
		@@ -332,6 +332,11 @@ void AAVCAssembler::checkIFrameProvided(const sp<ABuffer> &buffer) {
		}

		bool AAVCAssembler::dropFramesUntilIframe(const sp<ABuffer> &buffer) {
		if (buffer->size() == 0) {
		ALOGE("b/230630526 buffer->size() == 0");
		android_errorWriteLog(0x534e4554, "230630526");
		return false;
		}
		const uint8_t *data = buffer->data();
		unsigned nalType = data[0] & 0x1f;
		if (!mFirstIFrameProvided && nalType < 0x5) {
		@@ -624,8 +629,7 @@ int32_t AAVCAssembler::pickStartSeq(const Queue *queue,
		int32_t firstSeqNo = buffer->int32Data();

		// This only works for FU-A type & non-start sequence
		int32_t nalType = buffer->size() >= 1 ? buffer->data()[0] & 0x1f : -1;
		if (nalType != 28 \|\| (buffer->size() >= 2 && buffer->data()[1] & 0x80)) {
		if (buffer->size() < 2 \|\| (buffer->data()[0] & 0x1f) != 28 \|\| buffer->data()[1] & 0x80) {
		return firstSeqNo;
		}

media/libstagefright/rtsp/AHEVCAssembler.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -629,13 +629,13 @@ void AHEVCAssembler::submitAccessUnit() {

		int32_t AHEVCAssembler::pickStartSeq(const Queue *queue,
		uint32_t first, int64_t play, int64_t jit) {
		CHECK(!queue->empty());
		// pick the first sequence number has the start bit.
		sp<ABuffer> buffer = *(queue->begin());
		int32_t firstSeqNo = buffer->int32Data();

		// This only works for FU-A type & non-start sequence
		unsigned nalType = buffer->data()[0] & 0x1f;
		if (nalType != 28 \|\| buffer->data()[2] & 0x80) {
		if (buffer->size() < 3 \|\| (buffer->data()[0] & 0x1f) != 28 \|\| buffer->data()[2] & 0x80) {
		return firstSeqNo;
		}

		@@ -645,7 +645,7 @@ int32_t AHEVCAssembler::pickStartSeq(const Queue *queue,
		if (rtpTime + jit >= play) {
		break;
		}
		if ((data[2] & 0x80)) {
		if (it->size() >= 3 && (data[2] & 0x80)) {
		const int32_t seqNo = it->int32Data();
		ALOGE("finding [HEAD] pkt. \t Seq# (%d ~ )[%d", firstSeqNo, seqNo);
		firstSeqNo = seqNo;

services/camera/libcameraservice/hidl/VndkVersionMetadataTags.h

+23 −22

Original line number	Diff line number	Diff line
		@@ -31,47 +31,48 @@
		std::map<int, std::vector<camera_metadata_tag>> static_api_level_to_keys{
		{30, {
		ANDROID_CONTROL_AVAILABLE_EXTENDED_SCENE_MODE_MAX_SIZES,
		ANDROID_CONTROL_AVAILABLE_EXTENDED_SCENE_MODE_ZOOM_RATIO_RANGES,
		ANDROID_CONTROL_ZOOM_RATIO_RANGE,
		ANDROID_SCALER_AVAILABLE_ROTATE_AND_CROP_MODES,
		ANDROID_CONTROL_AVAILABLE_EXTENDED_SCENE_MODE_ZOOM_RATIO_RANGES,
		} },
		{31, {
		ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION,
		ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE_MAXIMUM_RESOLUTION,
		ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP_MAXIMUM_RESOLUTION,
		ANDROID_SCALER_AVAILABLE_STALL_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_HEIC_AVAILABLE_HEIC_STALL_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STALL_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_LENS_INTRINSIC_CALIBRATION_MAXIMUM_RESOLUTION,
		ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_HEIC_AVAILABLE_HEIC_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_SCALER_PHYSICAL_CAMERA_MULTI_RESOLUTION_STREAM_CONFIGURATIONS,
		ANDROID_DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_SCALER_MULTI_RESOLUTION_STREAM_SUPPORTED,
		ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION,
		ANDROID_DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STALL_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_DEPTH_AVAILABLE_DYNAMIC_DEPTH_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_HEIC_AVAILABLE_HEIC_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_HEIC_AVAILABLE_HEIC_STALL_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_HEIC_AVAILABLE_HEIC_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_LENS_DISTORTION_MAXIMUM_RESOLUTION,
		ANDROID_LENS_INTRINSIC_CALIBRATION_MAXIMUM_RESOLUTION,
		ANDROID_SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP_MAXIMUM_RESOLUTION,
		ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_SCALER_AVAILABLE_STALL_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_SCALER_DEFAULT_SECURE_IMAGE_SIZE,
		ANDROID_HEIC_AVAILABLE_HEIC_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION,
		ANDROID_SENSOR_OPAQUE_RAW_SIZE_MAXIMUM_RESOLUTION,
		ANDROID_SCALER_MULTI_RESOLUTION_STREAM_SUPPORTED,
		ANDROID_SCALER_PHYSICAL_CAMERA_MULTI_RESOLUTION_STREAM_CONFIGURATIONS,
		ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION,
		ANDROID_SENSOR_INFO_BINNING_FACTOR,
		ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE_MAXIMUM_RESOLUTION,
		ANDROID_SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE_MAXIMUM_RESOLUTION,
		ANDROID_SENSOR_OPAQUE_RAW_SIZE_MAXIMUM_RESOLUTION,
		} },
		{32, {
		ANDROID_INFO_DEVICE_STATE_ORIENTATIONS,
		} },
		{33, {
		ANDROID_FLASH_INFO_STRENGTH_DEFAULT_LEVEL,
		ANDROID_AUTOMOTIVE_LENS_FACING,
		ANDROID_AUTOMOTIVE_LOCATION,
		ANDROID_FLASH_INFO_STRENGTH_DEFAULT_LEVEL,
		ANDROID_FLASH_INFO_STRENGTH_MAXIMUM_LEVEL,
		ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP,
		ANDROID_REQUEST_RECOMMENDED_TEN_BIT_DYNAMIC_RANGE_PROFILE,
		ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES,
		ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP,
		ANDROID_FLASH_INFO_STRENGTH_MAXIMUM_LEVEL,
		ANDROID_SENSOR_READOUT_TIMESTAMP,
		} },
		};

		@@ -81,9 +82,9 @@ std::map<int, std::vector<camera_metadata_tag>> static_api_level_to_keys{
		*/
		std::map<int, std::vector<camera_metadata_tag>> dynamic_api_level_to_keys{
		{30, {
		ANDROID_CONTROL_EXTENDED_SCENE_MODE,
		ANDROID_CONTROL_ZOOM_RATIO,
		ANDROID_SCALER_ROTATE_AND_CROP,
		ANDROID_CONTROL_EXTENDED_SCENE_MODE,
		} },
		{31, {
		ANDROID_SENSOR_PIXEL_MODE,