Commit 99d0cbe4 authored by Dikshita Agarwal's avatar Dikshita Agarwal Committed by Mauro Carvalho Chehab
Browse files

media: v4l2-ctrl: Add frame-specific min/max qp controls for hevc 



- Adds min/max qp controls for B frame for h264.
- Adds min/max qp controls for I/P/B frames for hevc similar to h264.
- Update valid range of min/max qp for hevc to accommodate 10 bit.

Signed-off-by: default avatarDikshita Agarwal <dikshita@codeaurora.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent ae56e038

Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst

+50 −2
Original line number Diff line number Diff line
@@ -1182,6 +1182,18 @@ enum v4l2_mpeg_video_h264_entropy_mode - 
    V4L2_CID_MPEG_VIDEO_H264_MAX_QP is also set, the quantization parameter

    should be chosen to meet both requirements.



``V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP (integer)``

    Minimum quantization parameter for the H264 B frame to limit B frame

    quality to a range. Valid range: from 0 to 51. If

    V4L2_CID_MPEG_VIDEO_H264_MIN_QP is also set, the quantization parameter

    should be chosen to meet both requirements.



``V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP (integer)``

    Maximum quantization parameter for the H264 B frame to limit B frame

    quality to a range. Valid range: from 0 to 51. If

    V4L2_CID_MPEG_VIDEO_H264_MAX_QP is also set, the quantization parameter

    should be chosen to meet both requirements.



``V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP (integer)``

    Quantization parameter for an I frame for MPEG4. Valid range: from 1

    to 31.
@@ -2628,11 +2640,11 @@ HEVC/H.265 Control IDs 


``V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP (integer)``

    Minimum quantization parameter for HEVC.

    Valid range: from 0 to 51.

    Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit.



``V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP (integer)``

    Maximum quantization parameter for HEVC.

    Valid range: from 0 to 51.

    Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit.



``V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP (integer)``

    Quantization parameter for an I frame for HEVC.
@@ -2649,6 +2661,42 @@ HEVC/H.265 Control IDs 
    Valid range: [V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP,

    V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP].



``V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MIN_QP (integer)``

    Minimum quantization parameter for the HEVC I frame to limit I frame

    quality to a range. Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit.

    If V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP is also set, the quantization parameter

    should be chosen to meet both requirements.



``V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MAX_QP (integer)``

    Maximum quantization parameter for the HEVC I frame to limit I frame

    quality to a range. Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit.

    If V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP is also set, the quantization parameter

    should be chosen to meet both requirements.



``V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MIN_QP (integer)``

    Minimum quantization parameter for the HEVC P frame to limit P frame

    quality to a range. Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit.

    If V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP is also set, the quantization parameter

    should be chosen to meet both requirements.



``V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MAX_QP (integer)``

    Maximum quantization parameter for the HEVC P frame to limit P frame

    quality to a range. Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit.

    If V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP is also set, the quantization parameter

    should be chosen to meet both requirements.



``V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MIN_QP (integer)``

    Minimum quantization parameter for the HEVC B frame to limit B frame

    quality to a range. Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit.

    If V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP is also set, the quantization parameter

    should be chosen to meet both requirements.



``V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MAX_QP (integer)``

    Maximum quantization parameter for the HEVC B frame to limit B frame

    quality to a range. Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit.

    If V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP is also set, the quantization parameter

    should be chosen to meet both requirements.



``V4L2_CID_MPEG_VIDEO_HEVC_HIER_QP (boolean)``

    HIERARCHICAL_QP allows the host to specify the quantization parameter

    values for each temporal layer through HIERARCHICAL_QP_LAYER. This is

drivers/media/v4l2-core/v4l2-ctrls.c

+8 −0
Original line number Diff line number Diff line
@@ -920,6 +920,8 @@ const char *v4l2_ctrl_get_name(u32 id) 
	case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP:		return "H264 I-Frame Maximum QP Value";

	case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP:		return "H264 P-Frame Minimum QP Value";

	case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP:		return "H264 P-Frame Maximum QP Value";

	case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP:		return "H264 B-Frame Minimum QP Value";

	case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP:		return "H264 B-Frame Maximum QP Value";

	case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL:			return "MPEG2 Level";

	case V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE:			return "MPEG2 Profile";

	case V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP:		return "MPEG4 I-Frame QP Value";
@@ -969,6 +971,12 @@ const char *v4l2_ctrl_get_name(u32 id) 
	case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP:		return "HEVC B-Frame QP Value";

	case V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP:			return "HEVC Minimum QP Value";

	case V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP:			return "HEVC Maximum QP Value";

	case V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MIN_QP:		return "HEVC I-Frame Minimum QP Value";

	case V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MAX_QP:		return "HEVC I-Frame Maximum QP Value";

	case V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MIN_QP:		return "HEVC P-Frame Minimum QP Value";

	case V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MAX_QP:		return "HEVC P-Frame Maximum QP Value";

	case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MIN_QP:		return "HEVC B-Frame Minimum QP Value";

	case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MAX_QP:		return "HEVC B-Frame Maximum QP Value";

	case V4L2_CID_MPEG_VIDEO_HEVC_PROFILE:			return "HEVC Profile";

	case V4L2_CID_MPEG_VIDEO_HEVC_LEVEL:			return "HEVC Level";

	case V4L2_CID_MPEG_VIDEO_HEVC_TIER:			return "HEVC Tier";

include/uapi/linux/v4l2-controls.h

+9 −0
Original line number Diff line number Diff line
@@ -590,6 +590,8 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type { 
#define V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP	(V4L2_CID_CODEC_BASE+386)

#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP	(V4L2_CID_CODEC_BASE+387)

#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP	(V4L2_CID_CODEC_BASE+388)

#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP	(V4L2_CID_CODEC_BASE+389)

#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP	(V4L2_CID_CODEC_BASE+390)

#define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP	(V4L2_CID_CODEC_BASE+400)

#define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP	(V4L2_CID_CODEC_BASE+401)

#define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP	(V4L2_CID_CODEC_BASE+402)
@@ -780,6 +782,13 @@ enum v4l2_mpeg_video_frame_skip_mode { 
	V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT	= 2,

};



#define V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MIN_QP        (V4L2_CID_CODEC_BASE + 647)

#define V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MAX_QP        (V4L2_CID_CODEC_BASE + 648)

#define V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MIN_QP        (V4L2_CID_CODEC_BASE + 649)

#define V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MAX_QP        (V4L2_CID_CODEC_BASE + 650)

#define V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MIN_QP        (V4L2_CID_CODEC_BASE + 651)

#define V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MAX_QP        (V4L2_CID_CODEC_BASE + 652)



/*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */

#define V4L2_CID_CODEC_CX2341X_BASE				(V4L2_CTRL_CLASS_CODEC | 0x1000)

#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE		(V4L2_CID_CODEC_CX2341X_BASE+0)