Commit b09d8b25 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reported-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Tested-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
[hans.verkuil@cisco.com: re-add q_out which was removed by commit 703fe34b]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent d61b3b41
...@@ -175,12 +175,18 @@ static int device_process(struct vicodec_ctx *ctx, ...@@ -175,12 +175,18 @@ static int device_process(struct vicodec_ctx *ctx,
} }
if (ctx->is_enc) { 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 { } else {
state->info = q_cap->info;
ret = v4l2_fwht_decode(state, p_in, p_out); ret = v4l2_fwht_decode(state, p_in, p_out);
if (ret) if (ret < 0)
return ret; return ret;
vb2_set_plane_payload(&out_vb->vb2_buf, 0, q_cap->sizeimage); vb2_set_plane_payload(&out_vb->vb2_buf, 0, q_cap->sizeimage);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment