UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: vicodec: set state->info before calling the encode/decode funcs 

state->info was NULL since I completely forgot to set state->info.
Oops.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reported-by: Ezequiel Garcia <ezequiel@collabora.com>
Tested-by: Ezequiel Garcia <ezequiel@collabora.com>
[hans.verkuil@cisco.com: re-add q_out which was removed by commit 703fe34bac]
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Hans Verkuil 2018-09-10 11:00:40 -04:00 committed by Mauro Carvalho Chehab
parent d61b3b4101
commit b09d8b25f4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/platform/vicodec/vicodec-core.c
View File

@ -175,12 +175,18 @@ static int device_process(struct vicodec_ctx *ctx,
}
if (ctx->is_enc) {
unsigned int size = v4l2_fwht_encode(state, p_in, p_out);
struct vicodec_q_data *q_out;
vb2_set_plane_payload(&out_vb->vb2_buf, 0, size);
q_out = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
state->info = q_out->info;
ret = v4l2_fwht_encode(state, p_in, p_out);
if (ret < 0)
return ret;
vb2_set_plane_payload(&out_vb->vb2_buf, 0, ret);
} else {
state->info = q_cap->info;
ret = v4l2_fwht_decode(state, p_in, p_out);
if (ret)
if (ret < 0)
return ret;
vb2_set_plane_payload(&out_vb->vb2_buf, 0, q_cap->sizeimage);
}