From: Michael Tretter <m.tretter@pengutronix.de>
To: Ricardo Ribalda <ribalda@chromium.org>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Michal Simek <michal.simek@amd.com>,
Andy Walls <awalls@md.metrocast.net>,
Stanimir Varbanov <stanimir.k.varbanov@gmail.com>,
Vikash Garodia <quic_vgarodia@quicinc.com>,
Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-arm-msm@vger.kernel.org,
Hans Verkuil <hverkuil-cisco@xs4all.nl>
Subject: Re: [PATCH v2 01/18] media: allegro: nal-hevc: Refactor nal_hevc_sub_layer_hrd_parameters
Date: Wed, 8 May 2024 10:53:27 +0200 [thread overview]
Message-ID: <Zjs9h40l9gfaiOei@pengutronix.de> (raw)
In-Reply-To: <20240507-cocci-flexarray-v2-1-7aea262cf065@chromium.org>
On Tue, 07 May 2024 16:27:06 +0000, Ricardo Ribalda wrote:
> Replace all the single elements arrays with the element itself.
>
> Pahole shows the same padding and alignment for x86 and arm in both
> situations.
>
> This fixes this cocci warning:
> drivers/media/platform/allegro-dvt/nal-hevc.h:102:14-22: WARNING use flexible-array member instead (https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays)
Thanks for the patch.
>
> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
> ---
> drivers/media/platform/allegro-dvt/allegro-core.c | 6 +++---
> drivers/media/platform/allegro-dvt/nal-hevc.c | 11 +++--------
> drivers/media/platform/allegro-dvt/nal-hevc.h | 6 +++---
> 3 files changed, 9 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/media/platform/allegro-dvt/allegro-core.c b/drivers/media/platform/allegro-dvt/allegro-core.c
> index da61f9beb6b4..369bd88cc0ae 100644
> --- a/drivers/media/platform/allegro-dvt/allegro-core.c
> +++ b/drivers/media/platform/allegro-dvt/allegro-core.c
> @@ -1852,14 +1852,14 @@ static ssize_t allegro_hevc_write_sps(struct allegro_channel *channel,
> hrd->dpb_output_delay_length_minus1 = 30;
>
> hrd->bit_rate_scale = ffs(channel->bitrate_peak) - 6;
> - hrd->vcl_hrd[0].bit_rate_value_minus1[0] =
> + hrd->vcl_hrd[0].bit_rate_value_minus1 =
> (channel->bitrate_peak >> (6 + hrd->bit_rate_scale)) - 1;
>
> cpb_size = v4l2_ctrl_g_ctrl(channel->mpeg_video_cpb_size) * 1000;
> hrd->cpb_size_scale = ffs(cpb_size) - 4;
> - hrd->vcl_hrd[0].cpb_size_value_minus1[0] = (cpb_size >> (4 + hrd->cpb_size_scale)) - 1;
> + hrd->vcl_hrd[0].cpb_size_value_minus1 = (cpb_size >> (4 + hrd->cpb_size_scale)) - 1;
>
> - hrd->vcl_hrd[0].cbr_flag[0] = !v4l2_ctrl_g_ctrl(channel->mpeg_video_frame_rc_enable);
> + hrd->vcl_hrd[0].cbr_flag = !v4l2_ctrl_g_ctrl(channel->mpeg_video_frame_rc_enable);
>
> size = nal_hevc_write_sps(&dev->plat_dev->dev, dest, n, sps);
>
> diff --git a/drivers/media/platform/allegro-dvt/nal-hevc.c b/drivers/media/platform/allegro-dvt/nal-hevc.c
> index 9cdf2756e0a3..575089522df5 100644
> --- a/drivers/media/platform/allegro-dvt/nal-hevc.c
> +++ b/drivers/media/platform/allegro-dvt/nal-hevc.c
> @@ -210,14 +210,9 @@ static void nal_hevc_rbsp_vps(struct rbsp *rbsp, struct nal_hevc_vps *vps)
> static void nal_hevc_rbsp_sub_layer_hrd_parameters(struct rbsp *rbsp,
> struct nal_hevc_sub_layer_hrd_parameters *hrd)
> {
> - unsigned int i;
> - unsigned int cpb_cnt = 1;
> -
> - for (i = 0; i < cpb_cnt; i++) {
> - rbsp_uev(rbsp, &hrd->bit_rate_value_minus1[i]);
> - rbsp_uev(rbsp, &hrd->cpb_size_value_minus1[i]);
> - rbsp_bit(rbsp, &hrd->cbr_flag[i]);
> - }
> + rbsp_uev(rbsp, &hrd->bit_rate_value_minus1);
> + rbsp_uev(rbsp, &hrd->cpb_size_value_minus1);
> + rbsp_bit(rbsp, &hrd->cbr_flag);
> }
>
> static void nal_hevc_rbsp_hrd_parameters(struct rbsp *rbsp,
> diff --git a/drivers/media/platform/allegro-dvt/nal-hevc.h b/drivers/media/platform/allegro-dvt/nal-hevc.h
> index eb46f12aae80..afa7a9d7d654 100644
> --- a/drivers/media/platform/allegro-dvt/nal-hevc.h
> +++ b/drivers/media/platform/allegro-dvt/nal-hevc.h
> @@ -97,9 +97,9 @@ struct nal_hevc_vps {
> };
>
> struct nal_hevc_sub_layer_hrd_parameters {
> - unsigned int bit_rate_value_minus1[1];
> - unsigned int cpb_size_value_minus1[1];
> - unsigned int cbr_flag[1];
> + unsigned int bit_rate_value_minus1;
> + unsigned int cpb_size_value_minus1;
> + unsigned int cbr_flag;
The struct is modeled after the specification in ITU-T H.265, which
defines the fields as arrays. It's a limitation of the current
implementation that only a single element is supported.
Maybe replacing the hard coded values with a constant would be more
appropriate to document this limitation.
Michael
> };
>
> struct nal_hevc_hrd_parameters {
>
> --
> 2.45.0.rc1.225.g2a3ae87e7f-goog
>
>
next prev parent reply other threads:[~2024-05-08 8:54 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 16:27 [PATCH v2 00/18] media: Fix the last set of coccinelle warnings Ricardo Ribalda
2024-05-07 16:27 ` [PATCH v2 01/18] media: allegro: nal-hevc: Refactor nal_hevc_sub_layer_hrd_parameters Ricardo Ribalda
2024-05-08 8:53 ` Michael Tretter [this message]
2024-05-09 18:50 ` Ricardo Ribalda
2024-05-07 16:27 ` [PATCH v2 02/18] media: xilinx: Refactor struct xvip_dma Ricardo Ribalda
2024-05-07 19:34 ` Laurent Pinchart
2024-05-07 16:27 ` [PATCH v2 03/18] media: dvb-frontend/mxl5xx: Refactor struct MBIN_FILE_T Ricardo Ribalda
2024-05-07 16:27 ` [PATCH v2 04/18] media: dvb-frontend/mxl5xx: Use flex array for MBIN_SEGMENT_T Ricardo Ribalda
2024-05-07 16:27 ` [PATCH v2 05/18] media: pci: cx18: Use flex arrays for struct cx18_scb Ricardo Ribalda
2024-05-07 16:27 ` [PATCH v2 06/18] media: siano: Refactor struct sms_msg_data Ricardo Ribalda
2024-05-07 16:27 ` [PATCH v2 07/18] media: siano: Remove unused structures Ricardo Ribalda
2024-05-07 16:27 ` [PATCH v2 08/18] media: siano: Use flex arrays for sms_firmware Ricardo Ribalda
2024-05-07 16:27 ` [PATCH v2 09/18] media: venus: Remove unused structs Ricardo Ribalda
2024-05-09 23:35 ` Bryan O'Donoghue
2024-05-09 23:55 ` Bryan O'Donoghue
2024-05-22 12:28 ` Ricardo Ribalda
2024-05-07 16:27 ` [PATCH v2 10/18] media: venus: Use flex array for hfi_session_release_buffer_pkt Ricardo Ribalda
2024-05-09 23:37 ` Bryan O'Donoghue
2024-05-10 0:10 ` Bryan O'Donoghue
2024-05-22 12:54 ` Ricardo Ribalda
2024-05-07 16:27 ` [PATCH v2 11/18] media: venus: Refactor struct hfi_uncompressed_plane_info Ricardo Ribalda
2024-05-09 23:38 ` Bryan O'Donoghue
2024-05-07 16:27 ` [PATCH v2 12/18] media: venus: Refactor struct hfi_session_get_property_pkt Ricardo Ribalda
2024-05-09 23:43 ` Bryan O'Donoghue
2024-05-07 16:27 ` [PATCH v2 13/18] media: venus: Refactor struct hfi_uncompressed_format_supported Ricardo Ribalda
2024-05-09 23:56 ` Bryan O'Donoghue
2024-05-07 16:27 ` [PATCH v2 14/18] media: venus: Refactor hfi_session_empty_buffer_uncompressed_plane0_pkt Ricardo Ribalda
2024-05-09 23:58 ` Bryan O'Donoghue
2024-05-07 16:27 ` [PATCH v2 15/18] media: venus: Refactor hfi_session_empty_buffer_compressed_pkt Ricardo Ribalda
2024-05-09 23:59 ` Bryan O'Donoghue
2024-05-07 16:27 ` [PATCH v2 16/18] media: venus: Refactor hfi_sys_get_property_pkt Ricardo Ribalda
2024-05-10 0:05 ` Bryan O'Donoghue
2024-05-07 16:27 ` [PATCH v2 17/18] media: venus: Refactor hfi_session_fill_buffer_pkt Ricardo Ribalda
2024-05-10 0:06 ` Bryan O'Donoghue
2024-05-07 16:27 ` [PATCH v2 18/18] media: venus: Refactor hfi_buffer_alloc_mode_supported Ricardo Ribalda
2024-05-10 0:09 ` Bryan O'Donoghue
2024-05-22 13:03 ` Ricardo Ribalda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zjs9h40l9gfaiOei@pengutronix.de \
--to=m.tretter@pengutronix.de \
--cc=andersson@kernel.org \
--cc=awalls@md.metrocast.net \
--cc=bryan.odonoghue@linaro.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=kernel@pengutronix.de \
--cc=konrad.dybcio@linaro.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=michal.simek@amd.com \
--cc=quic_vgarodia@quicinc.com \
--cc=ribalda@chromium.org \
--cc=stanimir.k.varbanov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).