Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp4123102ioa; Tue, 26 Apr 2022 18:00:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxuoFgtOeQQnNE8Mhu0fZHt7l1Cw87uwFB/uROw4yY3W/Gz25Lzrd9kCgQnIHILpKs8z5de X-Received: by 2002:a50:ee11:0:b0:425:b5b3:a48d with SMTP id g17-20020a50ee11000000b00425b5b3a48dmr27689420eds.246.1651021242909; Tue, 26 Apr 2022 18:00:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651021242; cv=none; d=google.com; s=arc-20160816; b=kE3nTnP2WqBcgY1VkofgV46v3OuA9J/uY8++1/zO+QVYLe+MkqriddFIztkYfeNfJT Zyyy3llVnGZxcpuUSOAfF0blMMYQn+j5+h8AxluaBtnG9FejGfCUmEI91L/8W59tPBiC fSHveepfqAwuNOemeA45ZHbtGEr/sjlB5KvSHK/LausLib2rWqJ2RvOgAlHftLGCzEl8 +94O+R6Jjj03stmcmY/DRBbQKdeZfbCCbN+x8Tz2O/MfZpyzRsdRdEVfEiPFRDCUBKQB OJuwl2RrahM5D+qLM6TlyqlTuDYDAS0KAHoG82fyNmnRmbvfTaYSH4xjK3QxyBB5HEMP Xvlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=x5jIwUZVSl6JfTjm9rUCNZzslp6IZAHAORlVkrow/lg=; b=zTeNNoAag1sQhJ2z/VbDrXI48BUe+i5cVw18KhjBsFAnaBixhzISSKkvfgJhoeUg/Z 2vZ3/eQl9Z69IN2YG19EYlX/VkPTloixcsURGm8S2kD6ruOz6ibZrOQCowvRZUsDDw65 melZ8lKnHnAeci6zdUsdIk13VKe2LNEYGpi58Oom1Zc7hONZxXRo6ZVSrnmrLolrw/Vf +qzKL6AGCfbF85jF4XlfiP0NevT5gxeLOWvKg1oVOkZ6lL3YztMaFYY7PgFiHcsbya3I 4mVaZlTq3uYn4JeX5PqkXyTH95HHJyP+eFWFgZfaesjKyoYKlat4awSJjGhBF1nAU3ke NRHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=P8KPWohh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x1-20020a05640226c100b00423da954838si187085edd.21.2022.04.26.18.00.18; Tue, 26 Apr 2022 18:00:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=P8KPWohh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350422AbiDZNBy (ORCPT + 99 others); Tue, 26 Apr 2022 09:01:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350352AbiDZNBZ (ORCPT ); Tue, 26 Apr 2022 09:01:25 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27FC317F12E; Tue, 26 Apr 2022 05:58:16 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: nicolas) with ESMTPSA id 4B5B21F43992 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1650977895; bh=dscra9aQy+OFrcD4i/Eei0e+7LpQWDlVC/URKqG2tgs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P8KPWohhHtPMfo5ZDHvEBRpE5RfRlbI8ZEfc8l5GyboDgpVkJIaiqDaqpSrmndrn+ EVE6Ha4ffWfANezr5G6auwR0yo0W3yl+9dICKCSkpkao0PLtDxd4KmJXLKN8pFZ4zy RzWRLVH0QiHXtJdUYuXDVvOc6Gg/vpNzKtMf3YYvz/tlZFpPg/CJ1TnQtgJ1xC5gv+ 1lGRvTN1P77AbyxqNyBY6phqMApzfSbB7YOCMk+sRCenCi0q6r+7KHRtWtpl+t0CuF 7N/Zc7ac1pze0BaS7FcWyGlvHxiH1WOp2FcZi14C4CxeFeYTi43RNVrTghsOlKOPml P6ZwQpWaQWPiw== From: Nicolas Dufresne To: Mauro Carvalho Chehab Cc: nicolas@ndufresne.ca, linux-media@vger.kernel.org, Sebastian Fricke , linux-kernel@vger.kernel.org Subject: [PATCH v4 09/24] media: v4l2: Trace calculated p/b0/b1 initial reflist Date: Tue, 26 Apr 2022 08:57:35 -0400 Message-Id: <20220426125751.108293-10-nicolas.dufresne@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220426125751.108293-1-nicolas.dufresne@collabora.com> References: <20220426125751.108293-1-nicolas.dufresne@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add debug print statements to print the content of P & B reference lists, to verify that the ordering of the generated reference lists is correct. This is especially important for the field decoding mode, where sorting is more complex. Signed-off-by: Nicolas Dufresne Tested-by: Sebastian Fricke Reviewed-by: Sebastian Fricke --- drivers/media/v4l2-core/v4l2-h264.c | 100 ++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-h264.c b/drivers/media/v4l2-core/v4l2-h264.c index 38d8dbda0045..853f54e0fe67 100644 --- a/drivers/media/v4l2-core/v4l2-h264.c +++ b/drivers/media/v4l2-core/v4l2-h264.c @@ -12,6 +12,12 @@ #include +/* + * Size of the tempory buffer allocated when printing reference lists. The + * output will be truncated if the size is too small. + */ +static const int tmp_str_size = 1024; + /** * v4l2_h264_init_reflist_builder() - Initialize a P/B0/B1 reference list * builder @@ -241,6 +247,95 @@ 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) +{ + int n = 0, i; + + *out_str = kmalloc(tmp_str_size, GFP_KERNEL); + + n += snprintf(*out_str + n, tmp_str_size - 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, tmp_str_size - 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 = NULL; + + 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)); + + kfree(buf); +} + +static const char *format_ref_list_b(const struct v4l2_h264_reflist_builder *builder, + struct v4l2_h264_reference *reflist, + char **out_str) +{ + int n = 0, i; + + *out_str = kmalloc(tmp_str_size, GFP_KERNEL); + + n += snprintf(*out_str + n, tmp_str_size - 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, tmp_str_size - 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 = NULL; + + 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)); + + kfree(buf); +} + /** * v4l2_h264_build_p_ref_list() - Build the P reference list * @@ -261,6 +356,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 +393,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