korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-09 03:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

media: venus: dec: populate properly timestamps and flags for capture buffers

Browse Source 
Cache flags, timestamps and timecode structure of OUTPUT buffers
in per-instance structure array and fill correctly the same when
the CAPTURE buffers are done.

This will make v4l2-compliance decoder streaming test happy.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Stanimir Varbanov 2019-06-27 12:59:11 -03:00 committed by Mauro Carvalho Chehab
parent 059790467b
commit d42974e438
4 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/platform/qcom/venus/core.h
View File

@ -220,6 +220,14 @@ enum venus_dec_state {
VENUS_DEC_STATE_DRC = 7
};
struct venus_ts_metadata {
bool used;
u64 ts_ns;
u64 ts_us;
u32 flags;
struct v4l2_timecode tc;
};
/**
* struct venus_inst - holds per instance parameters
*
@ -304,6 +312,7 @@ struct venus_inst {
wait_queue_head_t reconf_wait;
unsigned int subscriptions;
int buf_count;
struct venus_ts_metadata tss[VIDEO_MAX_FRAME];
u64 fps;
struct v4l2_fract timeperframe;
const struct venus_format *fmt_out;

54
drivers/media/platform/qcom/venus/helpers.c
View File

@ -463,6 +463,57 @@ static void return_buf_error(struct venus_inst *inst,
v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
}
static void
put_ts_metadata(struct venus_inst *inst, struct vb2_v4l2_buffer *vbuf)
{
struct vb2_buffer *vb = &vbuf->vb2_buf;
unsigned int i;
int slot = -1;
u64 ts_us = vb->timestamp;
for (i = 0; i < ARRAY_SIZE(inst->tss); i++) {
if (!inst->tss[i].used) {
slot = i;
break;
}
}
if (slot == -1) {
dev_dbg(inst->core->dev, "%s: no free slot\n", __func__);
return;
}
do_div(ts_us, NSEC_PER_USEC);
inst->tss[slot].used = true;
inst->tss[slot].flags = vbuf->flags;
inst->tss[slot].tc = vbuf->timecode;
inst->tss[slot].ts_us = ts_us;
inst->tss[slot].ts_ns = vb->timestamp;
}
void venus_helper_get_ts_metadata(struct venus_inst *inst, u64 timestamp_us,
struct vb2_v4l2_buffer *vbuf)
{
struct vb2_buffer *vb = &vbuf->vb2_buf;
unsigned int i;
for (i = 0; i < ARRAY_SIZE(inst->tss); ++i) {
if (!inst->tss[i].used)
continue;
if (inst->tss[i].ts_us != timestamp_us)
continue;
inst->tss[i].used = false;
vbuf->flags |= inst->tss[i].flags;
vbuf->timecode = inst->tss[i].tc;
vb->timestamp = inst->tss[i].ts_ns;
break;
}
}
EXPORT_SYMBOL_GPL(venus_helper_get_ts_metadata);
static int
session_process_buf(struct venus_inst *inst, struct vb2_v4l2_buffer *vbuf)
{
@ -487,6 +538,9 @@ session_process_buf(struct venus_inst *inst, struct vb2_v4l2_buffer *vbuf)
if (vbuf->flags & V4L2_BUF_FLAG_LAST || !fdata.filled_len)
fdata.flags |= HFI_BUFFERFLAG_EOS;
if (inst->session_type == VIDC_SESSION_TYPE_DEC)
put_ts_metadata(inst, vbuf);
} else if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
if (inst->session_type == VIDC_SESSION_TYPE_ENC)
fdata.buffer_type = HFI_BUFFER_OUTPUT;

2
drivers/media/platform/qcom/venus/helpers.h
View File

@ -62,4 +62,6 @@ int venus_helper_unregister_bufs(struct venus_inst *inst);
int venus_helper_load_scale_clocks(struct venus_core *core);
int venus_helper_process_initial_cap_bufs(struct venus_inst *inst);
int venus_helper_process_initial_out_bufs(struct venus_inst *inst);
void venus_helper_get_ts_metadata(struct venus_inst *inst, u64 timestamp_us,
struct vb2_v4l2_buffer *vbuf);
#endif

2
drivers/media/platform/qcom/venus/vdec.c
View File

@ -1135,6 +1135,8 @@ static void vdec_buf_done(struct venus_inst *inst, unsigned int buf_type,
vbuf->sequence = inst->sequence_out++;
}
venus_helper_get_ts_metadata(inst, timestamp_us, vbuf);
if (hfi_flags & HFI_BUFFERFLAG_READONLY)
venus_helper_acquire_buf_ref(vbuf);