mbox series

[v3,0/3] Add new controls for QP and layer bitrate

Message ID 1605682497-29273-1-git-send-email-dikshita@codeaurora.org
Headers show
Series Add new controls for QP and layer bitrate | expand

Message

Dikshita Agarwal Nov. 18, 2020, 6:54 a.m. UTC 
This series adds frame specific min/max qp controls for hevc and layer
wise bitrate control for h264.

Chnages since v2:
 - addressed comments.
 - added driver side implementation for new controls.

Dikshita Agarwal (3):
  media: v4l2-ctrl: Add frame-specific min/max qp controls for hevc
  media: v4l2-ctrl: Add layer wise bitrate controls for h264
  venus: venc: Add support for frame-specific min/max qp controls

 .../userspace-api/media/v4l/ext-ctrls-codec.rst    | 72 +++++++++++++++++++++-
 drivers/media/platform/qcom/venus/core.h           | 18 ++++++
 drivers/media/platform/qcom/venus/venc.c           | 21 +++++--
 drivers/media/platform/qcom/venus/venc_ctrls.c     | 51 +++++++++++++++
 drivers/media/v4l2-core/v4l2-ctrls.c               | 15 +++++
 include/uapi/linux/v4l2-controls.h                 | 17 +++++
 6 files changed, 187 insertions(+), 7 deletions(-)

Comments

Hans Verkuil Dec. 2, 2020, 1:51 p.m. UTC | #1 
Hi Dikshita,

Just a few nitpicks, I'd have changed it myself, but since a new version is
needed anyway you might as well change it for next time :-)

On 18/11/2020 07:54, Dikshita Agarwal wrote:
> - 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  mim/max qp for hevc to accommodate 10 bit.


double space after 'of'. Typo: mim -> min

> 

> Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org>

> ---

>  .../userspace-api/media/v4l/ext-ctrls-codec.rst    | 52 +++++++++++++++++++++-

>  drivers/media/v4l2-core/v4l2-ctrls.c               |  8 ++++

>  include/uapi/linux/v4l2-controls.h                 |  9 ++++

>  3 files changed, 67 insertions(+), 2 deletions(-)

> 

> diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst

> index aac1ea3..a9c7011 100644

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

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

> @@ -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.

> @@ -3441,11 +3453,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 - 51 for 8 bit and  0 - 63 for 10 bit.


Write in full:

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

Ditto elsewhere.

>  

>  ``V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP (integer)``

>      Maximum quantization parameter for HEVC.

> -    Valid range: from 0 to 51.

> +    Valid range: from 0 - 51 for 8 bit and 0 - 63 for 10 bit.

>  

>  ``V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP (integer)``

>      Quantization parameter for an I frame for HEVC.

> @@ -3462,6 +3474,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, 0 - 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, 0 - 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, 0 - 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, 0 - 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, 0 - 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, 0 - 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

> diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c

> index e8ee29e..6e74500 100644

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

> +++ b/drivers/media/v4l2-core/v4l2-ctrls.c

> @@ -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_H264_SPS:			return "H264 Sequence Parameter Set";

>  	case V4L2_CID_MPEG_VIDEO_H264_PPS:			return "H264 Picture Parameter Set";

>  	case V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX:		return "H264 Scaling Matrix";

> @@ -982,6 +984,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";

> diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h

> index 14ce833..fea0f18 100644

> --- a/include/uapi/linux/v4l2-controls.h

> +++ b/include/uapi/linux/v4l2-controls.h

> @@ -588,6 +588,8 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type {

>  #define V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP	(V4L2_CID_MPEG_BASE+386)

>  #define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP	(V4L2_CID_MPEG_BASE+387)

>  #define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP	(V4L2_CID_MPEG_BASE+388)

> +#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP	(V4L2_CID_MPEG_BASE+389)

> +#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP	(V4L2_CID_MPEG_BASE+390)

>  #define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP	(V4L2_CID_MPEG_BASE+400)

>  #define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP	(V4L2_CID_MPEG_BASE+401)

>  #define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP	(V4L2_CID_MPEG_BASE+402)

> @@ -772,6 +774,13 @@ enum v4l2_cid_mpeg_video_hevc_size_of_length_field {

>  #define V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR	(V4L2_CID_MPEG_BASE + 644)

>  #define V4L2_CID_MPEG_VIDEO_CONSTANT_QUALITY		(V4L2_CID_MPEG_BASE + 645)

>  #define V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE		(V4L2_CID_MPEG_BASE + 646)

> +#define V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MIN_QP	(V4L2_CID_MPEG_BASE+647)

> +#define V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MAX_QP	(V4L2_CID_MPEG_BASE+648)

> +#define V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MIN_QP	(V4L2_CID_MPEG_BASE+649)

> +#define V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MAX_QP	(V4L2_CID_MPEG_BASE+650)

> +#define V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MIN_QP	(V4L2_CID_MPEG_BASE+651)

> +#define V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MAX_QP	(V4L2_CID_MPEG_BASE+652)

> +

>  enum v4l2_mpeg_video_frame_skip_mode {

>  	V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED	= 0,

>  	V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_LEVEL_LIMIT	= 1,

> 


Regards,

	Hans