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

Commit 5520b946 authored by Keiichi Watanabe's avatar Keiichi Watanabe Committed by Mauro Carvalho Chehab
Browse files

media: v4l2-ctrl: Change control for VP8 profile to menu control 



Add a menu control V4L2_CID_MPEG_VIDEO_VP8_PROFILE for VP8 profile and make
V4L2_CID_MPEG_VIDEO_VPX_PROFILE an alias of it. This new control is used to
select the desired profile for VP8 encoder and query for supported profiles by
VP8 encoder/decoder.

Though we have originally a control V4L2_CID_MPEG_VIDEO_VPX_PROFILE and its name
contains 'VPX', it works only for VP8 because supported profiles usually differ
between VP8 and VP9. In addition, this control cannot be used for querying since
it is not a menu control but an integer control, which cannot return an
arbitrary set of supported profiles.

The new control V4L2_CID_MPEG_VIDEO_VP8_PROFILE is a menu control as with
controls for other codec profiles. (e.g. H264)

In addition, this patch also fixes the use of V4L2_CID_MPEG_VIDEO_VPX_PROFILE in
drivers of Qualcomm's venus and Samsung's s5p-mfc.

Signed-off-by: default avatarKeiichi Watanabe <keiichiw@chromium.org>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 779680e2

Documentation/media/uapi/v4l/extended-controls.rst

+22 −3
Original line number Diff line number Diff line
@@ -1955,9 +1955,28 @@ enum v4l2_vp8_golden_frame_sel - 
``V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP (integer)``

    Quantization parameter for a P frame for VP8.



``V4L2_CID_MPEG_VIDEO_VPX_PROFILE (integer)``

    Select the desired profile for VPx encoder. Acceptable values are 0,

    1, 2 and 3 corresponding to encoder profiles 0, 1, 2 and 3.

.. _v4l2-mpeg-video-vp8-profile:



``V4L2_CID_MPEG_VIDEO_VP8_PROFILE``

    (enum)



enum v4l2_mpeg_video_vp8_profile -

    This control allows selecting the profile for VP8 encoder.

    This is also used to enumerate supported profiles by VP8 encoder or decoder.

    Possible values are:



.. flat-table::

    :header-rows:  0

    :stub-columns: 0



    * - ``V4L2_MPEG_VIDEO_VP8_PROFILE_0``

      - Profile 0

    * - ``V4L2_MPEG_VIDEO_VP8_PROFILE_1``

      - Profile 1

    * - ``V4L2_MPEG_VIDEO_VP8_PROFILE_2``

      - Profile 2

    * - ``V4L2_MPEG_VIDEO_VP8_PROFILE_3``

      - Profile 3





High Efficiency Video Coding (HEVC/H.265) Control Reference

drivers/media/platform/qcom/venus/vdec_ctrls.c

+6 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static int vdec_op_s_ctrl(struct v4l2_ctrl *ctrl) 
		break;

	case V4L2_CID_MPEG_VIDEO_H264_PROFILE:

	case V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE:

	case V4L2_CID_MPEG_VIDEO_VPX_PROFILE:

	case V4L2_CID_MPEG_VIDEO_VP8_PROFILE:

		ctr->profile = ctrl->val;

		break;

	case V4L2_CID_MPEG_VIDEO_H264_LEVEL:
@@ -54,7 +54,7 @@ static int vdec_op_g_volatile_ctrl(struct v4l2_ctrl *ctrl) 
	switch (ctrl->id) {

	case V4L2_CID_MPEG_VIDEO_H264_PROFILE:

	case V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE:

	case V4L2_CID_MPEG_VIDEO_VPX_PROFILE:

	case V4L2_CID_MPEG_VIDEO_VP8_PROFILE:

		ret = hfi_session_get_property(inst, ptype, &hprop);

		if (!ret)

			ctr->profile = hprop.profile_level.profile;
@@ -130,8 +130,10 @@ int vdec_ctrl_init(struct venus_inst *inst) 
	if (ctrl)

		ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;



	ctrl = v4l2_ctrl_new_std(&inst->ctrl_handler, &vdec_ctrl_ops,

				 V4L2_CID_MPEG_VIDEO_VPX_PROFILE, 0, 3, 1, 0);

	ctrl = v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &vdec_ctrl_ops,

				      V4L2_CID_MPEG_VIDEO_VP8_PROFILE,

				      V4L2_MPEG_VIDEO_VP8_PROFILE_3,

				      0, V4L2_MPEG_VIDEO_VP8_PROFILE_0);

	if (ctrl)

		ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;

