mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Hans Verkuil <hverkuil@xs4all.nl>
To: Nicolas Dufresne <nicolas.dufresne@collabora.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: kernel@collabora.com, linux-kernel@vger.kernel.org,
	Sebastian Fricke <sebastian.fricke@collabora.com>,
	linux-media@vger.kernel.org
Subject: Re: [PATCH v3 11/24] media: v4l2: Reorder field reflist
Date: Fri, 22 Apr 2022 09:31:57 +0200	[thread overview]
Message-ID: <43bba7a4-4eae-9e36-a1ae-60e3ffe30491@xs4all.nl> (raw)
In-Reply-To: <20220405204426.259074-12-nicolas.dufresne@collabora.com>

On 05/04/2022 22:44, Nicolas Dufresne wrote:
> As per spec, the field reflist requires interleaving top and bottom
> field in a specific way that does not fit inside the sort operation.
> The process consist of alternating references parity, starting with
> a reference of the same parity as the current picture. This
> processs is done twice, once for short term references and a second
> time for the long term references.
> 
> Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> Reviewed-by: Sebastian Fricke <sebastian.fricke@collabora.com>
> ---
>  drivers/media/v4l2-core/v4l2-h264.c | 42 +++++++++++++++++++++++++++++
>  1 file changed, 42 insertions(+)
> 
> diff --git a/drivers/media/v4l2-core/v4l2-h264.c b/drivers/media/v4l2-core/v4l2-h264.c
> index 7e1eba03099a..d2d1f3bed7e8 100644
> --- a/drivers/media/v4l2-core/v4l2-h264.c
> +++ b/drivers/media/v4l2-core/v4l2-h264.c
> @@ -244,6 +244,40 @@ static int v4l2_h264_b1_ref_list_cmp(const void *ptra, const void *ptrb,
>  	return poca < pocb ? -1 : 1;
>  }
>  
> +/*
> + * The references need to be reordered so that references are alternating
> + * between top and bottom field references starting with the current picture
> + * parity. This has to be * done for short term and long term references
                             ^
Spurious *.

Regards,

	Hans

> + * separately.
> + */
> +static void reorder_field_reflist(const struct v4l2_h264_reflist_builder *b,
> +				  struct v4l2_h264_reference *reflist)
> +{
> +	struct v4l2_h264_reference tmplist[V4L2_H264_REF_LIST_LEN];
> +	u8 lt, i = 0, j = 0, k = 0;
> +
> +	memcpy(tmplist, reflist, sizeof(tmplist[0]) * b->num_valid);
> +
> +	for (lt = 0; lt <= 1; lt++) {
> +		do {
> +			for (; i < b->num_valid && b->refs[tmplist[i].index].longterm == lt; i++) {
> +				if (tmplist[i].fields == b->cur_pic_fields) {
> +					reflist[k++] = tmplist[i++];
> +					break;
> +				}
> +			}
> +
> +			for (; j < b->num_valid && b->refs[tmplist[j].index].longterm == lt; j++) {
> +				if (tmplist[j].fields != b->cur_pic_fields) {
> +					reflist[k++] = tmplist[j++];
> +					break;
> +				}
> +			}
> +		} while ((i < b->num_valid && b->refs[tmplist[i].index].longterm == lt) ||
> +			 (j < b->num_valid && b->refs[tmplist[j].index].longterm == lt));
> +	}
> +}
> +
>  static char ref_type_to_char (u8 ref_type)
>  {
>  	switch (ref_type) {
> @@ -346,6 +380,9 @@ v4l2_h264_build_p_ref_list(const struct v4l2_h264_reflist_builder *builder,
>  	sort_r(reflist, builder->num_valid, sizeof(*reflist),
>  	       v4l2_h264_p_ref_list_cmp, NULL, builder);
>  
> +	if (builder->cur_pic_fields != V4L2_H264_FRAME_REF)
> +		reorder_field_reflist(builder, reflist);
> +
>  	print_ref_list_p(builder, reflist);
>  }
>  EXPORT_SYMBOL_GPL(v4l2_h264_build_p_ref_list);
> @@ -379,6 +416,11 @@ v4l2_h264_build_b_ref_lists(const struct v4l2_h264_reflist_builder *builder,
>  	sort_r(b1_reflist, builder->num_valid, sizeof(*b1_reflist),
>  	       v4l2_h264_b1_ref_list_cmp, NULL, builder);
>  
> +	if (builder->cur_pic_fields != V4L2_H264_FRAME_REF) {
> +		reorder_field_reflist(builder, b0_reflist);
> +		reorder_field_reflist(builder, b1_reflist);
> +	}
> +
>  	if (builder->num_valid > 1 &&
>  	    !memcmp(b1_reflist, b0_reflist, builder->num_valid))
>  		swap(b1_reflist[0], b1_reflist[1]);


  reply	other threads:[~2022-04-22  7:32 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-05 20:44 [PATCH v3 00/24] H.264 Field Decoding Support for Frame-based Decoders Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 01/24] media: doc: Document dual use of H.264 pic_num/frame_num Nicolas Dufresne
2022-04-22  6:31   ` Hans Verkuil
2022-04-05 20:44 ` [PATCH v3 02/24] media: v4l2-mem2mem: Trace on implicit un-hold Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 03/24] media: videobuf2-v4l2: Warn on holding buffers without support Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 04/24] media: h264: Avoid wrapping long_term_frame_idx Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 05/24] media: h264: Use v4l2_h264_reference for reflist Nicolas Dufresne
2022-04-22  5:42   ` Hans Verkuil
2022-04-22 15:23     ` Nicolas Dufresne
2022-04-22  6:59   ` Hans Verkuil
2022-04-22 14:44     ` Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 06/24] media: h264: Increase reference lists size to 32 Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 07/24] media: h264: Store current picture fields Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 08/24] media: h264: Store all fields into the unordered list Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 09/24] media: v4l2: Trace calculated p/b0/b1 initial reflist Nicolas Dufresne
2022-04-22  7:26   ` Hans Verkuil
2022-04-22 14:58     ` Nicolas Dufresne
2022-04-22 16:33       ` Hans Verkuil
2022-04-05 20:44 ` [PATCH v3 10/24] media: h264: Sort p/b reflist using frame_num Nicolas Dufresne
2022-04-22  7:29   ` Hans Verkuil
2022-04-05 20:44 ` [PATCH v3 11/24] media: v4l2: Reorder field reflist Nicolas Dufresne
2022-04-22  7:31   ` Hans Verkuil [this message]
2022-04-05 20:44 ` [PATCH v3 12/24] media: rkvdec: Stop overclocking the decoder Nicolas Dufresne
2022-04-22  7:33   ` Hans Verkuil
2022-04-05 20:44 ` [PATCH v3 13/24] media: rkvdec: h264: Fix dpb_valid implementation Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 14/24] media: rkvdec: h264: Fix bit depth wrap in pps packet Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 15/24] media: rkvdec: Move H264 SPS validation in rkvdec-h264 Nicolas Dufresne
2022-04-06  5:17   ` Ezequiel Garcia
2022-04-22  7:36   ` Hans Verkuil
2022-04-05 20:44 ` [PATCH v3 16/24] media: rkvdec: h264: Validate and use pic width and height in mbs Nicolas Dufresne
2022-04-06 13:10   ` Nicolas Dufresne
2022-04-06 13:12   ` Ezequiel Garcia
2022-04-22  7:39   ` Hans Verkuil
2022-04-05 20:44 ` [PATCH v3 17/24] media: rkvdec: h264: Fix reference frame_num wrap for second field Nicolas Dufresne
2022-04-22  7:43   ` Hans Verkuil
2022-04-25 18:55     ` Nicolas Dufresne
2022-04-25 19:00       ` Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 18/24] media: rkvdec: Ensure decoded resolution fit coded resolution Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 19/24] media: rkvdec-h264: Add field decoding support Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 20/24] media: rkvdec: Enable capture buffer holding for H264 Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 21/24] media: hantro: Stop using H.264 parameter pic_num Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 22/24] media: hantro: h264: Make dpb entry management more robust Nicolas Dufresne
2022-04-05 20:44 ` [PATCH v3 23/24] media: hantro: Add H.264 field decoding support Nicolas Dufresne
2022-04-22  7:49   ` Hans Verkuil
2022-04-05 20:44 ` [PATCH v3 24/24] media: hantro: Enable HOLD_CAPTURE_BUF for H.264 Nicolas Dufresne
2022-04-06 17:58 ` [PATCH v3 00/24] H.264 Field Decoding Support for Frame-based Decoders Nicolas Dufresne

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=43bba7a4-4eae-9e36-a1ae-60e3ffe30491@xs4all.nl \
    --to=hverkuil@xs4all.nl \
    --cc=kernel@collabora.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=nicolas.dufresne@collabora.com \
    --cc=sebastian.fricke@collabora.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

all inboxes | Powered by JetHome®