From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: kernel@collabora.com, linux-media@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v1 06/24] media: v4l2: Trace calculated p/b0/b1 initial reflist
Date: Mon, 28 Mar 2022 15:59:18 -0400 [thread overview]
Message-ID: <20220328195936.82552-7-nicolas.dufresne@collabora.com> (raw)
In-Reply-To: <20220328195936.82552-1-nicolas.dufresne@collabora.com>
This is crucial in verifying that the ordering is right, specially with
more complex sorting needed for field decoding.
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
---
drivers/media/v4l2-core/v4l2-h264.c | 86 +++++++++++++++++++++++++++++
1 file changed, 86 insertions(+)
diff --git a/drivers/media/v4l2-core/v4l2-h264.c b/drivers/media/v4l2-core/v4l2-h264.c
index d5698c981973..c9e18fd51d78 100644
--- a/drivers/media/v4l2-core/v4l2-h264.c
+++ b/drivers/media/v4l2-core/v4l2-h264.c
@@ -241,6 +241,87 @@ static int v4l2_h264_b1_ref_list_cmp(const void *ptra, const void *ptrb,
return poca < pocb ? -1 : 1;
}
+static char ref_type_to_char (u8 ref_type)
+{
+ switch (ref_type) {
+ case V4L2_H264_FRAME_REF:
+ return 'f';
+ case V4L2_H264_TOP_FIELD_REF:
+ return 't';
+ case V4L2_H264_BOTTOM_FIELD_REF:
+ return 'b';
+ }
+
+ return '?';
+}
+
+static const char *format_ref_list_p(const struct v4l2_h264_reflist_builder *builder,
+ struct v4l2_h264_reference *reflist,
+ char *out_str, const int len)
+{
+ int n = 0, i;
+
+ n += snprintf(out_str + n, len - n, "|");
+
+ for (i = 0; i < builder->num_valid; i++) {
+ /* this is pic_num for frame and frame_num (wrapped) for field,
+ * but for frame pic_num is equal to frame_num (wrapped).
+ */
+ int frame_num = builder->refs[reflist[i].index].frame_num;
+ bool longterm = builder->refs[reflist[i].index].longterm;
+
+ n += scnprintf(out_str + n, len - n, "%i%c%c|",
+ frame_num, longterm ? 'l' : 's',
+ ref_type_to_char (reflist[i].fields));
+ }
+
+ return out_str;
+}
+
+static void print_ref_list_p(const struct v4l2_h264_reflist_builder *builder,
+ struct v4l2_h264_reference *reflist)
+{
+ char buf[1024];
+
+ pr_debug("ref_pic_list_p (cur_poc %u%c) %s\n",
+ builder->cur_pic_order_count,
+ ref_type_to_char(builder->cur_pic_fields),
+ format_ref_list_p(builder, reflist, buf, sizeof(buf)));
+}
+
+static const char *format_ref_list_b(const struct v4l2_h264_reflist_builder *builder,
+ struct v4l2_h264_reference *reflist,
+ char *out_str, const int len)
+{
+ int n = 0, i;
+
+ n += snprintf(out_str + n, len - n, "|");
+
+ for (i = 0; i < builder->num_valid; i++) {
+ int frame_num = builder->refs[reflist[i].index].frame_num;
+ u32 poc = v4l2_h264_get_poc(builder, reflist + i);
+ bool longterm = builder->refs[reflist[i].index].longterm;
+
+ n += scnprintf(out_str + n, len - n, "%i%c%c|",
+ longterm ? frame_num : poc,
+ longterm ? 'l' : 's',
+ ref_type_to_char(reflist[i].fields));
+ }
+
+ return out_str;
+}
+
+static void print_ref_list_b(const struct v4l2_h264_reflist_builder *builder,
+ struct v4l2_h264_reference *reflist, u8 list_num)
+{
+ char buf[1024];
+
+ pr_debug("ref_pic_list_b%u (cur_poc %u%c) %s",
+ list_num, builder->cur_pic_order_count,
+ ref_type_to_char (builder->cur_pic_fields),
+ format_ref_list_b(builder, reflist, buf, sizeof(buf)));
+}
+
/**
* v4l2_h264_build_p_ref_list() - Build the P reference list
*
@@ -261,6 +342,8 @@ v4l2_h264_build_p_ref_list(const struct v4l2_h264_reflist_builder *builder,
sizeof(builder->unordered_reflist[0]) * builder->num_valid);
sort_r(reflist, builder->num_valid, sizeof(*reflist),
v4l2_h264_p_ref_list_cmp, NULL, builder);
+
+ print_ref_list_p(builder, reflist);
}
EXPORT_SYMBOL_GPL(v4l2_h264_build_p_ref_list);
@@ -296,6 +379,9 @@ v4l2_h264_build_b_ref_lists(const struct v4l2_h264_reflist_builder *builder,
if (builder->num_valid > 1 &&
!memcmp(b1_reflist, b0_reflist, builder->num_valid))
swap(b1_reflist[0], b1_reflist[1]);
+
+ print_ref_list_b(builder, b0_reflist, 0);
+ print_ref_list_b(builder, b1_reflist, 1);
}
EXPORT_SYMBOL_GPL(v4l2_h264_build_b_ref_lists);
--
2.34.1
next prev parent reply other threads:[~2022-03-28 20:00 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-28 19:59 [PATCH v1 00/24] H.264 Field Decoding Support for Frame-based Decoders Nicolas Dufresne
2022-03-28 19:59 ` [PATCH v1 01/24] media: h264: Increase reference lists size to 32 Nicolas Dufresne
2022-03-29 8:25 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 02/24] media: doc: Document dual use of H.264 pic_num/frame_num Nicolas Dufresne
2022-03-29 8:32 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 03/24] media: h264: Avoid wrapping long_term_frame_idx Nicolas Dufresne
2022-03-29 8:35 ` Sebastian Fricke
2022-03-31 16:28 ` Nicolas Dufresne
2022-03-28 19:59 ` [PATCH v1 04/24] media: h264: Store current picture fields Nicolas Dufresne
2022-03-29 9:07 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 05/24] media: h264: Store all fields into the unordered list Nicolas Dufresne
2022-03-29 12:57 ` Sebastian Fricke
2022-03-28 19:59 ` Nicolas Dufresne [this message]
2022-03-29 15:08 ` [PATCH v1 06/24] media: v4l2: Trace calculated p/b0/b1 initial reflist Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 07/24] media: h264: Sort p/b reflist using frame_num Nicolas Dufresne
2022-03-29 13:34 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 08/24] media: v4l2: Reorder field reflist Nicolas Dufresne
2022-03-29 13:54 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 09/24] media: v4l2-mem2mem: Fix typo in trace message Nicolas Dufresne
2022-03-29 13:57 ` Sebastian Fricke
2022-03-30 14:57 ` Nicolas Dufresne
2022-03-28 19:59 ` [PATCH v1 10/24] media: v4l2-mem2mem: Trace on implicit un-hold Nicolas Dufresne
2022-03-29 13:58 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 11/24] media: videobuf2-v4l2: Warn on holding buffers without support Nicolas Dufresne
2022-03-28 19:59 ` [PATCH v1 12/24] media: rkvdec: Stop overclocking the decoder Nicolas Dufresne
2022-03-29 15:15 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 13/24] media: rkvdec: h264: Fix reference frame_num wrap for second field Nicolas Dufresne
2022-03-29 15:17 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 14/24] media: rkvdec: h264: Fix dpb_valid implementation Nicolas Dufresne
2022-03-29 15:27 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 15/24] media: rkvdec: Enable capture buffer holding for H264 Nicolas Dufresne
2022-03-29 15:34 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 16/24] media: rkvdec: Ensure decoded resolution fit coded resolution Nicolas Dufresne
2022-03-29 15:39 ` Sebastian Fricke
2022-03-30 9:06 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 17/24] media: rkvdec: h264: Validate and use pic width and height in mbs Nicolas Dufresne
2022-03-30 6:48 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 18/24] media: rkvdec: h264: Fix bit depth wrap in pps packet Nicolas Dufresne
2022-03-30 6:59 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 19/24] media: rkvdec-h264: Add field decoding support Nicolas Dufresne
2022-03-29 8:13 ` Dan Carpenter
2022-03-29 20:54 ` Nicolas Dufresne
2022-03-30 5:15 ` Dan Carpenter
2022-03-30 13:39 ` Nicolas Dufresne
2022-03-30 15:16 ` Dan Carpenter
2022-03-31 13:40 ` Nicolas Dufresne
2022-03-30 7:10 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 20/24] media: hantro: Enable HOLD_CAPTURE_BUF for H.264 Nicolas Dufresne
2022-03-30 7:36 ` Sebastian Fricke
2022-03-31 18:25 ` Nicolas Dufresne
2022-03-28 19:59 ` [PATCH v1 21/24] media: hantro: Stop using H.264 parameter pic_num Nicolas Dufresne
2022-03-30 7:42 ` Sebastian Fricke
2022-03-30 15:08 ` Nicolas Dufresne
2022-03-28 19:59 ` [PATCH v1 22/24] media: hantro: h264: Make dpb entry management more robust Nicolas Dufresne
2022-03-30 7:59 ` Sebastian Fricke
2022-03-30 15:15 ` Nicolas Dufresne
2022-03-30 23:43 ` Ezequiel Garcia
2022-03-31 6:54 ` Sebastian Fricke
2022-03-28 19:59 ` [PATCH v1 23/24] media: hantro: Add H.264 field decoding support Nicolas Dufresne
2022-03-30 9:03 ` Sebastian Fricke
2022-03-30 15:25 ` Nicolas Dufresne
2022-03-28 19:59 ` [PATCH v1 24/24] media: rkvdec-h264: Don't hardcode SPS/PPS parameters Nicolas Dufresne
2022-03-29 7:22 ` Sebastian Fricke
2022-03-30 15:27 ` 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=20220328195936.82552-7-nicolas.dufresne@collabora.com \
--to=nicolas.dufresne@collabora.com \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.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
all inboxes | Powered by JetHome®