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

Commit 52c241a5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc_3x: add support to enable frame average QP"

parents 072b7602 0cc8d50d

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

+4 −1
Original line number Diff line number Diff line
@@ -658,9 +658,12 @@ static int get_hfi_extradata_index(enum hal_extradata_id index) 
	case HAL_EXTRADATA_STREAM_USERDATA:

		ret = HFI_PROPERTY_PARAM_VDEC_STREAM_USERDATA_EXTRADATA;

		break;

	case HAL_EXTRADATA_FRAME_QP:

	case HAL_EXTRADATA_DEC_FRAME_QP:

		ret = HFI_PROPERTY_PARAM_VDEC_FRAME_QP_EXTRADATA;

		break;

	case HAL_EXTRADATA_ENC_FRAME_QP:

		ret = HFI_PROPERTY_PARAM_VENC_FRAME_QP_EXTRADATA;

		break;

	case HAL_EXTRADATA_FRAME_BITS_INFO:

		ret = HFI_PROPERTY_PARAM_VDEC_FRAME_BITS_INFO_EXTRADATA;

		break;

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

+4 −2
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.name = "Extradata Type",

		.type = V4L2_CTRL_TYPE_MENU,

		.minimum = V4L2_MPEG_VIDC_EXTRADATA_NONE,

		.maximum = V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO,

		.maximum = V4L2_MPEG_VIDC_EXTRADATA_ENC_FRAME_QP,

		.default_value = V4L2_MPEG_VIDC_EXTRADATA_NONE,

		.menu_skip_mask = ~(

			(1 << V4L2_MPEG_VIDC_EXTRADATA_NONE) |
@@ -846,7 +846,8 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_EXTRADATA_METADATA_MBI) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_YUV_STATS)|

			(1 << V4L2_MPEG_VIDC_EXTRADATA_ROI_QP) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO)

			(1 << V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO) |

			(1ULL << V4L2_MPEG_VIDC_EXTRADATA_ENC_FRAME_QP)

			),

		.qmenu = mpeg_video_vidc_extradata,

	},
@@ -1564,6 +1565,7 @@ static void msm_venc_update_plane_count(struct msm_vidc_inst *inst, int type) 
		case V4L2_MPEG_VIDC_EXTRADATA_NUM_CONCEALED_MB:

		case V4L2_MPEG_VIDC_EXTRADATA_METADATA_FILLER:

		case V4L2_MPEG_VIDC_EXTRADATA_LTR:

		case V4L2_MPEG_VIDC_EXTRADATA_ENC_FRAME_QP:

		case V4L2_MPEG_VIDC_EXTRADATA_METADATA_MBI:

			inst->fmts[CAPTURE_PORT].num_planes = 2;

		default:

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

+7 −2
Original line number Diff line number Diff line
@@ -77,9 +77,11 @@ const char *const mpeg_video_vidc_extradata[] = { 
	"Extradata output crop",

	"Extradata display colour SEI",

	"Extradata light level SEI",

	"Extradata PQ Info",

	"Extradata display VUI",

	"Extradata vpx color space",

	"Extradata PQ Info",

	"Extradata UBWC CR stats info",

	"Extradata enc frame QP"

};



struct getprop_buf {
@@ -4727,7 +4729,10 @@ enum hal_extradata_id msm_comm_get_hal_extradata_index( 
		ret = HAL_EXTRADATA_STREAM_USERDATA;

		break;

	case V4L2_MPEG_VIDC_EXTRADATA_FRAME_QP:

		ret = HAL_EXTRADATA_FRAME_QP;

		ret = HAL_EXTRADATA_DEC_FRAME_QP;

		break;

	case V4L2_MPEG_VIDC_EXTRADATA_ENC_FRAME_QP:

		ret = HAL_EXTRADATA_ENC_FRAME_QP;

		break;

	case V4L2_MPEG_VIDC_EXTRADATA_FRAME_BITS_INFO:

		ret = HAL_EXTRADATA_FRAME_BITS_INFO;

drivers/media/platform/msm/vidc_3x/msm_vidc_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ struct msm_vidc_ctrl { 
	s32 maximum;

	s32 default_value;

	u32 step;

	u32 menu_skip_mask;

	u64 menu_skip_mask;

	u32 flags;

	const char * const *qmenu;

};

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

+2 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ enum hal_extradata_id { 
	HAL_EXTRADATA_ASPECT_RATIO,

	HAL_EXTRADATA_MPEG2_SEQDISP,

	HAL_EXTRADATA_STREAM_USERDATA,

	HAL_EXTRADATA_FRAME_QP,

	HAL_EXTRADATA_DEC_FRAME_QP,

	HAL_EXTRADATA_ENC_FRAME_QP,

	HAL_EXTRADATA_FRAME_BITS_INFO,

	HAL_EXTRADATA_INPUT_CROP,

	HAL_EXTRADATA_DIGITAL_ZOOM,