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=unavailable 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 C4FF9C43381 for ; Thu, 21 Mar 2019 02:21:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 890DE2190A for ; Thu, 21 Mar 2019 02:21:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="AmpxmuUt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727586AbfCUCVA (ORCPT ); Wed, 20 Mar 2019 22:21:00 -0400 Received: from mail-io1-f73.google.com ([209.85.166.73]:54138 "EHLO mail-io1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727507AbfCUCU7 (ORCPT ); Wed, 20 Mar 2019 22:20:59 -0400 Received: by mail-io1-f73.google.com with SMTP id w11so3885935iom.20 for ; Wed, 20 Mar 2019 19:20:59 -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=K3pTWsThSeWn3qKVtJV9nUNsFfNlhwc+y5rcZkUTfsk=; b=AmpxmuUt6biVTVCj7sqKxGtMBMtL4bYJN3OYCwPsQKrqVgi6drvXfA6pWuEygEtKcA w2JhS5dzaMcdDicQKcPrphggz/+oIFPKPaTwRE3nUZqQFV8adJcRURCkCfe7jSPf8hav aPVoapPI6u32/Hb9ut1jGMMnTrFBd8a632/WtpSi3bb2P/iwKibo+oFCGiwI17zZPhEb vxdftZtBZLqbfUvJl9Cx0lMgLHxs6zmJFh4g1V15g/11i0uVEXIUPrN/QxEWrtmYBECW GkBv6y1XE8lWfAIlhZYZelYYOVijEKys1kMbct1Kuko6ixjeSmR0sXkjpCm8zm5pFV5j Go7w== 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=K3pTWsThSeWn3qKVtJV9nUNsFfNlhwc+y5rcZkUTfsk=; b=p48Euo8stP20Lc7fF/yAArH6jN9qNxoCaIOVCmO3G22FOewt/4sEPFP6wqBPXIO6jI Hc4C/n4BwZ6bEIlLwiQrzbnKhMjEEIs2183IIKOAmvUCoUPcMHyaE6Tp6MaP9ZAYa4BI iLss6D/JNEAcIj3lQ5rMxwudeBWEFIt7g+0FP2H/WafddiXg4udWt2PvaWfFu1AoRdnh tkGSuM9wpZaTapP8Mp5KZkiwwQQlXEGtZeYsMGw1qfHtCJU5RnsjAwxujPRqvX0G7SBd JCj6HbZsC8aHLqhl09vfULADD+d6Ip5+YDhxNT0pBtYlhh+DATeYHhVUR/EDaz+bakhw ietQ== X-Gm-Message-State: APjAAAXiYH8NUAXl8UBh8XKs9TShg8+8JjQVt9xucDB2jE461Eh/PZCy wMe8vQYYPLCzB8SLLOAnz50+fbbL8qPG X-Google-Smtp-Source: APXvYqxd5HC+CQHubvNDXL8uVTI52mEnqkj7OgndnZiH+bT9sMyvHVvSW2oYPYO8DgL5MjynxIj8xPatwEP0 X-Received: by 2002:a24:2704:: with SMTP id g4mr432290ita.36.1553134858739; Wed, 20 Mar 2019 19:20:58 -0700 (PDT) Date: Thu, 21 Mar 2019 10:20:52 +0800 In-Reply-To: <20190128072948.45788-1-linfish@google.com> Message-Id: <20190321022052.164967-1-linfish@google.com> Mime-Version: 1.0 References: <20190128072948.45788-1-linfish@google.com> X-Mailer: git-send-email 2.21.0.225.g810b269d1ac-goog Subject: [PATCH v6] [media] v4l: add I / P frame min max QP definitions 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-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 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 v5: - Adjust documentation wording. Changelog since v4: - Fix patch subject and send again. 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..5b2db52d3b4e 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 the H264 I frame to limit I 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_I_FRAME_MAX_QP (integer)`` + Maximum quantization parameter for the H264 I frame to limit I 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_H264_P_FRAME_MIN_QP (integer)`` + Minimum quantization parameter for the H264 P frame to limit P 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_P_FRAME_MAX_QP (integer)`` + Maximum quantization parameter for the H264 P frame to limit P 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. 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.225.g810b269d1ac-goog