[PATCH v5 06/17] media: uapi: HEVC: Change pic_order_cnt definition in v4l2_hevc_dpb_entry

[Sebastian Fricke]

Hey Benjamin,

On 07.04.2022 17:29, Benjamin Gaignard wrote:
>HEVC specifications say that:

s/HEVC specifications say that:/
   The HEVC specification describes the following:/

Greetings,
Sebastian

>"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."
>
>To match with these definitions change __u16 pic_order_cnt[2]
>into __s32 pic_order_cnt_val.
>
>Signed-off-by: Benjamin Gaignard <benjamin.gaignard at 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];
> 	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
> 		};
>
> 		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];
> };
>
>-- 
>2.32.0
>