Skip to content

Commit

Permalink
media: hantro: Stop using H.264 parameter pic_num
Browse files Browse the repository at this point in the history
[ Upstream commit 8314107 ]

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 <[email protected]>
Reviewed-by: Sebastian Fricke <[email protected]>
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
ndufresne authored and Sasha Levin committed Jun 9, 2022
1 parent ee8c697 commit d548a60
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions drivers/staging/media/hantro/hantro_h264.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit d548a60

Please sign in to comment.