Commit f942d10d authored by Jonas Karlman's avatar Jonas Karlman Committed by Mauro Carvalho Chehab
Browse files

media: rkvdec: h264: Fix reference frame_num wrap for second field 



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 caused issues decoding the second field in a
complementary field pair.

Fix this by using inclusive comparison: 'less than or equal'.

Signed-off-by: default avatarJonas Karlman <jonas@kwiboo.se>
Signed-off-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Reviewed-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Reviewed-by: default avatarSebastian Fricke <sebastian.fricke@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 77e74be8

drivers/staging/media/rkvdec/rkvdec-h264.c

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,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;

		}