leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: cedrus: h264: Properly configure reference field

Browse Source 
When interlaced H264 content is being decoded, references must indicate
which field is being referenced. Currently this was done by checking
capture buffer flags. However, that is not correct because capture
buffer may hold both fields.

Fix this by checking newly introduced flags in reference lists.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Jernej Skrabec 2020-08-25 05:52:40 +02:00 committed by Mauro Carvalho Chehab
parent a52b29e8d2
commit cfc8c3ed53
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/media/sunxi/cedrus/cedrus_h264.c
View File

@ -182,7 +182,6 @@ static void _cedrus_write_ref_list(struct cedrus_ctx *ctx,
for (i = 0; i < num_ref; i++) { for (i = 0; i < num_ref; i++) {
const struct v4l2_h264_dpb_entry *dpb; const struct v4l2_h264_dpb_entry *dpb;
const struct cedrus_buffer *cedrus_buf; const struct cedrus_buffer *cedrus_buf;
const struct vb2_v4l2_buffer *ref_buf;
unsigned int position; unsigned int position;
int buf_idx; int buf_idx;
u8 dpb_idx; u8 dpb_idx;
@ -197,12 +196,11 @@ static void _cedrus_write_ref_list(struct cedrus_ctx *ctx,
if (buf_idx < 0) if (buf_idx < 0)
continue; continue;
ref_buf = to_vb2_v4l2_buffer(cap_q->bufs[buf_idx]); cedrus_buf = vb2_to_cedrus_buffer(cap_q->bufs[buf_idx]);
cedrus_buf = vb2_v4l2_to_cedrus_buffer(ref_buf);
position = cedrus_buf->codec.h264.position; position = cedrus_buf->codec.h264.position;
sram_array[i] |= position << 1; sram_array[i] |= position << 1;
if (ref_buf->field == V4L2_FIELD_BOTTOM) if (ref_list[i].fields & V4L2_H264_BOTTOM_FIELD_REF)
sram_array[i] |= BIT(0); sram_array[i] |= BIT(0);
} }