From patchwork Fri Jul 26 21:38:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fritz Koenig X-Patchwork-Id: 13743182 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8F8411C83 for ; Fri, 26 Jul 2024 21:38:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722029921; cv=none; b=DhEVpiaA7nHrxUqUW4XjDNT9DOak+Kg0TaQERpoynnrLUctBFTRAw1xugD1wTPf5Fer3FD2WcPDu0sjTOhhdjlqt1V8ZBWL0vez1Tn6ANONz55eRQgMKngOApku7D+UklIDr/Tq8i+CaGEhb/OJjhx/qKUH50V2ogFbJzpw3tdM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722029921; c=relaxed/simple; bh=7VFdmxw54KU9fz4EQl1WASZFk2FfQn25Zj9vNwaZrKg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=AptlNwBBO8b/1MF3gCgGu4DCvUacZ3QlSoqCS8QEBHNXA+Z0pcK0ZEs3GJi14iSH4d2mqn7pRq0vem3XZXBAD4b6kVNRGdaKIZjEhna/aK5mYaEse9eiup2Kr1RR1O9kb431S4izMR6yUAZqfzTNTUxfGxufYsuwFo4+bBJDiUs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=f4VGNXHo; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="f4VGNXHo" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-70d2d7e692eso1242221b3a.0 for ; Fri, 26 Jul 2024 14:38:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1722029918; x=1722634718; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Hr+j5F5xUEwSEAluUJYgrWjccakpov5FGoXsHZjNFoM=; b=f4VGNXHoASzw/DgG+yNBT4noJHMthEC7xRmQb1RzUvtNSNp1PpfJUYNj+YRri1XaHY 157teAwAlLRrTSOLJtJ48JRFZipRLPkHbeG6n15+pFWj7JLK8b6I4rY0iOZTMFoPHFHF CxH0wbmPKuHCospMwrN970xPt6tcEuifH+lnQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722029918; x=1722634718; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Hr+j5F5xUEwSEAluUJYgrWjccakpov5FGoXsHZjNFoM=; b=AfEDVnu4hWN6ExFFJ37HNqbVvFL5hv5t8ZYRD8q/nSI2QPFpTDncaH5u5UNZ2rvJva Cu6uz1S0X9dPYk8PcfjS+GXc1GIIdL417xWVkY53nZsHwpvyDesvOYK0tVl6P1lceHee 2dkPvuE2q65dlrfiV99usMoE3ovJ9QKDQPzmloLBNdpCQ7fewcnCctRzwO9GDXfkj/Wj a4rxXVyfSl4LXsufw3K5W9fknRkQRKe00VY1+IH5iccuD7MtnYHI7ngg4CmdoYrib0Ag uh4Awn0z6PKxct7N+26No1nykisJgLiOug2xWCu1D6afahOevnGLgGFpNesW/beDnwYd /+WA== X-Gm-Message-State: AOJu0YyeEbdzJm8UE1RrRAFjei3dwRppQGALtZoEuV/HqBUiifJfLwo3 G16KtOIVFSu0TMfbSUWzQ3ww3aJ9wp1h3RIVUWRc8AmRegkYfMaH+ps4/WGIcV0gH1N/LO/JblU = X-Google-Smtp-Source: AGHT+IHpE+MqzNRAUj7U4iLhxs7VR6bD6khDxZS6vpH2EYKYY09Lu9EVsvuOe1F3CZ+f0aYFRmRKdw== X-Received: by 2002:a05:6a20:c781:b0:1c4:8650:d6db with SMTP id adf61e73a8af0-1c4a14d9a44mr942187637.40.1722029918573; Fri, 26 Jul 2024 14:38:38 -0700 (PDT) Received: from localhost ([2a00:79e0:2e13:6:197c:4043:3e17:8623]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-7a9f7d6bba6sm3296309a12.9.2024.07.26.14.38.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 26 Jul 2024 14:38:38 -0700 (PDT) From: Fritz Koenig To: linux-media@vger.kernel.org Cc: mchehab@kernel.org, stanimir.k.varbanov@gmail.com, quic_vgarodia@quicinc.com, bryan.odonoghue@linaro.org, Fritz Koenig Subject: [PATCH 1/3] media: venus: Reorder encoder property setting Date: Fri, 26 Jul 2024 14:38:09 -0700 Message-ID: <20240726213811.562200-1-frkoenig@chromium.org> X-Mailer: git-send-email 2.46.0.rc1.232.g9752f9e123-goog Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Configure the generic controls before the codec specific ones. Some codec specific controls can override the generic ones. --- drivers/media/platform/qcom/venus/venc.c | 183 +++++++++++------------ 1 file changed, 91 insertions(+), 92 deletions(-) diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index 3ec2fb8d9fab..ae24de125c56 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -688,98 +688,6 @@ static int venc_set_properties(struct venus_inst *inst) if (ret) return ret; - if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264) { - struct hfi_h264_vui_timing_info info; - struct hfi_h264_entropy_control entropy; - struct hfi_h264_db_control deblock; - struct hfi_h264_8x8_transform h264_transform; - - ptype = HFI_PROPERTY_PARAM_VENC_H264_VUI_TIMING_INFO; - info.enable = 1; - info.fixed_framerate = 1; - info.time_scale = NSEC_PER_SEC; - - ret = hfi_session_set_property(inst, ptype, &info); - if (ret) - return ret; - - ptype = HFI_PROPERTY_PARAM_VENC_H264_ENTROPY_CONTROL; - entropy.entropy_mode = venc_v4l2_to_hfi( - V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE, - ctr->h264_entropy_mode); - entropy.cabac_model = HFI_H264_CABAC_MODEL_0; - - ret = hfi_session_set_property(inst, ptype, &entropy); - if (ret) - return ret; - - ptype = HFI_PROPERTY_PARAM_VENC_H264_DEBLOCK_CONTROL; - deblock.mode = venc_v4l2_to_hfi( - V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE, - ctr->h264_loop_filter_mode); - deblock.slice_alpha_offset = ctr->h264_loop_filter_alpha; - deblock.slice_beta_offset = ctr->h264_loop_filter_beta; - - ret = hfi_session_set_property(inst, ptype, &deblock); - if (ret) - return ret; - - ptype = HFI_PROPERTY_PARAM_VENC_H264_TRANSFORM_8X8; - h264_transform.enable_type = 0; - if (ctr->profile.h264 == V4L2_MPEG_VIDEO_H264_PROFILE_HIGH || - ctr->profile.h264 == V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH) - h264_transform.enable_type = ctr->h264_8x8_transform; - - ret = hfi_session_set_property(inst, ptype, &h264_transform); - if (ret) - return ret; - - } - - if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 || - inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) { - /* IDR periodicity, n: - * n = 0 - only the first I-frame is IDR frame - * n = 1 - all I-frames will be IDR frames - * n > 1 - every n-th I-frame will be IDR frame - */ - ptype = HFI_PROPERTY_CONFIG_VENC_IDR_PERIOD; - idrp.idr_period = 0; - ret = hfi_session_set_property(inst, ptype, &idrp); - if (ret) - return ret; - } - - if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC && - ctr->profile.hevc == V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10) { - struct hfi_hdr10_pq_sei hdr10; - unsigned int c; - - ptype = HFI_PROPERTY_PARAM_VENC_HDR10_PQ_SEI; - - for (c = 0; c < 3; c++) { - hdr10.mastering.display_primaries_x[c] = - ctr->mastering.display_primaries_x[c]; - hdr10.mastering.display_primaries_y[c] = - ctr->mastering.display_primaries_y[c]; - } - - hdr10.mastering.white_point_x = ctr->mastering.white_point_x; - hdr10.mastering.white_point_y = ctr->mastering.white_point_y; - hdr10.mastering.max_display_mastering_luminance = - ctr->mastering.max_display_mastering_luminance; - hdr10.mastering.min_display_mastering_luminance = - ctr->mastering.min_display_mastering_luminance; - - hdr10.cll.max_content_light = ctr->cll.max_content_light_level; - hdr10.cll.max_pic_average_light = - ctr->cll.max_pic_average_light_level; - - ret = hfi_session_set_property(inst, ptype, &hdr10); - if (ret) - return ret; - } - if (ctr->num_b_frames) { u32 max_num_b_frames = NUM_B_FRAMES_MAX; @@ -922,6 +830,97 @@ static int venc_set_properties(struct venus_inst *inst) if (ret) return ret; + if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264) { + struct hfi_h264_vui_timing_info info; + struct hfi_h264_entropy_control entropy; + struct hfi_h264_db_control deblock; + struct hfi_h264_8x8_transform h264_transform; + + ptype = HFI_PROPERTY_PARAM_VENC_H264_VUI_TIMING_INFO; + info.enable = 1; + info.fixed_framerate = 1; + info.time_scale = NSEC_PER_SEC; + + ret = hfi_session_set_property(inst, ptype, &info); + if (ret) + return ret; + + ptype = HFI_PROPERTY_PARAM_VENC_H264_ENTROPY_CONTROL; + entropy.entropy_mode = venc_v4l2_to_hfi( + V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE, + ctr->h264_entropy_mode); + entropy.cabac_model = HFI_H264_CABAC_MODEL_0; + + ret = hfi_session_set_property(inst, ptype, &entropy); + if (ret) + return ret; + + ptype = HFI_PROPERTY_PARAM_VENC_H264_DEBLOCK_CONTROL; + deblock.mode = venc_v4l2_to_hfi( + V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE, + ctr->h264_loop_filter_mode); + deblock.slice_alpha_offset = ctr->h264_loop_filter_alpha; + deblock.slice_beta_offset = ctr->h264_loop_filter_beta; + + ret = hfi_session_set_property(inst, ptype, &deblock); + if (ret) + return ret; + + ptype = HFI_PROPERTY_PARAM_VENC_H264_TRANSFORM_8X8; + h264_transform.enable_type = 0; + if (ctr->profile.h264 == V4L2_MPEG_VIDEO_H264_PROFILE_HIGH || + ctr->profile.h264 == V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH) + h264_transform.enable_type = ctr->h264_8x8_transform; + + ret = hfi_session_set_property(inst, ptype, &h264_transform); + if (ret) + return ret; + } + + if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 || + inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) { + /* IDR periodicity, n: + * n = 0 - only the first I-frame is IDR frame + * n = 1 - all I-frames will be IDR frames + * n > 1 - every n-th I-frame will be IDR frame + */ + ptype = HFI_PROPERTY_CONFIG_VENC_IDR_PERIOD; + idrp.idr_period = 0; + ret = hfi_session_set_property(inst, ptype, &idrp); + if (ret) + return ret; + } + + if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC && + ctr->profile.hevc == V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10) { + struct hfi_hdr10_pq_sei hdr10; + unsigned int c; + + ptype = HFI_PROPERTY_PARAM_VENC_HDR10_PQ_SEI; + + for (c = 0; c < 3; c++) { + hdr10.mastering.display_primaries_x[c] = + ctr->mastering.display_primaries_x[c]; + hdr10.mastering.display_primaries_y[c] = + ctr->mastering.display_primaries_y[c]; + } + + hdr10.mastering.white_point_x = ctr->mastering.white_point_x; + hdr10.mastering.white_point_y = ctr->mastering.white_point_y; + hdr10.mastering.max_display_mastering_luminance = + ctr->mastering.max_display_mastering_luminance; + hdr10.mastering.min_display_mastering_luminance = + ctr->mastering.min_display_mastering_luminance; + + hdr10.cll.max_content_light = ctr->cll.max_content_light_level; + hdr10.cll.max_pic_average_light = + ctr->cll.max_pic_average_light_level; + + ret = hfi_session_set_property(inst, ptype, &hdr10); + if (ret) + return ret; + } + switch (inst->hfi_codec) { case HFI_VIDEO_CODEC_H264: profile = ctr->profile.h264; From patchwork Fri Jul 26 21:38:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fritz Koenig X-Patchwork-Id: 13743183 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86E0D38F82 for ; Fri, 26 Jul 2024 21:38:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722029921; cv=none; b=gnxf9mo8sUB8pEpSBo18Tgw/p8ffNOKMFJYcVowbjGRv22iJn+uEz2sKoN0UlFeKTaFIkJDZcusA/ewweDQbr9ydLtB1HO0jMb2neQY4mU9q5ED+15f0L7xfAN4a+auFTrR8tondYhrk4/pIy04IDRc75UoTTD8CdJNDyhv/sIg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722029921; c=relaxed/simple; bh=pV2TBQaGdixjGwH+oJG3YzX7SlTJCkTxalTLk8WhOYc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DUR1dUfYqsGKUc8N5MzJojJLNoNvODawXPXbV7pWqBm5u3YlR3Ht35yUnJIaBCh7YcGsKSNXL4Dqd8dntxGycnggVFYgtbISdXvsAEsT1YMuqvxWPnuJIqZvHHM5QiVA3XarBC3HAsftObrEyAwjT1LZRH3wKmXp1CHvbrSZ1sE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=Ys3O3a3J; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Ys3O3a3J" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1fc491f9b55so10780765ad.3 for ; Fri, 26 Jul 2024 14:38:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1722029919; x=1722634719; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VjVld0ybdTG4WIhOEqYa1EWntc1VB2xqhtGCedFQD6I=; b=Ys3O3a3JxfJdoI86+DvA2cM1JQ500YtRP46G6YE76XoHCI5bp8QdwXiS+gx4v98g7Q 8qR9ZxBHD7ziHVRgcnYsoIhZ8LnoAsRLJEf+ONpT2Ps+YnBBtOjQCZp6a6J7aggF9q5T +A5486c8NAuo9WNow7523kroby6YEcTaGZAo8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722029919; x=1722634719; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VjVld0ybdTG4WIhOEqYa1EWntc1VB2xqhtGCedFQD6I=; b=gd0JXdc70+EJeFWIQwHxYcfdIN5JVWK3+nZfqLSII96JPJzAwImGVm67eN0hvyHXeO uRdGLDzAgq/033M8DQIT5cVyUGA/3Q8Yy7lTfvQDDof4IrfIPMgbog4PwPtFfofFN+oB BaFQn3sB1y8Sej1E2/CTS4uCU52reA/KNV44Zq+fnQP7xdSmOATEOp6TAJ85g9bE13kq sZKqihyJY1nTa+ZiYrFivr7BI6rRiJnth0coMxbWSuGjvSMsouv90i1eQKtfdtFhX/N7 d93L7ZkGyu7cGFtChJ5N5Y1HZe7iy4HV8BMo9CSK65gLOp1pUSjm+LN32zAgFcKY7oKk 7KmQ== X-Gm-Message-State: AOJu0Yw5m3kpmw1aYo22pWiy01lUdALWSbmxV1GqNvmNp6gp+7+yMnJ5 8LBPNPDSHNfHzHe0H1Uo/Xh6V9U9x3IL7ZyFe/wpJo4Wla22xF16lnKDMZZVm2IIYLKa+HflLMQ = X-Google-Smtp-Source: AGHT+IHWUhU9eDGdSJ9r+tpRvnH1GFfWwvX/T6MGDiUAYQ4RyyFBlqV4iFu++AiHQ0dea19upUm6vQ== X-Received: by 2002:a17:902:e805:b0:1fa:7e0:d69a with SMTP id d9443c01a7336-1ff048e228bmr10698445ad.46.1722029919528; Fri, 26 Jul 2024 14:38:39 -0700 (PDT) Received: from localhost ([2a00:79e0:2e13:6:197c:4043:3e17:8623]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-1fed7ee2f21sm37597325ad.154.2024.07.26.14.38.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 26 Jul 2024 14:38:39 -0700 (PDT) From: Fritz Koenig To: linux-media@vger.kernel.org Cc: mchehab@kernel.org, stanimir.k.varbanov@gmail.com, quic_vgarodia@quicinc.com, bryan.odonoghue@linaro.org, Fritz Koenig Subject: [PATCH 2/3] media: venus: Helper function for dynamically updating bitrate Date: Fri, 26 Jul 2024 14:38:10 -0700 Message-ID: <20240726213811.562200-2-frkoenig@chromium.org> X-Mailer: git-send-email 2.46.0.rc1.232.g9752f9e123-goog In-Reply-To: <20240726213811.562200-1-frkoenig@chromium.org> References: <20240726213811.562200-1-frkoenig@chromium.org> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- .../media/platform/qcom/venus/venc_ctrls.c | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c index d9d2a293f3ef..6304cc97d37f 100644 --- a/drivers/media/platform/qcom/venus/venc_ctrls.c +++ b/drivers/media/platform/qcom/venus/venc_ctrls.c @@ -67,12 +67,27 @@ static int venc_calc_bpframes(u32 gop_size, u32 conseq_b, u32 *bf, u32 *pf) return 0; } +static int dynamic_bitrate_update(struct venus_inst *inst, u32 bitrate, + u32 layer_id) +{ + int ret = 0; + mutex_lock(&inst->lock); + if (inst->streamon_out && inst->streamon_cap) { + u32 ptype = HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE; + struct hfi_bitrate brate = { .bitrate = bitrate, .layer_id = layer_id }; + + ret = hfi_session_set_property(inst, ptype, &brate); + } + mutex_unlock(&inst->lock); + + return ret; +} + static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) { struct venus_inst *inst = ctrl_to_inst(ctrl); struct venc_controls *ctr = &inst->controls.enc; struct hfi_enable en = { .enable = 1 }; - struct hfi_bitrate brate; struct hfi_ltr_use ltr_use; struct hfi_ltr_mark ltr_mark; u32 bframes; @@ -85,19 +100,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) break; case V4L2_CID_MPEG_VIDEO_BITRATE: ctr->bitrate = ctrl->val; - mutex_lock(&inst->lock); - if (inst->streamon_out && inst->streamon_cap) { - ptype = HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE; - brate.bitrate = ctr->bitrate; - brate.layer_id = 0; - - ret = hfi_session_set_property(inst, ptype, &brate); - if (ret) { - mutex_unlock(&inst->lock); - return ret; - } - } - mutex_unlock(&inst->lock); + ret = dynamic_bitrate_update(inst, ctr->bitrate, 0); + if (ret) + return ret; break; case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK: ctr->bitrate_peak = ctrl->val; From patchwork Fri Jul 26 21:38:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fritz Koenig X-Patchwork-Id: 13743184 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7EBC9149E06 for ; Fri, 26 Jul 2024 21:38:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722029923; cv=none; b=eq7sJHcoqvp8taynI3t6ClshIl5dPTNuc9N2MBdVk4gBGiOdjL2KbHbGHYWnTsl/xGop/M/LG14Gtvz1cxcG7sxvPRusde/R1OXmRQGozp/60cvf68xKArehbW8cqJL2YmI3NMwj3fD2ZGobxuy7GPVok0s07NUHVgDBKzA+M7M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722029923; c=relaxed/simple; bh=oyisSSqjsyiYhbYGeEMUn3BJQQHTE4nG01oaTApJn3c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uPvBSpSQH55UP3kVbX8mNlzYR9frzqTNAtIXZj87LrivgsgoYRTCHIsbTIQFV6rg/R6OuvhH1WVvqcwTOZKNZzwA+Yo4DrjxQgJmDPuJkVv++wJ4hXN0kFBhYgpfOc3fYCYMyPdteTE4riRh2euUrqqMOE0Lrh/tx9oYZ5XnGh8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=jwGHbmAT; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="jwGHbmAT" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1fd66cddd07so9459035ad.2 for ; Fri, 26 Jul 2024 14:38:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1722029920; x=1722634720; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BUFb5p7xsncnTrsEyvWD9gJY6IYJ7AW5CoZA5iMZA8Q=; b=jwGHbmATalE5GykP4aa+3WlsarQCknbnRkF0qfcTaSY9Kjqaxh2epTsgijDfRrpOvq 80+SciJdjzz+GPYTBvEmH9CT0N+67V2g9GKUbBvPpxgVXCmuBJXTpeCca1+mWP1MXcwP WByTv4hzI4ne4RIo9JQm8ZO+zPjq7TwRRHWns= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722029920; x=1722634720; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BUFb5p7xsncnTrsEyvWD9gJY6IYJ7AW5CoZA5iMZA8Q=; b=phX/z2HrxhnKq1VbognHEpXHVw7QtVfOsJEyJRybQxYfM3XX8jRkamD2yO2sDOF6iB OxMkXfusASW2TnETxwKEZaqMhpmNPL2BHqmPSSOHgF7rMbZY6j54zZequNJWw2QifMzu QWQ6jW/LoAfCDseXhAH05DRGfjAvRRxTOOrennBTCqrM5lG6OgT27x4njP/EztItWOKz KbO2pemnbMwEhjDnrZ7hFnM1yaamOu1A161nbw81iNRHpqGM3IuduwbCdU/NG00Ir9NF EkWnd94gqqZ9g2/YesyaZuCb1KYUMhg7idn7GDAsm0bH+BU3R98yjaNk5zgpsVEr938h ZNPA== X-Gm-Message-State: AOJu0YyTySXXEJUPSv2vn5wNHFF2iF4r7+mkPIVegxWHCSEZV+JZb59e cpY4gpMwOBzKw7KEr9BXsBQ8WC1uW+z1+aqwgRxRVlxHb3NFTnNFLmRvoUpM6H4xFfCPCjqJwFA = X-Google-Smtp-Source: AGHT+IHInaevswBW/hxFYzTUIYY3pDt/FWfo09exeE3UnUjWXntfrdlBfaOVJUD8piA38iPjjKwf9g== X-Received: by 2002:a17:902:e847:b0:1fd:82fa:dfc2 with SMTP id d9443c01a7336-1ff048e58b7mr10762795ad.50.1722029920487; Fri, 26 Jul 2024 14:38:40 -0700 (PDT) Received: from localhost ([2a00:79e0:2e13:6:197c:4043:3e17:8623]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-1fed7fcb33dsm37467045ad.281.2024.07.26.14.38.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 26 Jul 2024 14:38:40 -0700 (PDT) From: Fritz Koenig To: linux-media@vger.kernel.org Cc: mchehab@kernel.org, stanimir.k.varbanov@gmail.com, quic_vgarodia@quicinc.com, bryan.odonoghue@linaro.org, Fritz Koenig Subject: [PATCH 3/3] media: venus: Enable h.264 hierarchical coding Date: Fri, 26 Jul 2024 14:38:11 -0700 Message-ID: <20240726213811.562200-3-frkoenig@chromium.org> X-Mailer: git-send-email 2.46.0.rc1.232.g9752f9e123-goog In-Reply-To: <20240726213811.562200-1-frkoenig@chromium.org> References: <20240726213811.562200-1-frkoenig@chromium.org> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 HFI already supports, V4L2 already has the control, put them together! --- drivers/media/platform/qcom/venus/core.h | 4 + drivers/media/platform/qcom/venus/venc.c | 24 ++++++ .../media/platform/qcom/venus/venc_ctrls.c | 84 +++++++++++++++++++ 3 files changed, 112 insertions(+) diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index 55202b89e1b9..fc9552311a71 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -274,6 +274,10 @@ struct venc_controls { s32 h264_loop_filter_beta; u32 h264_8x8_transform; + u32 h264_hier_enabled; + u32 h264_hier_p_layers; + u32 h264_hier_p_bitrate[6]; + u32 hevc_i_qp; u32 hevc_p_qp; u32 hevc_b_qp; diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index ae24de125c56..301b0015b356 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -875,6 +875,30 @@ static int venc_set_properties(struct venus_inst *inst) ret = hfi_session_set_property(inst, ptype, &h264_transform); if (ret) return ret; + + if (ctr->h264_hier_enabled) { + unsigned int i; + + ptype = HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER; + ret = hfi_session_set_property(inst, ptype, &ctr->h264_hier_p_layers); + if (ret) + return ret; + + ptype = HFI_PROPERTY_CONFIG_VENC_HIER_P_ENH_LAYER; + ret = hfi_session_set_property(inst, ptype, &ctr->h264_hier_p_layers); + if (ret) + return ret; + + for (i = 0; i < ctr->h264_hier_p_layers; ++i) { + ptype = HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE; + brate.bitrate = ctr->h264_hier_p_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 || diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c index 6304cc97d37f..4cad8058339a 100644 --- a/drivers/media/platform/qcom/venus/venc_ctrls.c +++ b/drivers/media/platform/qcom/venus/venc_ctrls.c @@ -345,6 +345,52 @@ 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->h264_hier_enabled = ctrl->val; + break; + case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER: + ctr->h264_hier_p_layers = ctrl->val; + break; + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L0_BR: + ctr->h264_hier_p_bitrate[0] = ctrl->val; + ret = dynamic_bitrate_update(inst, ctr->h264_hier_p_bitrate[0], 0); + if (ret) + return ret; + break; + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR: + ctr->h264_hier_p_bitrate[1] = ctrl->val; + ret = dynamic_bitrate_update(inst, ctr->h264_hier_p_bitrate[1], 1); + if (ret) + return ret; + break; + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR: + ctr->h264_hier_p_bitrate[2] = ctrl->val; + ret = dynamic_bitrate_update(inst, ctr->h264_hier_p_bitrate[2], 2); + if (ret) + return ret; + break; + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR: + ctr->h264_hier_p_bitrate[3] = ctrl->val; + ret = dynamic_bitrate_update(inst, ctr->h264_hier_p_bitrate[3], 3); + if (ret) + return ret; + break; + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR: + ctr->h264_hier_p_bitrate[4] = ctrl->val; + ret = dynamic_bitrate_update(inst, ctr->h264_hier_p_bitrate[4], 4); + if (ret) + return ret; + break; + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR: + ctr->h264_hier_p_bitrate[5] = ctrl->val; + ret = dynamic_bitrate_update(inst, ctr->h264_hier_p_bitrate[5], 5); + if (ret) + return ret; + break; default: return -EINVAL; } @@ -627,6 +673,44 @@ 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, + 6, 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;