Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b986ee8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Enable input crop extradata"

parents 4ff6956a 2c916d36

drivers/media/platform/msm/vidc/hfi_packetization.c

+4 −0
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ static int get_hfi_extradata_index(enum hal_extradata_id index) 
		break;

	case HAL_EXTRADATA_ASPECT_RATIO:

	case HAL_EXTRADATA_OUTPUT_CROP:

	case HAL_EXTRADATA_INPUT_CROP:

		ret = HFI_PROPERTY_PARAM_INDEX_EXTRADATA;

		break;

	case HAL_EXTRADATA_MPEG2_SEQDISP:
@@ -604,6 +605,9 @@ static int get_hfi_extradata_id(enum hal_extradata_id index) 
	case HAL_EXTRADATA_OUTPUT_CROP:

		ret = MSM_VIDC_EXTRADATA_OUTPUT_CROP;

		break;

	case HAL_EXTRADATA_INPUT_CROP:

		ret = MSM_VIDC_EXTRADATA_INPUT_CROP;

		break;

	default:

		ret = get_hfi_extradata_index(index);

		break;

drivers/media/platform/msm/vidc/msm_venc.c

+2 −0
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_EXTRADATA_LTR) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_ROI_QP) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_HDR10PLUS_METADATA) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_INPUT_CROP) |

			(1ULL << V4L2_MPEG_VIDC_EXTRADATA_ENC_FRAME_QP)

			),

		.qmenu = mpeg_video_vidc_extradata,
@@ -1827,6 +1828,7 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		case V4L2_MPEG_VIDC_EXTRADATA_ASPECT_RATIO:

		case V4L2_MPEG_VIDC_EXTRADATA_ROI_QP:

		case V4L2_MPEG_VIDC_EXTRADATA_HDR10PLUS_METADATA:

		case V4L2_MPEG_VIDC_EXTRADATA_INPUT_CROP:

			inst->bufq[OUTPUT_PORT].num_planes = 2;

			break;

		case V4L2_MPEG_VIDC_EXTRADATA_LTR:

drivers/media/platform/msm/vidc/msm_vidc_common.c

+3 −0
Original line number Diff line number Diff line
@@ -5457,6 +5457,9 @@ enum hal_extradata_id msm_comm_get_hal_extradata_index( 
	case V4L2_MPEG_VIDC_EXTRADATA_ENC_DTS:

		ret = HAL_EXTRADATA_ENC_DTS_METADATA;

		break;

	case V4L2_MPEG_VIDC_EXTRADATA_INPUT_CROP:

		ret = HAL_EXTRADATA_INPUT_CROP;

		break;

	default:

		dprintk(VIDC_WARN, "Extradata not found: %d\n", index);

		break;

drivers/media/platform/msm/vidc/vidc_hfi_api.h

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ enum hal_extradata_id { 
	HAL_EXTRADATA_UBWC_CR_STATS_INFO,

	HAL_EXTRADATA_HDR10PLUS_METADATA,

	HAL_EXTRADATA_ENC_DTS_METADATA,

	HAL_EXTRADATA_INPUT_CROP,

};



enum hal_property {

include/uapi/linux/v4l2-controls.h

+3 −0
Original line number Diff line number Diff line
@@ -735,6 +735,9 @@ enum v4l2_mpeg_vidc_extradata { 
	V4L2_MPEG_VIDC_EXTRADATA_PANSCAN_WINDOW = 8,

	V4L2_MPEG_VIDC_EXTRADATA_RECOVERY_POINT_SEI = 9,

	V4L2_MPEG_VIDC_EXTRADATA_NUM_CONCEALED_MB = 11,

#define V4L2_MPEG_VIDC_EXTRADATA_INPUT_CROP \

	V4L2_MPEG_VIDC_EXTRADATA_INPUT_CROP

	V4L2_MPEG_VIDC_EXTRADATA_INPUT_CROP = 13,

	V4L2_MPEG_VIDC_EXTRADATA_ASPECT_RATIO = 15,

	V4L2_MPEG_VIDC_EXTRADATA_MPEG2_SEQDISP = 16,

	V4L2_MPEG_VIDC_EXTRADATA_STREAM_USERDATA = 17,