From patchwork Mon Nov 9 17:31:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 11892025 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B33361391 for ; Mon, 9 Nov 2020 17:32:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8AEA920E65 for ; Mon, 9 Nov 2020 17:32:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="oPENIUiB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731873AbgKIRcS (ORCPT ); Mon, 9 Nov 2020 12:32:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731800AbgKIRcS (ORCPT ); Mon, 9 Nov 2020 12:32:18 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0B03C0613CF for ; Mon, 9 Nov 2020 09:32:17 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id t11so9604586edj.13 for ; Mon, 09 Nov 2020 09:32:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iNRzHj9PelsG2iSGOVGYTY9mpu2bcEQftZ5GO4rFbCI=; b=oPENIUiBBvq53V9e8Lq0nYu3dojSOJm5X6ry31ClZSQP6nK+TAVGGfHYbC2cmjXoQ4 xSkXup47wSSyU1EfxcdLpbFNs9EjXltundh+EYtIRVx970I00BCCkaHuaO7PqjiMjUEi OzW0HAcs5EvdmWgoya0ezxIJt3YLDUe9sVd4TGqKSIufdAM2lkLETluoFNXDZcl24zzj Gvu9jikP9vIU1DdTZOEslGnZbdYIhiC8BFf/1yfhz/dWkmnQXxyXfvQjcDS2EfQZDLYn 4pbT7B3x9du3aFUkg5Ie+eSlcNLRZpyuksvlDaOLC/uuPeHjjCgH++BTM2KTGYNGSeqg 2dxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iNRzHj9PelsG2iSGOVGYTY9mpu2bcEQftZ5GO4rFbCI=; b=GJagMVGqDE1ZKpLbZz8XrSNSJmiPVWQLrNl4jPO4eEJeNCeAZO70lVHVStqK1vmhTJ IfF3Hd1TWH46a0p9chiQ8bG7bvxx8GqARPwJm2fslF2b5+gFgMDvJx9KolAdmpfrhOcW TAy+zMVyBFU6nAdkp+hK7Np5Yfwyh4dOUN2pmAScARbxs2Tr5M1CvZ+wElCQkmk2FhwG 6HpKWc230JG9IuoemRpK1B/2cF8CusL7/fbr04CzEDvWdxyFTWpOr2VkEsGLZ3GEPRzX GpCgF1XY2+hQktJc5/8YfDDCiZ8Ygfb+ec5DloF7tHu67cg+lAmG7fJpZEWxUouAWCi/ fMXQ== X-Gm-Message-State: AOAM533BXVsRL7gwHkoFweX/fuwlVmNpCbmC9VR0Ym4v3CFlkLx62ybL yyT32Panc4+7TEHLXHM22vVp6A== X-Google-Smtp-Source: ABdhPJxbS+FBEcfhX6EobRt6dQmVd6oMrPtdkzyQVw7or3u0Q6mpiTtIMWzLwCJX6PQJWhublUvyJw== X-Received: by 2002:aa7:df04:: with SMTP id c4mr16581201edy.25.1604943136543; Mon, 09 Nov 2020 09:32:16 -0800 (PST) Received: from localhost.localdomain (hst-221-32.medicom.bg. [84.238.221.32]) by smtp.gmail.com with ESMTPSA id w18sm5037005edq.43.2020.11.09.09.32.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 09:32:15 -0800 (PST) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: Nicolas Dufresne , Ezequiel Garcia , Hans Verkuil , Stanimir Varbanov Subject: [PATCH 1/3] v4l: Add HDR10 HEVC static metadata controls Date: Mon, 9 Nov 2020 19:31:51 +0200 Message-Id: <20201109173153.23720-2-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201109173153.23720-1-stanimir.varbanov@linaro.org> References: <20201109173153.23720-1-stanimir.varbanov@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add Content light level and Mastering display colour volume v4l2 compounf controls, relevant payload structures and validation. Signed-off-by: Stanimir Varbanov --- drivers/media/v4l2-core/v4l2-ctrls.c | 61 ++++++++++++++++++++++++++++ include/media/hevc-ctrls.h | 41 +++++++++++++++++++ include/media/v4l2-ctrls.h | 2 + 3 files changed, 104 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index bd7f330c941c..f70eaa6a46df 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -1023,6 +1023,8 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS: return "HEVC Slice Parameters"; case V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE: return "HEVC Decode Mode"; case V4L2_CID_MPEG_VIDEO_HEVC_START_CODE: return "HEVC Start Code"; + case V4L2_CID_MPEG_VIDEO_HEVC_CLL_INFO: return "HEVC Content Light Info"; + case V4L2_CID_MPEG_VIDEO_HEVC_MASTERING_DISPLAY: return "HEVC Mastering Display"; /* CAMERA controls */ /* Keep the order of the 'case's the same as in v4l2-controls.h! */ @@ -1461,6 +1463,12 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS: *type = V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS; break; + case V4L2_CID_MPEG_VIDEO_HEVC_CLL_INFO: + *type = V4L2_CTRL_TYPE_HEVC_CLL_INFO; + break; + case V4L2_CID_MPEG_VIDEO_HEVC_MASTERING_DISPLAY: + *type = V4L2_CTRL_TYPE_HEVC_MASTERING_DISPLAY; + break; case V4L2_CID_UNIT_CELL_SIZE: *type = V4L2_CTRL_TYPE_AREA; *flags |= V4L2_CTRL_FLAG_READ_ONLY; @@ -1775,6 +1783,7 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, struct v4l2_ctrl_hevc_sps *p_hevc_sps; struct v4l2_ctrl_hevc_pps *p_hevc_pps; struct v4l2_ctrl_hevc_slice_params *p_hevc_slice_params; + struct v4l2_ctrl_hevc_mastering_display *p_hevc_mastering; struct v4l2_area *area; void *p = ptr.p + idx * ctrl->elem_size; unsigned int i; @@ -1934,6 +1943,52 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, zero_padding(*p_hevc_slice_params); break; + case V4L2_CTRL_TYPE_HEVC_CLL_INFO: + break; + + case V4L2_CTRL_TYPE_HEVC_MASTERING_DISPLAY: + p_hevc_mastering = p; + + for (i = 0; i < 3; ++i) { + if (p_hevc_mastering->display_primaries_x[i] < + V4L2_HEVC_MASTERING_PRIMARIES_X_LOW || + p_hevc_mastering->display_primaries_x[i] > + V4L2_HEVC_MASTERING_PRIMARIES_X_HIGH || + p_hevc_mastering->display_primaries_y[i] < + V4L2_HEVC_MASTERING_PRIMARIES_Y_LOW || + p_hevc_mastering->display_primaries_y[i] > + V4L2_HEVC_MASTERING_PRIMARIES_Y_HIGH) + return -EINVAL; + } + + if (p_hevc_mastering->white_point_x < + V4L2_HEVC_MASTERING_WHITE_POINT_X_LOW || + p_hevc_mastering->white_point_x > + V4L2_HEVC_MASTERING_WHITE_POINT_X_HIGH || + p_hevc_mastering->white_point_y < + V4L2_HEVC_MASTERING_WHITE_POINT_Y_LOW || + p_hevc_mastering->white_point_y > + V4L2_HEVC_MASTERING_WHITE_POINT_Y_HIGH) + return -EINVAL; + + if (p_hevc_mastering->max_luminance < + V4L2_HEVC_MASTERING_MAX_LUMA_LOW || + p_hevc_mastering->max_luminance > + V4L2_HEVC_MASTERING_MAX_LUMA_HIGH || + p_hevc_mastering->min_luminance < + V4L2_HEVC_MASTERING_MIN_LUMA_LOW || + p_hevc_mastering->min_luminance > + V4L2_HEVC_MASTERING_MIN_LUMA_HIGH) + return -EINVAL; + + if (p_hevc_mastering->max_luminance == + V4L2_HEVC_MASTERING_MAX_LUMA_LOW && + p_hevc_mastering->min_luminance == + V4L2_HEVC_MASTERING_MIN_LUMA_HIGH) + return -EINVAL; + + break; + case V4L2_CTRL_TYPE_AREA: area = p; if (!area->width || !area->height) @@ -2626,6 +2681,12 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, case V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS: elem_size = sizeof(struct v4l2_ctrl_hevc_slice_params); break; + case V4L2_CTRL_TYPE_HEVC_CLL_INFO: + elem_size = sizeof(struct v4l2_ctrl_hevc_cll_info); + break; + case V4L2_CTRL_TYPE_HEVC_MASTERING_DISPLAY: + elem_size = sizeof(struct v4l2_ctrl_hevc_mastering_display); + break; case V4L2_CTRL_TYPE_AREA: elem_size = sizeof(struct v4l2_area); break; diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h index 1009cf0891cc..d254457d2846 100644 --- a/include/media/hevc-ctrls.h +++ b/include/media/hevc-ctrls.h @@ -209,4 +209,45 @@ struct v4l2_ctrl_hevc_slice_params { __u64 flags; }; +/* + * Content light level information. + * Source Rec. ITU-T H.265 v7 (11/2019) HEVC; D.2.35 + */ +#define V4L2_CID_MPEG_VIDEO_HEVC_CLL_INFO (V4L2_CID_MPEG_BASE + 1017) +#define V4L2_CTRL_TYPE_HEVC_CLL_INFO 0x0123 + +struct v4l2_ctrl_hevc_cll_info { + __u16 max_content_light_level; + __u16 max_pic_average_light_level; +}; + +/* + * Mastering display colour volume. + * Source Rec. ITU-T H.265 v7 (11/2019) HEVC; D.2.28 + */ +#define V4L2_CID_MPEG_VIDEO_HEVC_MASTERING_DISPLAY (V4L2_CID_MPEG_BASE + 1018) +#define V4L2_CTRL_TYPE_HEVC_MASTERING_DISPLAY 0x0124 + +#define V4L2_HEVC_MASTERING_PRIMARIES_X_LOW 5 +#define V4L2_HEVC_MASTERING_PRIMARIES_X_HIGH 37000 +#define V4L2_HEVC_MASTERING_PRIMARIES_Y_LOW 5 +#define V4L2_HEVC_MASTERING_PRIMARIES_Y_HIGH 42000 +#define V4L2_HEVC_MASTERING_WHITE_POINT_X_LOW 5 +#define V4L2_HEVC_MASTERING_WHITE_POINT_X_HIGH 37000 +#define V4L2_HEVC_MASTERING_WHITE_POINT_Y_LOW 5 +#define V4L2_HEVC_MASTERING_WHITE_POINT_Y_HIGH 42000 +#define V4L2_HEVC_MASTERING_MAX_LUMA_LOW 50000 +#define V4L2_HEVC_MASTERING_MAX_LUMA_HIGH 100000000 +#define V4L2_HEVC_MASTERING_MIN_LUMA_LOW 1 +#define V4L2_HEVC_MASTERING_MIN_LUMA_HIGH 50000 + +struct v4l2_ctrl_hevc_mastering_display { + __u16 display_primaries_x[3]; + __u16 display_primaries_y[3]; + __u16 white_point_x; + __u16 white_point_y; + __u32 max_luminance; + __u32 min_luminance; +}; + #endif diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index cb25f345e9ad..6120e29945e1 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -80,6 +80,8 @@ union v4l2_ctrl_ptr { struct v4l2_ctrl_hevc_sps *p_hevc_sps; struct v4l2_ctrl_hevc_pps *p_hevc_pps; struct v4l2_ctrl_hevc_slice_params *p_hevc_slice_params; + struct v4l2_ctrl_hevc_cll_info *p_hevc_cll; + struct v4l2_ctrl_hevc_mastering_display *p_hevc_mastering; struct v4l2_area *p_area; void *p; const void *p_const;