From: Nicolas Dufresne <nicolas.dufresne@collabora.com> To: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>, Mauro Carvalho Chehab <mchehab@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: kernel@collabora.com, Jonas Karlman <jonas@kwiboo.se>, Ezequiel Garcia <ezequiel@collabora.com>, Sebastian Fricke <sebastian.fricke@collabora.com>, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 16/23] media: rkvdec: h264: Fix reference frame_num wrap for second field Date: Thu, 31 Mar 2022 15:37:18 -0400 [thread overview] Message-ID: <20220331193726.289559-17-nicolas.dufresne@collabora.com> (raw) In-Reply-To: <20220331193726.289559-1-nicolas.dufresne@collabora.com> From: Jonas Karlman <jonas@kwiboo.se> When decoding the second field in a complementary field pair the second field is sharing the same frame_num with the first field. Currently the frame_num for the first field is wrapped when it matches the field being decoded, this cause issues to decode the second field in a complementary field pair. Fix this by using inclusive comparison, less than or equal. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com> Reviewed-by: Sebastian Fricke <sebastian.fricke@collabora.com> --- drivers/staging/media/rkvdec/rkvdec-h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c index a42cf19bcc6d..730f8ebf7f58 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -773,7 +773,7 @@ static void assemble_hw_rps(struct rkvdec_ctx *ctx, continue; if (dpb[i].flags & V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM || - dpb[i].frame_num < dec_params->frame_num) { + dpb[i].frame_num <= dec_params->frame_num) { p[i] = dpb[i].frame_num; continue; } -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Dufresne <nicolas.dufresne@collabora.com> To: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>, Mauro Carvalho Chehab <mchehab@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: kernel@collabora.com, Jonas Karlman <jonas@kwiboo.se>, Ezequiel Garcia <ezequiel@collabora.com>, Sebastian Fricke <sebastian.fricke@collabora.com>, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 16/23] media: rkvdec: h264: Fix reference frame_num wrap for second field Date: Thu, 31 Mar 2022 15:37:18 -0400 [thread overview] Message-ID: <20220331193726.289559-17-nicolas.dufresne@collabora.com> (raw) In-Reply-To: <20220331193726.289559-1-nicolas.dufresne@collabora.com> From: Jonas Karlman <jonas@kwiboo.se> When decoding the second field in a complementary field pair the second field is sharing the same frame_num with the first field. Currently the frame_num for the first field is wrapped when it matches the field being decoded, this cause issues to decode the second field in a complementary field pair. Fix this by using inclusive comparison, less than or equal. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com> Reviewed-by: Sebastian Fricke <sebastian.fricke@collabora.com> --- drivers/staging/media/rkvdec/rkvdec-h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c index a42cf19bcc6d..730f8ebf7f58 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -773,7 +773,7 @@ static void assemble_hw_rps(struct rkvdec_ctx *ctx, continue; if (dpb[i].flags & V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM || - dpb[i].frame_num < dec_params->frame_num) { + dpb[i].frame_num <= dec_params->frame_num) { p[i] = dpb[i].frame_num; continue; } -- 2.34.1 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2022-03-31 19:38 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-31 19:37 [PATCH v2 00/23] H.264 Field Decoding Support for Frame-based Decoders Nicolas Dufresne 2022-03-31 19:37 ` [PATCH v2 01/23] media: doc: Document dual use of H.264 pic_num/frame_num Nicolas Dufresne 2022-03-31 20:02 ` [PATCH v2 00/23] H.264 Field Decoding Support for Frame-based Decoders Nicolas Dufresne 2022-03-31 19:37 ` [PATCH v2 02/23] media: v4l2-mem2mem: Trace on implicit un-hold Nicolas Dufresne 2022-04-02 10:47 ` Ezequiel Garcia 2022-03-31 19:37 ` [PATCH v2 03/23] media: videobuf2-v4l2: Warn on holding buffers without support Nicolas Dufresne 2022-04-02 10:52 ` Ezequiel Garcia 2022-03-31 19:37 ` [PATCH v2 04/23] media: h264: Avoid wrapping long_term_frame_idx Nicolas Dufresne 2022-04-02 11:01 ` Ezequiel Garcia 2022-03-31 19:37 ` [PATCH v2 05/23] media: h264: Use v4l2_h264_reference for reflist Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne 2022-03-31 19:37 ` [PATCH v2 06/23] media: h264: Increase reference lists size to 32 Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne 2022-04-02 12:03 ` Ezequiel Garcia 2022-04-02 12:03 ` Ezequiel Garcia 2022-03-31 19:37 ` [PATCH v2 07/23] media: h264: Store current picture fields Nicolas Dufresne 2022-03-31 19:37 ` [PATCH v2 08/23] media: h264: Store all fields into the unordered list Nicolas Dufresne 2022-03-31 19:37 ` [PATCH v2 09/23] media: v4l2: Trace calculated p/b0/b1 initial reflist Nicolas Dufresne 2022-03-31 19:37 ` [PATCH v2 10/23] media: h264: Sort p/b reflist using frame_num Nicolas Dufresne 2022-03-31 19:37 ` [PATCH v2 11/23] media: v4l2: Reorder field reflist Nicolas Dufresne 2022-03-31 19:37 ` [PATCH v2 12/23] media: rkvdec: Stop overclocking the decoder Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne 2022-04-02 11:05 ` Ezequiel Garcia 2022-04-02 11:05 ` Ezequiel Garcia 2022-03-31 19:37 ` [PATCH v2 13/23] media: rkvdec: h264: Fix dpb_valid implementation Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne 2022-04-02 11:16 ` Ezequiel Garcia 2022-04-02 11:16 ` Ezequiel Garcia 2022-04-05 15:10 ` Nicolas Dufresne 2022-04-05 15:10 ` Nicolas Dufresne 2022-04-05 15:34 ` Ezequiel Garcia 2022-04-05 15:34 ` Ezequiel Garcia 2022-03-31 19:37 ` [PATCH v2 14/23] media: rkvdec: h264: Fix bit depth wrap in pps packet Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne 2022-04-02 11:20 ` Ezequiel Garcia 2022-04-02 11:20 ` Ezequiel Garcia 2022-03-31 19:37 ` [PATCH v2 15/23] media: rkvdec: h264: Validate and use pic width and height in mbs Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne 2022-04-02 11:32 ` Ezequiel Garcia 2022-04-02 11:32 ` Ezequiel Garcia 2022-04-05 15:44 ` Nicolas Dufresne 2022-04-05 15:44 ` Nicolas Dufresne 2022-04-05 16:04 ` Nicolas Dufresne 2022-04-05 16:04 ` Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne [this message] 2022-03-31 19:37 ` [PATCH v2 16/23] media: rkvdec: h264: Fix reference frame_num wrap for second field Nicolas Dufresne 2022-04-02 11:33 ` Ezequiel Garcia 2022-04-02 11:33 ` Ezequiel Garcia 2022-03-31 19:37 ` [PATCH v2 17/23] media: rkvdec: Enable capture buffer holding for H264 Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne 2022-04-02 11:35 ` Ezequiel Garcia 2022-04-02 11:35 ` Ezequiel Garcia 2022-03-31 19:37 ` [PATCH v2 18/23] media: rkvdec: Ensure decoded resolution fit coded resolution Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne 2022-03-31 19:37 ` [PATCH v2 19/23] media: rkvdec-h264: Add field decoding support Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne 2022-03-31 19:37 ` [PATCH v2 20/23] media: hantro: Enable HOLD_CAPTURE_BUF for H.264 Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne 2022-03-31 19:37 ` [PATCH v2 21/23] media: hantro: Stop using H.264 parameter pic_num Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne 2022-03-31 19:37 ` [PATCH v2 22/23] media: hantro: h264: Make dpb entry management more robust Nicolas Dufresne 2022-03-31 19:37 ` Nicolas Dufresne 2022-03-31 19:37 ` [PATCH v2 23/23] media: hantro: Add H.264 field decoding support Nicolas Dufresne 2022-03-31 19:37 ` 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=20220331193726.289559-17-nicolas.dufresne@collabora.com \ --to=nicolas.dufresne@collabora.com \ --cc=ezequiel@collabora.com \ --cc=ezequiel@vanguardiasur.com.ar \ --cc=gregkh@linuxfoundation.org \ --cc=jonas@kwiboo.se \ --cc=kernel@collabora.com \ --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=mchehab@kernel.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.