Commit 83141070 authored by Nicolas Dufresne's avatar Nicolas Dufresne Committed by Mauro Carvalho Chehab
Browse files

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: default avatarNicolas Dufresne <nicolas.dufresne@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 ed7bb87d

drivers/staging/media/hantro/hantro_h264.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

}