drivers/media/platform/qcom/venus/venc.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static int venc_v4l2_to_hfi(int id, int value) 
		case V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC:

			return HFI_H264_ENTROPY_CABAC;

		}

	case V4L2_CID_MPEG_VIDEO_VPX_PROFILE:

	case V4L2_CID_MPEG_VIDEO_VP8_PROFILE:

		switch (value) {

		case 0:

		default:
@@ -754,7 +754,7 @@ static int venc_set_properties(struct venus_inst *inst) 
		level = venc_v4l2_to_hfi(V4L2_CID_MPEG_VIDEO_H264_LEVEL,

					 ctr->level.h264);

	} else if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_VP8) {

		profile = venc_v4l2_to_hfi(V4L2_CID_MPEG_VIDEO_VPX_PROFILE,

		profile = venc_v4l2_to_hfi(V4L2_CID_MPEG_VIDEO_VP8_PROFILE,

					   ctr->profile.vpx);

		level = 0;

	} else if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_MPEG4) {

drivers/media/platform/qcom/venus/venc_ctrls.c

+6 −4
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) 
	case V4L2_CID_MPEG_VIDEO_H264_PROFILE:

		ctr->profile.h264 = ctrl->val;

		break;

	case V4L2_CID_MPEG_VIDEO_VPX_PROFILE:

	case V4L2_CID_MPEG_VIDEO_VP8_PROFILE:

		ctr->profile.vpx = ctrl->val;

		break;

	case V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL:
@@ -248,6 +248,11 @@ int venc_ctrl_init(struct venus_inst *inst) 
		V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES,

		0, V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE);



	v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,

		V4L2_CID_MPEG_VIDEO_VP8_PROFILE,

		V4L2_MPEG_VIDEO_VP8_PROFILE_3,

		0, V4L2_MPEG_VIDEO_VP8_PROFILE_0);



	v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,

		V4L2_CID_MPEG_VIDEO_BITRATE, BITRATE_MIN, BITRATE_MAX,

		BITRATE_STEP, BITRATE_DEFAULT);
@@ -256,9 +261,6 @@ int venc_ctrl_init(struct venus_inst *inst) 
		V4L2_CID_MPEG_VIDEO_BITRATE_PEAK, BITRATE_MIN, BITRATE_MAX,

		BITRATE_STEP, BITRATE_DEFAULT_PEAK);



	v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,

		V4L2_CID_MPEG_VIDEO_VPX_PROFILE, 0, 3, 1, 0);



	v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,

		V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP, 1, 51, 1, 26);

drivers/media/platform/s5p-mfc/s5p_mfc_enc.c

+7 −8
Original line number Diff line number Diff line
@@ -692,12 +692,12 @@ static struct mfc_control controls[] = { 
		.default_value = 10,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_VPX_PROFILE,

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = 3,

		.step = 1,

		.default_value = 0,

		.id = V4L2_CID_MPEG_VIDEO_VP8_PROFILE,

		.type = V4L2_CTRL_TYPE_MENU,

		.minimum = V4L2_MPEG_VIDEO_VP8_PROFILE_0,

		.maximum = V4L2_MPEG_VIDEO_VP8_PROFILE_3,

		.default_value = V4L2_MPEG_VIDEO_VP8_PROFILE_0,

		.menu_skip_mask = 0,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP,
@@ -2057,7 +2057,7 @@ static int s5p_mfc_enc_s_ctrl(struct v4l2_ctrl *ctrl) 
	case V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP:

		p->codec.vp8.rc_p_frame_qp = ctrl->val;

		break;

	case V4L2_CID_MPEG_VIDEO_VPX_PROFILE:

	case V4L2_CID_MPEG_VIDEO_VP8_PROFILE:

		p->codec.vp8.profile = ctrl->val;

		break;

	case V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP:
@@ -2711,4 +2711,3 @@ void s5p_mfc_enc_init(struct s5p_mfc_ctx *ctx) 
	f.fmt.pix_mp.pixelformat = DEF_DST_FMT_ENC;

	ctx->dst_fmt = find_format(&f, MFC_FMT_ENC);

}