aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/media/hantro/hantro_h264.c
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.com>2022-05-13 22:29:19 +0200
committerMauro Carvalho Chehab <mchehab@kernel.org>2022-05-17 10:09:10 +0200
commit831410700909f4e29d5af1ef26b8c59fc2d1988e (patch)
treecd79ab1b580c06035c5e2908aeb08b529b955677 /drivers/staging/media/hantro/hantro_h264.c
parentmedia: rkvdec: Enable capture buffer holding for H264 (diff)
downloadlinux-dev-831410700909f4e29d5af1ef26b8c59fc2d1988e.tar.xz
linux-dev-831410700909f4e29d5af1ef26b8c59fc2d1988e.zip
media: hantro: Stop using H.264 parameter pic_num
The hardware expects FrameNumWrap or long_term_frame_idx. Picture numbers are per field, and are mostly used during the memory management process, which is done in userland. This fixes two ITU conformance tests: - MR6_BT_B - MR8_BT_B Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> Reviewed-by: Sebastian Fricke <sebastian.fricke@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/staging/media/hantro/hantro_h264.c')
-rw-r--r--drivers/staging/media/hantro/hantro_h264.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/media/hantro/hantro_h264.c b/drivers/staging/media/hantro/hantro_h264.c
index 0b4d2491be3b..228629fb3cdf 100644
--- a/drivers/staging/media/hantro/hantro_h264.c
+++ b/drivers/staging/media/hantro/hantro_h264.c
@@ -354,8 +354,6 @@ u16 hantro_h264_get_ref_nbr(struct hantro_ctx *ctx, unsigned int dpb_idx)
if (!(dpb->flags & V4L2_H264_DPB_ENTRY_FLAG_ACTIVE))
return 0;
- if (dpb->flags & V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM)
- return dpb->pic_num;
return dpb->frame_num;
}