From nobody Sun Feb 8 12:31:55 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 2565D149C43 for ; Wed, 14 Aug 2024 22:14:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723673659; cv=none; b=MQEiUVW8fX7CPS4vxGyqjyPwaYmaLXYNld2md4fsrklzSykw3MDn2mOegPax7f4JzHPlsAYKSgTMAImCYi5lSPnhL/tyyiB4gvKboyv3qf6elsCnObjL5FX2XkW2TRCl5RO8BKz5+f2iPbQKQXEmey9RQ147MCvLS1HDAed7RRw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723673659; c=relaxed/simple; bh=8gV0ItKrwqYDT8zD5KqT8goQykbTT6iJU2la2paZJck=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BfpayFzIeukIwMa84/awmefehuLtF2mK3jpn3GZmqIk9QGuk/DAgJ4qgHOez4VPcKvzoqiKgtdcda2PmxJ9GcDmTd5KKS2WFlfCwrUUmjXSlBmptTKL68VX7GGA9IIbKnC6IOVz5HSa5kByfkzfLyI4uUgCTB6Cl8b2PdDHfHNY= 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=QJ4rGgLN; arc=none smtp.client-ip=209.85.214.182 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="QJ4rGgLN" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1fc65329979so3518115ad.0 for ; Wed, 14 Aug 2024 15:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1723673655; x=1724278455; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=EXHXVreezWNC5EHxJgjqT1mvVrC/aYQyKnBr40aFpQA=; b=QJ4rGgLNsP2HfzxSxzDmW4ZRtC/RPpF/olWsIC7au7j3oYQrc00rQckCUK+qGyq/HC 2ekXkKlDcOC2vale51Ip/clnEZiXtSzGY4wAc3QjQ4lRe8E+1xMFbRx1fkzymkv1Ahkr g//HyasKlTxBUgnLloExSa6Apz/fxnMCA8w2k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723673655; x=1724278455; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EXHXVreezWNC5EHxJgjqT1mvVrC/aYQyKnBr40aFpQA=; b=OCqSjFqvo/jsAmudP1KenT++gaaN6RBeboFXynHmuhUkOQ0/sbW+gaaZdMNAZHu7hu 29xvVBKfPMbeyvtkla8smhISYjPdoDcf78o+uQWRomSYewfQVjv5ky0FQqK6SP4iI9co s+I8jaOJsDfxRbrZeYFb/BW/irIyFpldoRM6ywETs+1XDCaH3zAblsdstbtIukqbIJeV cQ/c33oVEBzzRlnPAHgdDyAPeboWTCKEAXcADKkEfwi41VSt8agjWWP5ZuP41HcVPJGs sNlYm6kf8wzcc0ajV+SBgGCBEgM32/7dQXaPkJhnDfB0Mm1RKb1ql5NSW6hDOaTX7VGr 05WQ== X-Forwarded-Encrypted: i=1; AJvYcCV5dTD4iwd7FgBfdCN7w668YYQvm5FyloOtWzoOxEicG17v08r1cKAtwyM9Vu9NOHQzCHbce5Gs8luXAZ2f1yJ44vSKdA5AgBG/9B+1 X-Gm-Message-State: AOJu0YxcnAqjJ8IKSBTHcM9cxgrtS0u8dkF/ghlAhnSEKSYYrwj9Pw72 8jX893MawGRuTd1yHgCifwpwjR0PkJt9/EEwN7/HtxwdsYuX2s5a+xtxF3c3Yw== X-Google-Smtp-Source: AGHT+IG1dLi1vpHge3g4ia/y7OQ39uKNyxTgRTDNKEiBk3r+oe9MbbtSjtb2Ij3jgSmwRLV8Zw3NBQ== X-Received: by 2002:a17:903:244e:b0:1fa:8f64:8b0d with SMTP id d9443c01a7336-201d63b3eb8mr58544065ad.4.1723673655410; Wed, 14 Aug 2024 15:14:15 -0700 (PDT) Received: from zipper.pdx.corp.google.com ([2a00:79e0:2e13:6:aab8:3da7:4601:820d]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201f0375725sm1046595ad.132.2024.08.14.15.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Aug 2024 15:14:14 -0700 (PDT) From: Fritz Koenig Date: Wed, 14 Aug 2024 15:14:04 -0700 Subject: [PATCH v3 1/2] media: venus: Helper function for dynamically updating bitrate 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: quoted-printable Message-Id: <20240814-submit-v3-1-f7d05e3e8560@chromium.org> References: <20240814-submit-v3-0-f7d05e3e8560@chromium.org> In-Reply-To: <20240814-submit-v3-0-f7d05e3e8560@chromium.org> To: Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Mauro Carvalho Chehab , Dikshita Agarwal Cc: Nathan Hebert , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Fritz Koenig X-Mailer: b4 0.13.0 Move the dynamic bitrate updating functionality to a separate function so that it can be shared. No functionality changes. Signed-off-by: Fritz Koenig Reviewed-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/venc_ctrls.c | 34 +++++++++++++++-------= ---- 1 file changed, 20 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..3e1f6f26eddf 100644 --- a/drivers/media/platform/qcom/venus/venc_ctrls.c +++ b/drivers/media/platform/qcom/venus/venc_ctrls.c @@ -67,12 +67,28 @@ static int venc_calc_bpframes(u32 gop_size, u32 conseq_= b, u32 *bf, u32 *pf) return 0; } =20 +static int dynamic_bitrate_update(struct venus_inst *inst, u32 bitrate, + u32 layer_id) +{ + int ret =3D 0; + + mutex_lock(&inst->lock); + if (inst->streamon_out && inst->streamon_cap) { + u32 ptype =3D HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE; + struct hfi_bitrate brate =3D { .bitrate =3D bitrate, .layer_id =3D layer= _id }; + + ret =3D 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 =3D ctrl_to_inst(ctrl); struct venc_controls *ctr =3D &inst->controls.enc; struct hfi_enable en =3D { .enable =3D 1 }; - struct hfi_bitrate brate; struct hfi_ltr_use ltr_use; struct hfi_ltr_mark ltr_mark; u32 bframes; @@ -85,19 +101,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) break; case V4L2_CID_MPEG_VIDEO_BITRATE: ctr->bitrate =3D ctrl->val; - mutex_lock(&inst->lock); - if (inst->streamon_out && inst->streamon_cap) { - ptype =3D HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE; - brate.bitrate =3D ctr->bitrate; - brate.layer_id =3D 0; - - ret =3D hfi_session_set_property(inst, ptype, &brate); - if (ret) { - mutex_unlock(&inst->lock); - return ret; - } - } - mutex_unlock(&inst->lock); + ret =3D dynamic_bitrate_update(inst, ctr->bitrate, 0); + if (ret) + return ret; break; case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK: ctr->bitrate_peak =3D ctrl->val; --=20 2.46.0.184.g6999bdac58-goog From nobody Sun Feb 8 12:31:55 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.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 75C40149C58 for ; Wed, 14 Aug 2024 22:14:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723673660; cv=none; b=IPK+wLnJ+88ffkGUk9rC0EhN2oopjAHf4TB0qB2aTVTB7VzDHRYLyVEUEu8ryMNi4PcyRWao5aD0Ij6L6SJ6SSC97ZQ2wHYK6/OHX0hhBbFmj35BuWN7ZV1Ld315tQYnlROz4r4fh44Fs+AgZ82MokwYHj1VfEGMp8ceFhBSwwY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723673660; c=relaxed/simple; bh=g3+1rXrVGK6e6kvEGUQXjS1eg9BCbbdzxfIWW2UBOzs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NZMBcPKh4ElfkDrpQIigiiUGEVftbShP3YQ/UpO0me1s9OF2XDwsxMuKX9Tp7/NCmojq7ZLB7drkOIplb44MfycGGgKT9S8Z6Zg/0ZK7HCGLLgb/HKyIWNzmOpbgAw6Br00juGQwrO5vHTqS2DpHJpkS271+Xe+AMvXpZ8mQVFc= 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=b0JXmDwO; arc=none smtp.client-ip=209.85.214.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="b0JXmDwO" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1fc566ac769so3287805ad.1 for ; Wed, 14 Aug 2024 15:14:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1723673657; x=1724278457; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=EIq4wNydhj/PvuoGRWZ7DkKKTJPlbKQ7LujNOleJ5eo=; b=b0JXmDwOM4+UyLSjrsKKaC6r9HP8IFWzOJaZ5hHTE+i4H/MHxz5EmToXIGJZSUJF2C CY4fC+H5/Qqa3l4l3TVBTSeImvcxr04gBwetyULzGGxCYdWCTiIDsjWKxTVQL62jmf2d L48tBHNfUbPM1DwX1npL+B+6ra5RdJtCXuiqI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723673657; x=1724278457; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EIq4wNydhj/PvuoGRWZ7DkKKTJPlbKQ7LujNOleJ5eo=; b=lz00/g2cOObWFXGVBqJodZUt9MI3KUphtT/g+sVj/soBw9zvigTzAsxe2Dk1HcFj6t jgPo7eXHiIUGcz1a5yLcvLB/PrJZ59RS3OwRQTWTLe+G0rgyn3dLv2vBcPUzaDOrSOrl mSIkR8ogoQv0PKuiFNgqEWSZijDnN+d0gEsjnrvmAkmsbJPO79n8MwKgjPO9zH5sn3dp bnkoecYvmOnTJWRV9lcIOwzWo1GNKNvj/GyXHbyWDySysT0I1RgIOk/p7kPVaYSp9ocC nRBJh5xhYBdv1WvOBjUFm/e0p6wNXZECoem7rmsFG516NNvkEkVDSYWc1h58iWPf7Bcy kMGQ== X-Forwarded-Encrypted: i=1; AJvYcCX3LxqUWOeL3aiPalg0dldSZW64QCtp6zhp7jcsi4R/ZUIEdyeatvkjRhR1j5G/pvb4CwgCPpLEbjrKcV7hGSCI2g26Vazlbgx3MaJB X-Gm-Message-State: AOJu0Yz9oeh/X336YvVtyrLx8BH1mD6RvxyLtPlvDsxJ4GMHKaSAFcH2 XTI9ejE9aKKdDtly+P6/4/3aoAt+9l9EmLLNIB5p2MF/mQpegkntyieW0V/oow== X-Google-Smtp-Source: AGHT+IF75/3P+9x6GVjTTX48CbPnzoDxgCxwnu6xe/hY2peSPXpuIomwL61xlReWeDCnp009l7PdwQ== X-Received: by 2002:a17:902:ecc3:b0:1fc:72f5:43b6 with SMTP id d9443c01a7336-201d63dcbbcmr49050035ad.20.1723673656770; Wed, 14 Aug 2024 15:14:16 -0700 (PDT) Received: from zipper.pdx.corp.google.com ([2a00:79e0:2e13:6:aab8:3da7:4601:820d]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201f0375725sm1046595ad.132.2024.08.14.15.14.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Aug 2024 15:14:15 -0700 (PDT) From: Fritz Koenig Date: Wed, 14 Aug 2024 15:14:05 -0700 Subject: [PATCH v3 2/2] media: venus: Enable h.264 hierarchical coding 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: quoted-printable Message-Id: <20240814-submit-v3-2-f7d05e3e8560@chromium.org> References: <20240814-submit-v3-0-f7d05e3e8560@chromium.org> In-Reply-To: <20240814-submit-v3-0-f7d05e3e8560@chromium.org> To: Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Mauro Carvalho Chehab , Dikshita Agarwal Cc: Nathan Hebert , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Fritz Koenig X-Mailer: b4 0.13.0 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/platf= orm/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 =20 extern int venus_fw_debug; =20 @@ -255,6 +256,7 @@ struct venc_controls { u32 rc_enable; u32 const_quality; u32 frame_skip_mode; + u32 layer_bitrate; =20 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]; =20 u32 hevc_i_qp; u32 hevc_p_qp; diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platf= orm/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; =20 + if (ctr->layer_bitrate) { + unsigned int i; + + ptype =3D HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER; + ret =3D hfi_session_set_property(inst, ptype, &ctr->h264_hier_layers); + if (ret) + return ret; + + ptype =3D HFI_PROPERTY_CONFIG_VENC_HIER_P_ENH_LAYER; + ret =3D hfi_session_set_property(inst, ptype, &ctr->layer_bitrate); + if (ret) + return ret; + + for (i =3D 0; i < ctr->h264_hier_layers; ++i) { + ptype =3D HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE; + brate.bitrate =3D ctr->h264_hier_layer_bitrate[i]; + brate.layer_id =3D i; + + ret =3D hfi_session_set_property(inst, ptype, &brate); + if (ret) + return ret; + } + } } =20 if (inst->fmt_cap->pixfmt =3D=3D V4L2_PIX_FMT_H264 || @@ -823,45 +846,47 @@ static int venc_set_properties(struct venus_inst *ins= t) return ret; } =20 - if (!ctr->bitrate) - bitrate =3D 64000; - else - bitrate =3D ctr->bitrate; + if (!ctr->layer_bitrate) { + if (!ctr->bitrate) + bitrate =3D 64000; + else + bitrate =3D ctr->bitrate; =20 - ptype =3D HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE; - brate.bitrate =3D bitrate; - brate.layer_id =3D 0; + ptype =3D HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE; + brate.bitrate =3D bitrate; + brate.layer_id =3D 0; =20 - ret =3D hfi_session_set_property(inst, ptype, &brate); - if (ret) - return ret; + ret =3D hfi_session_set_property(inst, ptype, &brate); + if (ret) + return ret; =20 - if (inst->fmt_cap->pixfmt =3D=3D V4L2_PIX_FMT_H264 || - inst->fmt_cap->pixfmt =3D=3D V4L2_PIX_FMT_HEVC) { - ptype =3D HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER; - if (ctr->header_mode =3D=3D V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE) - en.enable =3D 0; + if (inst->fmt_cap->pixfmt =3D=3D V4L2_PIX_FMT_H264 || + inst->fmt_cap->pixfmt =3D=3D V4L2_PIX_FMT_HEVC) { + ptype =3D HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER; + if (ctr->header_mode =3D=3D V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE) + en.enable =3D 0; + else + en.enable =3D 1; + + ret =3D hfi_session_set_property(inst, ptype, &en); + if (ret) + return ret; + } + + if (!ctr->bitrate_peak) + bitrate *=3D 2; else - en.enable =3D 1; + bitrate =3D ctr->bitrate_peak; =20 - ret =3D hfi_session_set_property(inst, ptype, &en); + ptype =3D HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE; + brate.bitrate =3D bitrate; + brate.layer_id =3D 0; + + ret =3D hfi_session_set_property(inst, ptype, &brate); if (ret) return ret; } =20 - if (!ctr->bitrate_peak) - bitrate *=3D 2; - else - bitrate =3D ctr->bitrate_peak; - - ptype =3D HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE; - brate.bitrate =3D bitrate; - brate.layer_id =3D 0; - - ret =3D hfi_session_set_property(inst, ptype, &brate); - if (ret) - return ret; - ptype =3D HFI_PROPERTY_PARAM_VENC_SESSION_QP; if (inst->fmt_cap->pixfmt =3D=3D V4L2_PIX_FMT_HEVC) { quant.qp_i =3D 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) =20 ctr->h264_8x8_transform =3D ctrl->val; break; + case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE: + if (ctrl->val !=3D V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P) + return -EINVAL; + break; + case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING: + ctr->layer_bitrate =3D 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 =3D ctrl->val; + break; + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L0_BR: + ctr->h264_hier_layer_bitrate[0] =3D ctrl->val; + ret =3D 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] =3D ctrl->val; + ret =3D 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] =3D ctrl->val; + ret =3D 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] =3D ctrl->val; + ret =3D 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] =3D ctrl->val; + ret =3D 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] =3D ctrl->val; + ret =3D 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); =20 + 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 =3D inst->ctrl_handler.error; if (ret) goto err; --=20 2.46.0.184.g6999bdac58-goog