From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3388EC43381 for ; Fri, 15 Mar 2019 08:40:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ECE6D21872 for ; Fri, 15 Mar 2019 08:40:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="S4NoNGHE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728568AbfCOIk3 (ORCPT ); Fri, 15 Mar 2019 04:40:29 -0400 Received: from mail-qk1-f202.google.com ([209.85.222.202]:44442 "EHLO mail-qk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726468AbfCOIk3 (ORCPT ); Fri, 15 Mar 2019 04:40:29 -0400 Received: by mail-qk1-f202.google.com with SMTP id o135so7091382qke.11 for ; Fri, 15 Mar 2019 01:40:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=pR0KAN04rDrjuE3pJFEcF5PnQMmGJN54eEK3B2smnDE=; b=S4NoNGHE2ixktwrfB/xyV6+IIJV5vX+BEDb52B5dXqKuPIJ3b57dS0+USlMf1qoQb9 1ZhXNpdnvzxvfCFxUpFOfuE9ZixjKbq7xY7SeUcPaxXMf15mBZQxXP1USCAi6SyiZH3Y oNdxna9tLl4R7mLW2uO+cV32hEqCOLdUm8zkt993LTeAh08dtnhO+GP0R4mnN9MkCsXY /+BYi35mBELuRwc7wqLQx+3CmXu4ir0Ybevp8+vL1NRwf65fSyqlq1THFU6Z3RqgF9q4 dx5+mgYtRz/hyvhPl9STdnch18Zt8zIXSmJ3UoKmKh7wxCaQvX6kvFe5Fw9IJ5ewdFQd k+pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=pR0KAN04rDrjuE3pJFEcF5PnQMmGJN54eEK3B2smnDE=; b=EA5qfsFv0aJHAXMeeObbTmMhVIEYIa28U4fCv4ZZoLkV3HBX88skWBuoINGKElb9mm EL23Wc3TxRaHcxiuw3vMXzkA7MmiAPjoH+NUu68HGHzSowaBy20v92+uq0CNb3R7v6ud GbdpDzRvD0H4GW6j/+qoibyTiwcJSXtfffzK8mwH/5OE1jUDjF8fWiaSOVDiQMDwNLkY GrqlDnXhBx0ty0rl55L+c2tiBryOGZ85995Qfigdg7NafnChcsoZkTwX+cAU7kJlI+lM XzpqP0OLFSrOnBlvBTKsQt/yagFooHqHTECgUVoRUX1bAjf6iv8rkgzPcWiLj6puyfJr duyw== X-Gm-Message-State: APjAAAWFIDb610kunMr6e0OrSxWtjdHR0kLkGy5CWIDVbW+AMoXzszSM J6H2utrfUfM+svZUusvF0gOac3nE+fjo X-Google-Smtp-Source: APXvYqzmTWpYkcda5eroDyGmyMTjXGPj3aN4zeVRpgKU0t+wIXcU3pxtggTG6+lmt8m7BjnvxF56Tb+bRrIB X-Received: by 2002:a0c:c387:: with SMTP id o7mr1100852qvi.20.1552639227824; Fri, 15 Mar 2019 01:40:27 -0700 (PDT) Date: Fri, 15 Mar 2019 16:40:21 +0800 In-Reply-To: <20190128072948.45788-1-linfish@google.com> Message-Id: <20190315084021.3572-1-linfish@google.com> Mime-Version: 1.0 References: <20190128072948.45788-1-linfish@google.com> X-Mailer: git-send-email 2.21.0.360.g471c308f928-goog Subject: [PATCH v4] Add following V4L2 QP parameters for H.264: * V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MIN_QP * V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP * V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP * V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP From: Fish Lin To: Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus Cc: Paul Kocialkowski , Tomasz Figa , Keiichi Watanabe , Smitha T Murthy , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Fish Lin Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These controls will limit QP range for intra and inter frame, provide more manual control to improve video encode quality. Signed-off-by: Fish Lin --- Changelog since v3: - Put document in ext-ctrls-codec.rst instead of extended-controls.rst (which was previous version). Changelog since v2: - Add interaction with V4L2_CID_MPEG_VIDEO_H264_MIN/MAX_QP description in the document. Changelog since v1: - Add description in document. .../media/uapi/v4l/ext-ctrls-codec.rst | 24 +++++++++++++++++++ drivers/media/v4l2-core/v4l2-ctrls.c | 4 ++++ include/uapi/linux/v4l2-controls.h | 6 +++++ 3 files changed, 34 insertions(+) diff --git a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst index c97fb7923be5..de60b2e788eb 100644 --- a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst +++ b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst @@ -1048,6 +1048,30 @@ enum v4l2_mpeg_video_h264_entropy_mode - Quantization parameter for an B frame for H264. Valid range: from 0 to 51. +``V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MIN_QP (integer)`` + Minimum quantization parameter for H264 I frame, to limit I frame + quality in 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_I_FRAME_MAX_QP (integer)`` + Maximum quantization parameter for H264 I frame, to limit I frame + quality in 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_H264_P_FRAME_MIN_QP (integer)`` + Minimum quantization parameter for H264 P frame, to limit P frame + quality in 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_P_FRAME_MAX_QP (integer)`` + Maximum quantization parameter for H264 P frame, to limit P frame + quality in 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. diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index b79d3bbd8350..115fb8debe23 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -828,6 +828,10 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_MPEG_VIDEO_H264_CONSTRAINED_INTRA_PREDICTION: return "H264 Constrained Intra Pred"; case V4L2_CID_MPEG_VIDEO_H264_CHROMA_QP_INDEX_OFFSET: return "H264 Chroma QP Index Offset"; + case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MIN_QP: return "H264 I-Frame Minimum QP Value"; + 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_MPEG4_I_FRAME_QP: return "MPEG4 I-Frame QP Value"; case V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP: return "MPEG4 P-Frame QP Value"; case V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP: return "MPEG4 B-Frame QP Value"; diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 06479f2fb3ae..4421baa84177 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -535,6 +535,12 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type { #define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER_QP (V4L2_CID_MPEG_BASE+382) #define V4L2_CID_MPEG_VIDEO_H264_CONSTRAINED_INTRA_PREDICTION (V4L2_CID_MPEG_BASE+383) #define V4L2_CID_MPEG_VIDEO_H264_CHROMA_QP_INDEX_OFFSET (V4L2_CID_MPEG_BASE+384) + +#define V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MIN_QP (V4L2_CID_MPEG_BASE+390) +#define V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+391) +#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP (V4L2_CID_MPEG_BASE+392) +#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+393) + #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) -- 2.21.0.360.g471c308f928-goog