From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 73785353A9D for ; Tue, 14 Jul 2026 19:00:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784055662; cv=none; b=m8VRTqGyi1ot/FAObrc/WW154bv1gSkPmwXpOe/xnR+c6l/YJEiB/ZbkGNMA0E9xfb5EzO06wBDB6WTklyfuAKNGvPP6AyDbZEATBX/rdz7uZNxpc5Myh+ud3Dfu/+dtAZt0L1qsqx9md6nUx4kG3ImYiT8leAuXCZ7I22rdJgg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784055662; c=relaxed/simple; bh=Vs+Xz11NwshWpusj/GLSlzFZoBVvFw1FfW1E2XVtmFM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LnEcL/V+rkx3W+BCFG2r6sHolM9+KStplG+WkENOEHH1wAkBYSEQuF1WsL6FGGHby3/zkFXeywnGhvUKYP12or9a1/D7Us5KV+wy1Q/+bc293kf79PCJGiazZPJhl4i0bp0DwstecbOVEdrjObOM+cQOCJ/ePy/ckPzScLhvJkY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=ntLDKs2f; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=P05NHPSe; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="ntLDKs2f"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="P05NHPSe" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66EIwLs61267254 for ; Tue, 14 Jul 2026 19:00:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= VuN2KvyH7xNc5tPonuLvz3YrBSAEUeGAvGNJm5LjkOI=; b=ntLDKs2fRXparKR2 TbBIBJctpv0kyLtpgdMby49/G1OHbCsXhpiXD3tj0/+MDlYFU/c0+KvnoILi+lwM xtn6JrEz25ZzgoyDfkQtWKhEqsC3jcmNzDSovZsVc/yiK5ns8KIquRbFutWZBwRX TR+l4cexxs5BOUuKIuxOnPuTY5vuxtQJzkjkvY14uyfBXt7VKvrZiWgdE2gONWA9 qThATKQT3nFbxqZ7KuA4jOf1RoC1jhuSILH1B8NMjCusrVHVNig9R9IyavdyfV70 8j7oBmcYK/KlNyyW554BBDbYNV712rXoLHGdnJKnVR3D6by6lXx67HsIQ5hWWqhe 1DCMbw== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fdnp0hfb3-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 14 Jul 2026 19:00:32 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-382befb9555so1315290a91.1 for ; Tue, 14 Jul 2026 12:00:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784055632; x=1784660432; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=VuN2KvyH7xNc5tPonuLvz3YrBSAEUeGAvGNJm5LjkOI=; b=P05NHPSercUg6NK9mWYMPDMd444i3mRPu6A+eZprsaNH4IL+AgaRR6H78hWS1WGNvN 4yuy4aXndr+QM0FmEcjShzSn7IxK6eBzc+Gp6jaXLqjLLK34Uf98S1SURimx2zSmkZAd VGG5Jl2l9+Plf21MMYFJuJwQBT6xqzO+lycvaXuSeCmqw3FBnU7d0KSyMKWSynIEwamj OF8o5q00Vhl3+EXlPg8zM7paYbNjUyW6kGEq8LiKWhE9OYpwPXO01zwV8VNnZiywW3Py hKrCzsX6Qk/8+CuRl62JNVdBiKzqcy89exx1KH47sg+01T2zXMjpSgIX1XG1Lwfe4edt kU4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784055632; x=1784660432; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=VuN2KvyH7xNc5tPonuLvz3YrBSAEUeGAvGNJm5LjkOI=; b=EYdp+D2YSoHoLUkywOvSh9PzB2CHJzZYl6lHw2VLYEinV41+hRlKEWIcYedFA77msR qqEyiQxozOTGFH91Vgnb5IezqsAEMjaLphkjvCd81c52h+KituWFBW/SPt8b2EYTFWJn kW9y05SrY6/OmI9QGTgzlAf0us1hNJVtTTNmbYWpt1L0+U1gkhRrslSUGyqcJmBg2ZMC nGJ7yYjdGQQ7pwl9l97dN1edANUQdnq+h4bE2bRQ4A/ZvdYuy8vIDfEx8RLDcU3QlGhF +0DXifnVsPjKc+OTemQvEQgoLUobmv7L1ijK8r5dkqokG+O9uQNIWoBHvbmoAxv0jSal HcHA== X-Forwarded-Encrypted: i=1; AHgh+RoG0BrNwuhcT3rJZfIZtfC2/QATB6dNCV6846pPcGANpE+3ni9ukJ62mC5ckLGOKe6gUzVxMZVlGuvUMiY=@vger.kernel.org X-Gm-Message-State: AOJu0YwG2yqe4RyDndB5ZFDWuNkoWfhfJ20PhbOGYl/0tnYO/76XBnaq svCRE1MW2ElVzmHTZhyFgeOr4yWSyvloH4iTsjolgKkRdYQqbXeCZSnhlxeFFPVkecV9RHxq9Xe KkIkMnHHSLz3ZnCF+Rbq/j1UeqLKx1sRouQIXXGgLPKgvcH3viVT/zM5gXejUjgiXa30= X-Gm-Gg: AfdE7ckLFynFarwGlBvDyvkSgbDQGpV0ep4hyqK30Dmpqx/Qb8dUusIo2zmI+WNi4Vl QawHDymiuGTxHVy4+FZwYNxPYjO+3z5yY3k76cpT3d5F7zsKaXpu1Gnbq7jelKRF+cXLgcg7Q0w VdOaKH654Hmk7kliF9rjqWBgJhHSqoqFimJ4kmys5vegLB+MOo+5rhYZpLJlhq1dBg1IRbxjatF vGCdl+0/6hw/PG5c9tObnqkSeXbwFVJDQDHNBAOFVbxO/RLzyVHpJtJgPIG1vd6+K7dWfxgQnLt 4toc2TnOuLKUqgZoAs6ZuqIucWYHA03CFA9IEY4VNUMf/5VwXTzZ51o9S+BURqKReHO3OtsMjvn XOiy0YU4Tir044nv2RL3EFgldWtn997Oi/Y9OK7OOe5bQenpBcAY6yX12k1OaLwkmXFkubEU= X-Received: by 2002:a17:90b:2dc1:b0:37f:e7e7:ad1 with SMTP id 98e67ed59e1d1-38dc7c0eb95mr10610100a91.5.1784055631861; Tue, 14 Jul 2026 12:00:31 -0700 (PDT) X-Received: by 2002:a17:90b:2dc1:b0:37f:e7e7:ad1 with SMTP id 98e67ed59e1d1-38dc7c0eb95mr10610063a91.5.1784055631237; Tue, 14 Jul 2026 12:00:31 -0700 (PDT) Received: from gu-dmadival-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3119d5cf176sm56634528eec.12.2026.07.14.12.00.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2026 12:00:30 -0700 (PDT) From: Deepa Guthyappa Madivalara Date: Tue, 14 Jul 2026 12:00:26 -0700 Subject: [PATCH v2 2/3] media: v4l2-core: Add support for video encoder ROI control Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260714-enc_roi_enable-v2-2-63683f9dbcef@oss.qualcomm.com> References: <20260714-enc_roi_enable-v2-0-63683f9dbcef@oss.qualcomm.com> In-Reply-To: <20260714-enc_roi_enable-v2-0-63683f9dbcef@oss.qualcomm.com> To: Mauro Carvalho Chehab , Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Deepa Guthyappa Madivalara , kernel test robot X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784055629; l=6648; i=deepa.madivalara@oss.qualcomm.com; s=20250814; h=from:subject:message-id; bh=Vs+Xz11NwshWpusj/GLSlzFZoBVvFw1FfW1E2XVtmFM=; b=w1bKnZDnzQRaC5KmOqiT8LaQarRRPRjbcH6pbgtdj6PiiWVO/Og/G0vATKAZQDplea0EOD2+a UGu3NhW5DdvAx85/nWUrf5NPqESCUIbLN3p9NGPsbB/3p/yWSICBX2R X-Developer-Key: i=deepa.madivalara@oss.qualcomm.com; a=ed25519; pk=MOEXgyokievn+bgpHdS6Ixh/KQYyS90z2mqIbQ822FQ= X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE0MDE5NiBTYWx0ZWRfX+1+mTUNN8Kj/ K9G9LZPWclKhmLR2HiZwwmnxtAOCgp63K09nzuQ0HAs2qxVVtwsG/3VDd9DhVpXj4/ryqSSzjAs brABVKwatfQrHArmsSzAX9eJrZPcEMs= X-Proofpoint-GUID: 3gprA85-bRW1TIh3tikCYbiUzpK8iUDy X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE0MDE5NiBTYWx0ZWRfX5xdJ8GeNAqoH jJ33pqd7noC3SHwdrYOaDF2lyNxkqpbHdAun/RTEptZIyo6V0XnivljRYq/II8Gg5y9eCLfqQ8/ c98Z/VqDRxMImMzf+PotoWlU5KyLJfb/tixss94Q6Q8dU/51xMrtvLN+VyoTIGoh95wZ3d+OS+D P9Q8Lg2Ooqqoo/bhL+ndHUiyPP4osqqqh/KvbuekUmzckNTFWdEE+Easml9ZeYTo5FB70OT8wj0 A24fIuJUi1jYWmRZ5k3ney6V4hu0oVx1Rs2OhsJ3czq42EmLAKAT1culr08o2WdgHeMaaGaJUqV RQhoYTCUDuwgZrmAUwUr7NoOHTIUl+sqjUIWnGPYu/B1u+K3JTvlaIx+ls3h5ZazWo6UCL4HTWc PO3KiBSfsbAT2NC7rsLMnO1OtNbfXpvWlf5MkdtF/F7kXjlShUp+rWChrBg77c34DBek/fQmj+U 2xty0/pKHXe+hrq1hHQ== X-Authority-Analysis: v=2.4 cv=FtM1OWrq c=1 sm=1 tr=0 ts=6a568750 cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=9XNArsbAKfxwOWEdJiAA:9 a=QEXdDO2ut3YA:10 a=iS9zxrgQBfv6-_F4QbHw:22 X-Proofpoint-ORIG-GUID: 3gprA85-bRW1TIh3tikCYbiUzpK8iUDy X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-14_05,2026-07-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 priorityscore=1501 bulkscore=0 phishscore=0 clxscore=1015 impostorscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607140196 Add necessary support for controls V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP and V4L2_CID_MPEG_VIDEO_ROI_MB_SIZE. Signed-off-by: Deepa Guthyappa Madivalara --- drivers/media/v4l2-core/v4l2-ctrls-api.c | 1 + drivers/media/v4l2-core/v4l2-ctrls-core.c | 40 +++++++++++++++++++++++++++++-- drivers/media/v4l2-core/v4l2-ctrls-defs.c | 10 ++++++++ include/media/v4l2-ctrls.h | 3 ++- 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-core/v4l2-ctrls-api.c index 93d8d4012d0f4fef004e417d0aee2ae44b1b30bd..7d41cfd7378baaa929d4da0266c45f731bb54285 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-api.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-api.c @@ -980,6 +980,7 @@ int __v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl, case V4L2_CTRL_TYPE_U8: case V4L2_CTRL_TYPE_U16: case V4L2_CTRL_TYPE_U32: + case V4L2_CTRL_TYPE_S8: if (ctrl->is_array) return -EINVAL; ret = check_range(ctrl->type, min, max, step, def); diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2-core/v4l2-ctrls-core.c index ba047d7d86010bf0cf8f8fbf2dc343883d6bdae0..15b69dce0127e7c8546c2d23ae5458ace10301a0 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c @@ -287,6 +287,14 @@ static void __v4l2_ctrl_type_op_init(const struct v4l2_ctrl *ctrl, u32 from_idx, memset(ptr.p_u32 + from_idx, 0, elems * sizeof(u32)); } break; + case V4L2_CTRL_TYPE_S8: + if (value) { + for (i = from_idx; i < tot_elems; i++) + ptr.p_s8[i] = value; + } else { + memset(ptr.p_s8 + from_idx, 0, elems * sizeof(s8)); + } + break; default: for (i = from_idx; i < tot_elems; i++) { switch (which) { @@ -367,6 +375,9 @@ void v4l2_ctrl_type_op_log(const struct v4l2_ctrl *ctrl) case V4L2_CTRL_TYPE_U32: pr_cont("%u", (unsigned)*ptr.p_u32); break; + case V4L2_CTRL_TYPE_S8: + pr_cont("%d", *ptr.p_s8); + break; case V4L2_CTRL_TYPE_AREA: pr_cont("%ux%u", ptr.p_area->width, ptr.p_area->height); break; @@ -481,6 +492,21 @@ EXPORT_SYMBOL(v4l2_ctrl_type_op_log); 0; \ }) +#define ROUND_TO_RANGE_SIGNED(val, offset_type, ctrl) \ +({ \ + offset_type offset; \ + if ((ctrl)->maximum >= 0 && \ + val >= (ctrl)->maximum - (s32)((ctrl)->step / 2)) \ + val = (ctrl)->maximum; \ + else \ + val += (s32)((ctrl)->step / 2); \ + val = clamp_t(typeof(val), val, \ + (ctrl)->minimum, (ctrl)->maximum); \ + offset = (val) - (ctrl)->minimum; \ + offset = (ctrl)->step * (offset / (s32)(ctrl)->step); \ + val = (ctrl)->minimum + offset; \ +}) + /* Validate a new control */ #define zero_padding(s) \ @@ -1365,6 +1391,8 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, return -EINVAL; break; + case V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP: + break; default: return -EINVAL; } @@ -1378,6 +1406,7 @@ static int std_validate_elem(const struct v4l2_ctrl *ctrl, u32 idx, size_t len; u64 offset; s64 val; + s32 tmp; switch ((u32)ctrl->type) { case V4L2_CTRL_TYPE_INTEGER: @@ -1403,7 +1432,11 @@ static int std_validate_elem(const struct v4l2_ctrl *ctrl, u32 idx, return ROUND_TO_RANGE(ptr.p_u16[idx], u16, ctrl); case V4L2_CTRL_TYPE_U32: return ROUND_TO_RANGE(ptr.p_u32[idx], u32, ctrl); - + case V4L2_CTRL_TYPE_S8: + tmp = ptr.p_s8[idx]; + ROUND_TO_RANGE_SIGNED(tmp, s32, ctrl); + ptr.p_s8[idx] = (s8)tmp; + return 0; case V4L2_CTRL_TYPE_BOOLEAN: ptr.p_s32[idx] = !!ptr.p_s32[idx]; return 0; @@ -1556,6 +1589,7 @@ void cur_to_new(struct v4l2_ctrl *ctrl) return; if (ctrl->is_dyn_array) ctrl->new_elems = ctrl->elems; + ptr_to_ptr(ctrl, ctrl->p_cur, ctrl->p_new, ctrl->new_elems); } @@ -1998,6 +2032,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, case V4L2_CTRL_TYPE_U32: elem_size = sizeof(u32); break; + case V4L2_CTRL_TYPE_S8: + elem_size = sizeof(s8); + break; case V4L2_CTRL_TYPE_MPEG2_SEQUENCE: elem_size = sizeof(struct v4l2_ctrl_mpeg2_sequence); break; @@ -2215,7 +2252,6 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, if (flags & V4L2_CTRL_FLAG_HAS_WHICH_MIN_MAX) { void *ptr = ctrl->p_def.p; - if (p_min.p_const) { ptr += elem_size; ctrl->p_min.p = ptr; diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2-core/v4l2-ctrls-defs.c index e062f2088490470c42d6c579ff7675be454a29b0..8f895060799ea13443143edd398dfb97f4ba0085 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c @@ -974,6 +974,8 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_MPEG_VIDEO_AVERAGE_QP: return "Average QP Value"; case V4L2_CID_FWHT_I_FRAME_QP: return "FWHT I-Frame QP Value"; case V4L2_CID_FWHT_P_FRAME_QP: return "FWHT P-Frame QP Value"; + case V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP: return "Encoder ROI MB Delta QP"; + case V4L2_CID_MPEG_VIDEO_ROI_MB_SIZE: return "Encoder ROI MB Size"; /* VPX controls */ case V4L2_CID_MPEG_VIDEO_VPX_NUM_PARTITIONS: return "VPX Number of Partitions"; @@ -1622,6 +1624,14 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY: *type = V4L2_CTRL_TYPE_HDR10_MASTERING_DISPLAY; break; + case V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP: + *type = V4L2_CTRL_TYPE_S8; + *flags |= V4L2_CTRL_FLAG_DYNAMIC_ARRAY; + break; + case V4L2_CID_MPEG_VIDEO_ROI_MB_SIZE: + *type = V4L2_CTRL_TYPE_U8; + *flags |= V4L2_CTRL_FLAG_READ_ONLY; + break; default: *type = V4L2_CTRL_TYPE_INTEGER; break; diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index a1806ddbc797efa52e83cd3f685ef70d5b5483d2..9a68a3555e349f1e55aa01af5c10f08201d62bae 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -27,6 +27,7 @@ struct video_device; /** * union v4l2_ctrl_ptr - A pointer to a control value. + * @p_s8: Pointer to a 8-bit signed value. * @p_s32: Pointer to a 32-bit signed value. * @p_s64: Pointer to a 64-bit signed value. * @p_u8: Pointer to a 8-bit unsigned value. @@ -61,10 +62,10 @@ struct video_device; * @p_const: Pointer to a constant compound value. */ union v4l2_ctrl_ptr { + s8 *p_s8; s32 *p_s32; s64 *p_s64; u8 *p_u8; - s8 *p_s8; u16 *p_u16; u32 *p_u32; char *p_char; -- 2.34.1