From: Benjamin Gaignard <benjamin.gaignard@collabora.com>
To: Nicolas Dufresne <nicolas.dufresne@collabora.com>,
mchehab@kernel.org, hverkuil@xs4all.nl,
ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de,
gregkh@linuxfoundation.org, mripard@kernel.org,
paul.kocialkowski@bootlin.com, wens@csie.org,
jernej.skrabec@gmail.com, samuel@sholland.org
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-rockchip@lists.infradead.org,
linux-staging@lists.linux.dev,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev, sebastian.fricke@collabora.com
Subject: Re: [PATCH v5 06/17] media: uapi: HEVC: Change pic_order_cnt definition in v4l2_hevc_dpb_entry
Date: Fri, 8 Apr 2022 09:10:13 +0200 [thread overview]
Message-ID: <a7c4a405-faf8-c02b-d9af-f6566725c5a2@collabora.com> (raw)
In-Reply-To: <b137de92ea0a6ecc3aa8ff39f6a1fc96b071b3e4.camel@collabora.com>
Le 07/04/2022 à 22:51, Nicolas Dufresne a écrit :
> Le jeudi 07 avril 2022 à 17:29 +0200, Benjamin Gaignard a écrit :
>> HEVC specifications say that:
>> "PicOrderCntVal is derived as follows:
>> PicOrderCntVal = PicOrderCntMsb + slice_pic_order_cnt_lsb
>> The value of PicOrderCntVal shall be in the range of −231 to 231 − 1, inclusive."
> Did you mean 2^31 ?
yes it is 2^31
>> To match with these definitions change __u16 pic_order_cnt[2]
>> into __s32 pic_order_cnt_val.
>>
>> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
>> ---
>> version 5:
>> - change __u16 pic_order_cnt[2] into __s32 pic_order_cnt_val
>> drivers/staging/media/hantro/hantro_g2_hevc_dec.c | 4 ++--
>> drivers/staging/media/hantro/hantro_hevc.c | 2 +-
>> drivers/staging/media/hantro/hantro_hw.h | 4 ++--
>> drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 4 ++--
>> include/media/hevc-ctrls.h | 2 +-
>> 5 files changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/staging/media/hantro/hantro_g2_hevc_dec.c b/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
>> index c524af41baf5..6f3c774aa3d9 100644
>> --- a/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
>> +++ b/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
>> @@ -386,7 +386,7 @@ static int set_ref(struct hantro_ctx *ctx)
>> * pic_order_cnt[0] and ignore pic_order_cnt[1] used in field-coding.
>> */
>> for (i = 0; i < decode_params->num_active_dpb_entries && i < ARRAY_SIZE(cur_poc); i++) {
>> - char poc_diff = decode_params->pic_order_cnt_val - dpb[i].pic_order_cnt[0];
>> + char poc_diff = decode_params->pic_order_cnt_val - dpb[i].pic_order_cnt_val;
>>
>> hantro_reg_write(vpu, &cur_poc[i], poc_diff);
>> }
>> @@ -413,7 +413,7 @@ static int set_ref(struct hantro_ctx *ctx)
>> dpb_longterm_e = 0;
>> for (i = 0; i < decode_params->num_active_dpb_entries &&
>> i < (V4L2_HEVC_DPB_ENTRIES_NUM_MAX - 1); i++) {
>> - luma_addr = hantro_hevc_get_ref_buf(ctx, dpb[i].pic_order_cnt[0]);
>> + luma_addr = hantro_hevc_get_ref_buf(ctx, dpb[i].pic_order_cnt_val);
>> if (!luma_addr)
>> return -ENOMEM;
>>
>> diff --git a/drivers/staging/media/hantro/hantro_hevc.c b/drivers/staging/media/hantro/hantro_hevc.c
>> index b6ec86d03d91..fadd40768579 100644
>> --- a/drivers/staging/media/hantro/hantro_hevc.c
>> +++ b/drivers/staging/media/hantro/hantro_hevc.c
>> @@ -54,7 +54,7 @@ static void hantro_hevc_ref_init(struct hantro_ctx *ctx)
>> }
>>
>> dma_addr_t hantro_hevc_get_ref_buf(struct hantro_ctx *ctx,
>> - int poc)
>> + s32 poc)
>> {
>> struct hantro_hevc_dec_hw_ctx *hevc_dec = &ctx->hevc_dec;
>> int i;
>> diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h
>> index ed018e293ba0..a648c529662b 100644
>> --- a/drivers/staging/media/hantro/hantro_hw.h
>> +++ b/drivers/staging/media/hantro/hantro_hw.h
>> @@ -131,7 +131,7 @@ struct hantro_hevc_dec_hw_ctx {
>> struct hantro_aux_buf tile_bsd;
>> struct hantro_aux_buf ref_bufs[NUM_REF_PICTURES];
>> struct hantro_aux_buf scaling_lists;
>> - int ref_bufs_poc[NUM_REF_PICTURES];
>> + s32 ref_bufs_poc[NUM_REF_PICTURES];
> Was this strictly needed ? Isn't int always same as s32 ?
could be, but like this I'm sure it is fine in all cases
>
>> u32 ref_bufs_used;
>> struct hantro_hevc_dec_ctrls ctrls;
>> unsigned int num_tile_cols_allocated;
>> @@ -337,7 +337,7 @@ int hantro_hevc_dec_init(struct hantro_ctx *ctx);
>> void hantro_hevc_dec_exit(struct hantro_ctx *ctx);
>> int hantro_g2_hevc_dec_run(struct hantro_ctx *ctx);
>> int hantro_hevc_dec_prepare_run(struct hantro_ctx *ctx);
>> -dma_addr_t hantro_hevc_get_ref_buf(struct hantro_ctx *ctx, int poc);
>> +dma_addr_t hantro_hevc_get_ref_buf(struct hantro_ctx *ctx, s32 poc);
>> int hantro_hevc_add_ref_buf(struct hantro_ctx *ctx, int poc, dma_addr_t addr);
>> void hantro_hevc_ref_remove_unused(struct hantro_ctx *ctx);
>> size_t hantro_hevc_chroma_offset(const struct v4l2_ctrl_hevc_sps *sps);
>> diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
>> index 44f385be9f6c..d04521ffd920 100644
>> --- a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
>> +++ b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
>> @@ -143,8 +143,8 @@ static void cedrus_h265_frame_info_write_dpb(struct cedrus_ctx *ctx,
>> for (i = 0; i < num_active_dpb_entries; i++) {
>> int buffer_index = vb2_find_timestamp(vq, dpb[i].timestamp, 0);
>> u32 pic_order_cnt[2] = {
>> - dpb[i].pic_order_cnt[0],
>> - dpb[i].pic_order_cnt[1]
>> + dpb[i].pic_order_cnt_val & 0xffff,
>> + (dpb[i].pic_order_cnt_val >> 16) & 0xffff
> This is confusing, it gives the impression that pic_order_cnt_val contains TOP
> and BOTTOM field pic_order_cnt, which isn't the case. This is just the full pic
> order count value for this reference.
>
> This is confusing me, most HEVC decoder don't really know about fields. They
> will instead happily produce half height frames, and we should support this in
> the form of ALTERNATE or SEQ interlacing output.
>
> While it seems like Allwinner HW maybe support interleaved output, there I would
> not find any userland that would implement this, hence proving that it works.
> Overall, interlaced HEVC (a very niche use case) should be studied, and we
> should ensure that alternate/seq interlacing is possible, since a lot of HW will
> only offer this.
In GST code pic_order_cnt[0] and pic_order_cnt[1] had the same value so Cedrus
driver always put the same value in this register.
I haven't any clue of want the hardware expect here.
Maybe some maintainers can explain what we should set on these fields.
Benjamin
>
>> };
>>
>> cedrus_h265_frame_info_write_single(ctx, i, dpb[i].field_pic,
>> diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
>> index b3540167df9e..2812778b41f4 100644
>> --- a/include/media/hevc-ctrls.h
>> +++ b/include/media/hevc-ctrls.h
>> @@ -138,7 +138,7 @@ struct v4l2_hevc_dpb_entry {
>> __u64 timestamp;
>> __u8 flags;
>> __u8 field_pic;
>> - __u16 pic_order_cnt[2];
>> + __s32 pic_order_cnt_val;
>> __u8 padding[2];
>> };
>>
next prev parent reply other threads:[~2022-04-08 7:10 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-07 15:29 [PATCH v5 00/17] Move HEVC stateless controls out of staging Benjamin Gaignard
2022-04-07 15:29 ` [PATCH v5 01/17] videodev2.h: add V4L2_CTRL_FLAG_DYNAMIC_ARRAY Benjamin Gaignard
2022-04-07 15:29 ` [PATCH v5 02/17] v4l2-ctrls: add support for dynamically allocated arrays Benjamin Gaignard
2022-04-07 15:29 ` [PATCH v5 03/17] vivid: add dynamic array test control Benjamin Gaignard
2022-04-07 15:29 ` [PATCH v5 04/17] media: uapi: HEVC: Add missing fields in HEVC controls Benjamin Gaignard
2022-04-25 13:54 ` Sebastian Fricke
2022-04-25 16:16 ` Benjamin Gaignard
2022-04-26 7:52 ` Sebastian Fricke
2022-04-26 8:50 ` Benjamin Gaignard
2022-04-26 9:00 ` Sebastian Fricke
2022-04-07 15:29 ` [PATCH v5 05/17] media: uapi: HEVC: Rename HEVC stateless controls with STATELESS prefix Benjamin Gaignard
2022-04-07 15:29 ` [PATCH v5 06/17] media: uapi: HEVC: Change pic_order_cnt definition in v4l2_hevc_dpb_entry Benjamin Gaignard
2022-04-07 20:51 ` Nicolas Dufresne
2022-04-07 21:08 ` Nicolas Dufresne
2022-04-08 7:10 ` Benjamin Gaignard [this message]
2022-04-08 16:33 ` Nicolas Dufresne
2022-04-14 8:02 ` Benjamin Gaignard
2022-04-25 15:16 ` Sebastian Fricke
2022-04-07 15:29 ` [PATCH v5 07/17] media: uapi: HEVC: Add SEI pic struct flags Benjamin Gaignard
2022-04-25 15:24 ` Sebastian Fricke
2022-04-07 15:29 ` [PATCH v5 08/17] media: uapi: HEVC: Add document uAPI structure Benjamin Gaignard
2022-04-25 15:54 ` Sebastian Fricke
2022-04-26 7:45 ` Benjamin Gaignard
2022-04-07 15:29 ` [PATCH v5 09/17] media: uapi: HEVC: Define V4L2_CID_STATELESS_HEVC_SLICE_PARAMS as a dynamic array Benjamin Gaignard
2022-04-08 18:53 ` Nicolas Dufresne
2022-04-14 9:06 ` Benjamin Gaignard
2022-04-07 15:29 ` [PATCH v5 10/17] media: uapi: Move parsed HEVC pixel format out of staging Benjamin Gaignard
2022-04-07 15:29 ` [PATCH v5 11/17] media: uapi: Add V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS control Benjamin Gaignard
2022-04-26 8:09 ` Sebastian Fricke
2022-04-07 15:29 ` [PATCH v5 12/17] media: uapi: Move the HEVC stateless control type out of staging Benjamin Gaignard
2022-04-07 15:29 ` [PATCH v5 13/17] media: controls: Log HEVC stateless control in .std_log Benjamin Gaignard
2022-04-07 15:29 ` [PATCH v5 14/17] media: uapi: Create a dedicated header for Hantro control Benjamin Gaignard
2022-04-07 15:29 ` [PATCH v5 15/17] media: uapi: HEVC: fix padding in v4l2 control structures Benjamin Gaignard
2022-04-07 15:29 ` [PATCH v5 16/17] media: uapi: Change data_bit_offset definition Benjamin Gaignard
2022-04-26 8:15 ` Sebastian Fricke
2022-04-07 15:29 ` [PATCH v5 17/17] media: uapi: move HEVC stateless controls out of staging Benjamin Gaignard
2022-04-08 13:48 ` Sebastian Fricke
2022-04-08 13:48 ` [PATCH v5 17/17] media: uapi: move HEVC stateless controls out (FIXUP) " Sebastian Fricke
2022-04-14 9:22 ` Benjamin Gaignard
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=a7c4a405-faf8-c02b-d9af-f6566725c5a2@collabora.com \
--to=benjamin.gaignard@collabora.com \
--cc=ezequiel@vanguardiasur.com.ar \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil@xs4all.nl \
--cc=jernej.skrabec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-sunxi@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=nicolas.dufresne@collabora.com \
--cc=p.zabel@pengutronix.de \
--cc=paul.kocialkowski@bootlin.com \
--cc=samuel@sholland.org \
--cc=sebastian.fricke@collabora.com \
--cc=wens@csie.org \
/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 NNTP newsgroup(s).