From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 8F7F833D4E2 for ; Sat, 15 Aug 2026 19:22:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786821757; cv=none; b=lNTBiJxyQ9AZMeVVTIl1qcHAGScKVrZ7Xd9Z3jLUCD08hmGWuXfKfnva49ATSOlS67iYujiW3uaNKqxwKQOFKHD5kWIEPhDgiyOkap1OVrNSZ9BerWfF9QsA6lPyJF+yQ9Ybk0uSBY8TRHtFhKaIUsZsIZrevnNNNgplwoPK1VI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786821757; c=relaxed/simple; bh=h/hrq8tlOmQSxbosQzmao/buysKRFdIVJfpNMxLFuHU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JE6pXDTIbo8Mi3Yr1ZzyRGL7Ds/dcemTK6xlXn2nc+u5t5DnSL6gQRjcsq5ChrMthEqlOfCW3jnLKmwLv6ei0zpX9Z3vL+xhhVWjaSYyoHtDFzDkfbmfdfsiy0JZvGvZMy8jvX1ds6L+NuP6tsPtphheZTDnI5OK3rrQLaOoPQQ= 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=JgENgFTq; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=be1Zj2tW; arc=none smtp.client-ip=205.220.180.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="JgENgFTq"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="be1Zj2tW" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67FGTtPI1364543 for ; Sat, 15 Aug 2026 19:22:34 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= kynEncYcQcGr44kGwirSobo5ocnqiYKg4uPy9Ir/qM0=; b=JgENgFTqBkrVZ4pQ 10rJ1iCkiWGE0AEFHWfdBuyC7h9J2zvpGP4y7MQDksjmhaqfXHRlzR+egk9nR163 Q1e8PwFp6HhlKmTE8CWChLjk6SH62btKVcPcdAxqqY5aw1MEeeHQO0AZEjctOdUF p7Kgbt4byJERUj0AapTNRQukeTNpPBhJwm6S92xf9TV0hEi5oU9z/p6A5bH95nem /2k83EFhPjl2Cm3Eg7GMktIC86ChV5KyFwJcJ3w2cEaFw5ur4zh+pX9LgJJ9PR54 YMbp93pCxEPf5uHA5DkJZF4oU7uGfWIajW2bznjiZZrEYIES8Gc4XmnHi0ca+NjO IXT4Pg== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g2ghnss8h-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 15 Aug 2026 19:22:34 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2cf2308ef97so3092865ad.0 for ; Sat, 15 Aug 2026 12:22:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786821753; x=1787426553; 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=kynEncYcQcGr44kGwirSobo5ocnqiYKg4uPy9Ir/qM0=; b=be1Zj2tW3o3KVoUqhs2JWtKpBbz50aen80/LnjOEkKXG8jaE1fSBc05NsLKeEanHit YBNXzmTxpmrIAeNtXrLT+1EnuI1nG/ll8X/p75lKrmfaOGTJ6aIZbPoXR80i45ZQ9ck/ Nbj/WVQ82p+nqryoVJISknTBHsb2Upog35MOq7SkyQLXp4wrNj6zktrPRDFPW0BmLpjT yeADaExnKmUaC2RQ1B74teHcy2rN4uomhSEHWGfYYGiSSzYe7I9tge1bgGgRyuH+aWh/ HXpHGkhLfSn0eAkUUFM8ZN9fx178SSNOEuoWJEtczevKQCdGym4I5zQNkUHKbhKg8+3W IdUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786821753; x=1787426553; 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=kynEncYcQcGr44kGwirSobo5ocnqiYKg4uPy9Ir/qM0=; b=s8ENUaJ5pGznMggDuXaMh35i3A8/JKFp3Vi/H7Pgh2J4KS1TI34DP60VJD0l+6NbCf qg+YTrgWtYUOJ6VCd6L87GjEYL2C6MwgRi94lDs5uI2zpUkH9LHRjPW8/rshMqnWkYFw k/G+h78myWbgvuY9FtRhLVEb+67TxQxv1vumFsdLJJStRErISZekAv9XrvTRU1w7OIDg NggY+GU5fB63AuOA2E6iovyBAVOX7mQ9ZwRsdsXcncljEnxn+EnovywiM/yMvXGAmLvY KilzGjjhdr82AKYGf2wEtjQFFysXQC4Z6y4/2TTsziDMdvyG4BvOg5H/9WceNqDlApYQ Cwfw== X-Forwarded-Encrypted: i=1; AHgh+RoGUvgVHZ/0I3mwi0fdhg4SddCJYWMYGR72NWvQP2bYyB+94NAeTU/mz+sOQpDC5LaGMWJ4O6XcbpsZcHg=@vger.kernel.org X-Gm-Message-State: AOJu0YydCm3uMa1832Ywmir5QYg44oYhVRXfH9AkkYdAC8CTNqC3kX8f TNg512flUvL6hMG12G0JBFqNNEDFKt/P2tFPQzWl5bOC/8UO0N+YMrfnMU7Jl9S+O3PcZ9Eb/WU Akzmz5UGjnDBQ3PeWye9lRxlBuBLLzVs6KVcBIkddi/9m6vGmfODRZycb1GaL231yv0U= X-Gm-Gg: AR+sD10OBCn/uOx5uppXRKIy7MOxzMPkMTdfG2+nvljdGr1oYyJ1ceIExA3uWaC1SW3 qxjejgsraoE95v1R7dwjYWzvkkNVPMqxD6BbzVP0TpjMMnIIJp7U/Ot9bl3nmWRFnAL02Q0Y0dz cxX/wqJb1R3f5owjiCjkehBLAf+8DhAVve1aJP6GolRKQM8jDUSovVGUbAFI6jBLq0aRmFbG6kM TDlaojzQQV//Jf+6E+rII3VBTJgJwcuckHuxwLrcYQh/AujFRwiuzFhuIZsxopdMae+saIoh7S7 /fzX/55N2fCyofsxarDQc5Th9XOsX9YW6cI76BQIolZTk8OVA7xJhrcXRQpuKyEBspZv9xWxz4x kzXw/+oPgi6Xx6KmiQgXwcdVd6JOD2FCNx1qLtD/vCYxyhI+HlhapigTebIA9 X-Received: by 2002:a17:902:e805:b0:2c9:fbde:ab68 with SMTP id d9443c01a7336-2d3b0ea0392mr114160775ad.3.1786821753324; Sat, 15 Aug 2026 12:22:33 -0700 (PDT) X-Received: by 2002:a17:902:e805:b0:2c9:fbde:ab68 with SMTP id d9443c01a7336-2d3b0ea0392mr114160445ad.3.1786821752846; Sat, 15 Aug 2026 12:22:32 -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-320d61e1cccsm15889350eec.8.2026.08.15.12.22.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Aug 2026 12:22:32 -0700 (PDT) From: Deepa Guthyappa Madivalara Date: Sat, 15 Aug 2026 12:22:25 -0700 Subject: [PATCH v5 2/5] 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: <20260815-enc_roi_enable-v5-2-ded944f0fc7f@oss.qualcomm.com> References: <20260815-enc_roi_enable-v5-0-ded944f0fc7f@oss.qualcomm.com> In-Reply-To: <20260815-enc_roi_enable-v5-0-ded944f0fc7f@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=1786821749; l=5504; i=deepa.madivalara@oss.qualcomm.com; s=20250814; h=from:subject:message-id; bh=h/hrq8tlOmQSxbosQzmao/buysKRFdIVJfpNMxLFuHU=; b=IyBDgddy+CnXftBn0kIZAqcQoki+kDNIRI9aVpR/k3kq0/z7Psf2I2xpgbx+oLVXKUPts9scw YCbj27a4mltAwx2csNAjrAAxuTVsjtR701qgLLT1zk4hqtQn5+e5N0s X-Developer-Key: i=deepa.madivalara@oss.qualcomm.com; a=ed25519; pk=MOEXgyokievn+bgpHdS6Ixh/KQYyS90z2mqIbQ822FQ= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODE1MDE0NiBTYWx0ZWRfXxDrCfoBJBpzt h6cuycPjJq8SGGFCWL6AE1o5kXWI68lscWXP26NEK9H5M4B5uK5OGLjUVMV5XzzTrmTJkcZpIQ0 XsYTUOn92UrEOXqrsSHz2hJ66ycjxwzO/sFZTesKw30ubIrT1RYCYh2gIDyVZR0Jn/jlivx893n arFJ+tBeCV7zuQtS0qL+DU2qkZprsqdLPOhth0j3mLG5R9oTUQT0oS3ZwqddFxBsw1Pu4eCvu3R HQk1RaQex9DPqsVFC8KIiDXVtsmWLAqkODZ+wcwR6Z6JxxBl+xGsMSMbFLA3RhxDSL/AvO0AniW Y5FuSmHUxt0/boVkfCAx5nTOz9dpuTdIHz8yzH30GkJvAX7rYUDcybLIzC9LXWJRtjIDg2tEmIG g3WvojptRuKaq1532JcKRlzwdkO348s2vPsu0Yv7p6b/EvjjTDCq/VErJ2CArNM0sdL87vyjlPM 84m/Gjl6zZfMrxA1Lwg== X-Proofpoint-ORIG-GUID: evmoFrKDo49kvM9mZ6DBrLV7KmGCu92u X-Authority-Analysis: v=2.4 cv=QN5YgALL c=1 sm=1 tr=0 ts=6a80bc7a cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=hEAr28SmMdMltZAvPKQA:9 a=QEXdDO2ut3YA:10 a=1OuFwYUASf3TG4hYMiVC:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODE1MDE0NiBTYWx0ZWRfXw0BEF8wrP6lB 3pzROzwV7AKakxreUKdUZk7kl7/lVOtoUpdI1hsLNjC8ETM1Ud61FZRugDQmHHEWWv+IGitjxaf nwSDjFvi1smxXLUjzyBIba7n8wg1wEI= X-Proofpoint-GUID: evmoFrKDo49kvM9mZ6DBrLV7KmGCu92u X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-15_05,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 bulkscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608150146 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 | 23 ++++++++++++++++++++++- drivers/media/v4l2-core/v4l2-ctrls-defs.c | 10 ++++++++++ include/media/v4l2-ctrls.h | 3 ++- 4 files changed, 35 insertions(+), 2 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 5b8a594fb9e24e16128c9c763a3b1dd311fad2ba..db6577070ebd2eb6a60599b3b2394fe128236705 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c @@ -290,6 +290,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) { @@ -370,6 +378,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; @@ -1397,6 +1408,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; } @@ -1410,6 +1423,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: @@ -1435,7 +1449,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(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; @@ -2030,6 +2048,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; 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