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 D4A101CE6EA; Tue, 3 Sep 2024 07:05:39 +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=1725347141; cv=none; b=bKw8gtNQi90nTfImCOf+OqQGAcMyo4pq3c86eWkXYMuhkRZIfnn6K2KBwAYF+2Jy/9elQve4q+xTrF/kj7eHOM3gmUmOjA0Q0B5NyBD5QseMn6bNTGUuW2fVqUI4eqpGQpghBdKlj3vakGzhXd3JZg2UtUwDUukRyn/pYqfm4zk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725347141; c=relaxed/simple; bh=5GaolwnLCSoMymCebjafmVmrbgRSIqHeQeiMovImkqw=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=gdXuwsG7PoGzCUcDFUYNrwyP6KHk3Ej1whxrvMXmjhu7YIaTLE9zlc2FCv29oYulb8DshFven5zo/UU0N5mCebMjmcz1wXYJrXPqd84DevGEF50bAMb73uxd988nAivylcawVRUNLtN+1XI6dG/u3RRxXA3L1kYGmjmb33Jqh0o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=d9cxw9lm; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="d9cxw9lm" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 482NE6TG008272; Tue, 3 Sep 2024 07:05:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= ye396ih4RDlbZkUenphDf1DsaEEWV/ifYur6NO7zwcM=; b=d9cxw9lmFnINb3/r RWI0vjBwVkJlKvEr5yOPWce/T4MrVwQNsGafWa67iaapCKWuCNN0Dv3W54TWQvdg amVDASiNSNRMQTA9FzCzBHDF3bXZsdxxtr+NZjrNeceGGvlYaMNnVAj2jkfbrd43 xi/RR8CKybHt8BSQclrZDlbW/PTwZX3CyTuSwrQfnK8RxHFplQJuR0zU4vst9ET9 rzz5/SGRAg9+TWxvQN8/6YH4BNk7TrxumBBLKwxo7oSWx2XljrLxuCbR66auq0KE wqv+QTZF4H0zgDWa3d6U6p/0XyQXwzK8uKmJgNJTaJRj1tfgna+PsyNhdB/ljzhU lDYJ7A== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 41buxf692y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 03 Sep 2024 07:05:33 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA03.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 48375BoJ014244 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 3 Sep 2024 07:05:11 GMT Received: from [10.204.101.50] (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Tue, 3 Sep 2024 00:05:08 -0700 Message-ID: <65026fea-c591-d072-e7e8-2abf1fd057ce@quicinc.com> Date: Tue, 3 Sep 2024 12:35:05 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH v3 2/2] media: venus: Enable h.264 hierarchical coding Content-Language: en-US To: Fritz Koenig , Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Mauro Carvalho Chehab CC: Nathan Hebert , , , References: <20240814-submit-v3-0-f7d05e3e8560@chromium.org> <20240814-submit-v3-2-f7d05e3e8560@chromium.org> From: Dikshita Agarwal In-Reply-To: <20240814-submit-v3-2-f7d05e3e8560@chromium.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: T1mArqI1fQrlrJEtSG7tDZaTEMyGbL5C X-Proofpoint-ORIG-GUID: T1mArqI1fQrlrJEtSG7tDZaTEMyGbL5C X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-02_06,2024-09-02_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 malwarescore=0 adultscore=0 clxscore=1011 mlxlogscore=999 lowpriorityscore=0 phishscore=0 bulkscore=0 mlxscore=0 impostorscore=0 priorityscore=1501 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2407110000 definitions=main-2409030055 On 8/15/2024 3:44 AM, Fritz Koenig wrote: > HFI supports hierarchical P encoding and the ability to specify the > bitrate for the different layers. > > Connect the controls that V4L2 provides and HFI supports. > > Signed-off-by: Fritz Koenig > --- > drivers/media/platform/qcom/venus/core.h | 4 ++ > drivers/media/platform/qcom/venus/venc.c | 85 +++++++++++++++--------- > drivers/media/platform/qcom/venus/venc_ctrls.c | 92 ++++++++++++++++++++++++++ > 3 files changed, 151 insertions(+), 30 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h > index 55202b89e1b9..fd46a7778d8c 100644 > --- a/drivers/media/platform/qcom/venus/core.h > +++ b/drivers/media/platform/qcom/venus/core.h > @@ -26,6 +26,7 @@ > #define VIDC_CLKS_NUM_MAX 4 > #define VIDC_VCODEC_CLKS_NUM_MAX 2 > #define VIDC_RESETS_NUM_MAX 2 > +#define VIDC_MAX_HIER_CODING_LAYER 6 > > extern int venus_fw_debug; > > @@ -255,6 +256,7 @@ struct venc_controls { > u32 rc_enable; > u32 const_quality; > u32 frame_skip_mode; > + u32 layer_bitrate; > > u32 h264_i_period; > u32 h264_entropy_mode; > @@ -273,6 +275,8 @@ struct venc_controls { > s32 h264_loop_filter_alpha; > s32 h264_loop_filter_beta; > u32 h264_8x8_transform; > + u32 h264_hier_layers; > + u32 h264_hier_layer_bitrate[VIDC_MAX_HIER_CODING_LAYER]; > > u32 hevc_i_qp; > u32 hevc_p_qp; > diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c > index 3ec2fb8d9fab..af2c92069967 100644 > --- a/drivers/media/platform/qcom/venus/venc.c > +++ b/drivers/media/platform/qcom/venus/venc.c > @@ -734,6 +734,29 @@ static int venc_set_properties(struct venus_inst *inst) > if (ret) > return ret; > > + if (ctr->layer_bitrate) { > + unsigned int i; > + > + ptype = HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER; > + ret = hfi_session_set_property(inst, ptype, &ctr->h264_hier_layers); > + if (ret) > + return ret; > + > + ptype = HFI_PROPERTY_CONFIG_VENC_HIER_P_ENH_LAYER; > + ret = hfi_session_set_property(inst, ptype, &ctr->layer_bitrate); > + if (ret) > + return ret; > + > + for (i = 0; i < ctr->h264_hier_layers; ++i) { > + ptype = HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE; > + brate.bitrate = ctr->h264_hier_layer_bitrate[i]; > + brate.layer_id = i; > + > + ret = hfi_session_set_property(inst, ptype, &brate); > + if (ret) > + return ret; > + } > + } > } > > if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 || > @@ -823,45 +846,47 @@ static int venc_set_properties(struct venus_inst *inst) > return ret; > } > > - if (!ctr->bitrate) > - bitrate = 64000; > - else > - bitrate = ctr->bitrate; > + if (!ctr->layer_bitrate) { > + if (!ctr->bitrate) > + bitrate = 64000; > + else > + bitrate = ctr->bitrate; > > - ptype = HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE; > - brate.bitrate = bitrate; > - brate.layer_id = 0; > + ptype = HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE; > + brate.bitrate = bitrate; > + brate.layer_id = 0; > > - ret = hfi_session_set_property(inst, ptype, &brate); > - if (ret) > - return ret; > + ret = hfi_session_set_property(inst, ptype, &brate); > + if (ret) > + return ret; > > - if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 || > - inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) { > - ptype = HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER; > - if (ctr->header_mode == V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE) > - en.enable = 0; > + if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 || > + inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) { > + ptype = HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER; > + if (ctr->header_mode == V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE) why move this ctrl setting inside ctr->layer_bitrate check? I don't think this depends on layer bitrate. Thanks, Dikshita > + en.enable = 0; > + else > + en.enable = 1; > + > + ret = hfi_session_set_property(inst, ptype, &en); > + if (ret) > + return ret; > + } > + > + if (!ctr->bitrate_peak) > + bitrate *= 2; > else > - en.enable = 1; > + bitrate = ctr->bitrate_peak; > > - ret = hfi_session_set_property(inst, ptype, &en); > + ptype = HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE; > + brate.bitrate = bitrate; > + brate.layer_id = 0; > + > + ret = hfi_session_set_property(inst, ptype, &brate); > if (ret) > return ret; > } > > - if (!ctr->bitrate_peak) > - bitrate *= 2; > - else > - bitrate = ctr->bitrate_peak; > - > - ptype = HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE; > - brate.bitrate = bitrate; > - brate.layer_id = 0; > - > - ret = hfi_session_set_property(inst, ptype, &brate); > - if (ret) > - return ret; > - > ptype = HFI_PROPERTY_PARAM_VENC_SESSION_QP; > if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) { > quant.qp_i = ctr->hevc_i_qp; > diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c > index 3e1f6f26eddf..e340783a4ef2 100644 > --- a/drivers/media/platform/qcom/venus/venc_ctrls.c > +++ b/drivers/media/platform/qcom/venus/venc_ctrls.c > @@ -346,6 +346,55 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) > > ctr->h264_8x8_transform = ctrl->val; > break; > + case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE: > + if (ctrl->val != V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P) > + return -EINVAL; > + break; > + case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING: > + ctr->layer_bitrate = ctrl->val; > + break; > + case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER: > + if (ctrl->val > VIDC_MAX_HIER_CODING_LAYER) > + return -EINVAL; > + ctr->h264_hier_layers = ctrl->val; > + break; > + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L0_BR: > + ctr->h264_hier_layer_bitrate[0] = ctrl->val; > + ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[0], 0); > + if (ret) > + return ret; > + break; > + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR: > + ctr->h264_hier_layer_bitrate[1] = ctrl->val; > + ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[1], 1); > + if (ret) > + return ret; > + break; > + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR: > + ctr->h264_hier_layer_bitrate[2] = ctrl->val; > + ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[2], 2); > + if (ret) > + return ret; > + break; > + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR: > + ctr->h264_hier_layer_bitrate[3] = ctrl->val; > + ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[3], 3); > + if (ret) > + return ret; > + break; > + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR: > + ctr->h264_hier_layer_bitrate[4] = ctrl->val; > + ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[4], 4); > + if (ret) > + return ret; > + break; > + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR: > + ctr->h264_hier_layer_bitrate[5] = ctrl->val; > + ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[5], 5); > + if (ret) > + return ret; > + break; > + > default: > return -EINVAL; > } > @@ -628,6 +677,49 @@ int venc_ctrl_init(struct venus_inst *inst) > V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD, 0, > ((4096 * 2304) >> 8), 1, 0); > > + if (IS_V4(inst->core) || IS_V6(inst->core)) { > + v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE, > + V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P, > + 1, V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P); > + > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING, 0, 1, 1, 0); > + > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER, 0, > + VIDC_MAX_HIER_CODING_LAYER, 1, 0); > + > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L0_BR, > + BITRATE_MIN, BITRATE_MAX, BITRATE_STEP, BITRATE_DEFAULT); > + > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR, > + BITRATE_MIN, BITRATE_MAX, > + BITRATE_STEP, BITRATE_DEFAULT); > + > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR, > + BITRATE_MIN, BITRATE_MAX, > + BITRATE_STEP, BITRATE_DEFAULT); > + > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR, > + BITRATE_MIN, BITRATE_MAX, > + BITRATE_STEP, BITRATE_DEFAULT); > + > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR, > + BITRATE_MIN, BITRATE_MAX, > + BITRATE_STEP, BITRATE_DEFAULT); > + > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops, > + V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR, > + BITRATE_MIN, BITRATE_MAX, > + BITRATE_STEP, BITRATE_DEFAULT); > + } > + > ret = inst->ctrl_handler.error; > if (ret) > goto err; >