Skip to content
Snippets Groups Projects
Commit a89076ce authored by Detlev Casanova's avatar Detlev Casanova
Browse files

media: visl: Add a tpg_verbose parameter 


The text written on the output frames stable for a given input.
Remove the unstable elements like pointers, buffer indexes or queues
status so that frames are always identical and can be compared against
a reference in automatic tests.

As the unstable information can be relevant when debugging the API, add
a tpg_verbose parameter to show them.

Signed-off-by: default avatarDetlev Casanova <detlev.casanova@collabora.com>
parent 87569747
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
drivers/media/test-drivers/visl/visl-core.c
+ 5
− 0
View file @ a89076ce
......@@ -88,6 +88,11 @@ module_param(bitstream_trace_nframes, uint, 0444);
MODULE_PARM_DESC(bitstream_trace_nframes,
" the number of frames to dump the bitstream through debugfs");
bool tpg_verbose = false;
module_param(tpg_verbose, bool, 0644);
MODULE_PARM_DESC(tpg_verbose,
" add more verbose information on the generated output frames");
static const struct visl_ctrl_desc visl_fwht_ctrl_descs[] = {
{
.cfg.id = V4L2_CID_STATELESS_FWHT_PARAMS,
......
drivers/media/test-drivers/visl/visl-dec.c
+ 147
− 118
View file @ a89076ce
......@@ -42,6 +42,22 @@ static void *plane_vaddr(struct tpg_data *tpg, struct vb2_buffer *buf,
return vbuf;
}
static void visl_print_ts_idx(u8 **buf, __kernel_size_t *buflen, const char* name,
u64 ts, struct vb2_buffer *vb2_buf)
{
u32 len;
if (tpg_verbose && vb2_buf) {
len = scnprintf(*buf, *buflen, "%s: %lld, vb2_idx: %d\n", name,
ts, vb2_buf->index);
} else {
len = scnprintf(*buf, *buflen, "%s: %lld\n", name, ts);
}
*buf += len;
*buflen -= len;
}
static void visl_get_ref_frames(struct visl_ctx *ctx, u8 *buf,
__kernel_size_t buflen, struct visl_run *run)
{
......@@ -63,9 +79,9 @@ static void visl_get_ref_frames(struct visl_ctx *ctx, u8 *buf,
vb2_buf = vb2_find_buffer(cap_q, run->fwht.params->backward_ref_ts);
scnprintf(buf, buflen, "backwards_ref_ts: %lld, vb2_idx: %d",
run->fwht.params->backward_ref_ts,
vb2_buf ? vb2_buf->index : -1);
visl_print_ts_idx(&buf, &buflen, "backwards_ref_ts",
run->fwht.params->backward_ref_ts, vb2_buf);
break;
}
......@@ -76,13 +92,11 @@ static void visl_get_ref_frames(struct visl_ctx *ctx, u8 *buf,
b_ref = vb2_find_buffer(cap_q, run->mpeg2.pic->backward_ref_ts);
f_ref = vb2_find_buffer(cap_q, run->mpeg2.pic->forward_ref_ts);
scnprintf(buf, buflen,
"backward_ref_ts: %llu, vb2_idx: %d\n"
"forward_ref_ts: %llu, vb2_idx: %d\n",
run->mpeg2.pic->backward_ref_ts,
b_ref ? b_ref->index : -1,
run->mpeg2.pic->forward_ref_ts,
f_ref ? f_ref->index : -1);
visl_print_ts_idx(&buf, &buflen, "backward_ref_ts",
run->mpeg2.pic->backward_ref_ts, b_ref);
visl_print_ts_idx(&buf, &buflen, "forward_ref_ts",
run->mpeg2.pic->forward_ref_ts, f_ref);
break;
}
......@@ -95,16 +109,13 @@ static void visl_get_ref_frames(struct visl_ctx *ctx, u8 *buf,
golden = vb2_find_buffer(cap_q, run->vp8.frame->golden_frame_ts);
alt = vb2_find_buffer(cap_q, run->vp8.frame->alt_frame_ts);
scnprintf(buf, buflen,
"last_ref_ts: %llu, vb2_idx: %d\n"
"golden_ref_ts: %llu, vb2_idx: %d\n"
"alt_ref_ts: %llu, vb2_idx: %d\n",
run->vp8.frame->last_frame_ts,
last ? last->index : -1,
run->vp8.frame->golden_frame_ts,
golden ? golden->index : -1,
run->vp8.frame->alt_frame_ts,
alt ? alt->index : -1);
visl_print_ts_idx(&buf, &buflen, "last_ref_ts",
run->vp8.frame->last_frame_ts, last);
visl_print_ts_idx(&buf, &buflen, "golden_ref_ts",
run->vp8.frame->golden_frame_ts, golden);
visl_print_ts_idx(&buf, &buflen, "alt_ref_ts",
run->vp8.frame->alt_frame_ts, alt);
break;
}
......@@ -117,28 +128,32 @@ static void visl_get_ref_frames(struct visl_ctx *ctx, u8 *buf,
golden = vb2_find_buffer(cap_q, run->vp9.frame->golden_frame_ts);
alt = vb2_find_buffer(cap_q, run->vp9.frame->alt_frame_ts);
scnprintf(buf, buflen,
"last_ref_ts: %llu, vb2_idx: %d\n"
"golden_ref_ts: %llu, vb2_idx: %d\n"
"alt_ref_ts: %llu, vb2_idx: %d\n",
run->vp9.frame->last_frame_ts,
last ? last->index : -1,
run->vp9.frame->golden_frame_ts,
golden ? golden->index : -1,
run->vp9.frame->alt_frame_ts,
alt ? alt->index : -1);
visl_print_ts_idx(&buf, &buflen, "last_ref_ts",
run->vp9.frame->last_frame_ts, last);
visl_print_ts_idx(&buf, &buflen, "golden_ref_ts",
run->vp9.frame->golden_frame_ts, golden);
visl_print_ts_idx(&buf, &buflen, "alt_ref_ts",
run->vp9.frame->alt_frame_ts, alt);
break;
}
case VISL_CODEC_H264: {
char entry[] = "dpb[%d]:%u, vb2_index: %d\n";
char entry_stable[] = "dpb[%d]:%u\n";
struct vb2_buffer *vb2_buf;
for (i = 0; i < ARRAY_SIZE(run->h264.dpram->dpb); i++) {
vb2_buf = vb2_find_buffer(cap_q, run->h264.dpram->dpb[i].reference_ts);
len = scnprintf(buf, buflen, entry, i,
run->h264.dpram->dpb[i].reference_ts,
vb2_buf ? vb2_buf->index : -1);
vb2_buf = vb2_find_buffer(cap_q,
run->h264.dpram->dpb[i].reference_ts);
if (tpg_verbose && vb2_buf) {
len = scnprintf(buf, buflen, entry, i,
run->h264.dpram->dpb[i].reference_ts,
vb2_buf->index);
} else {
len = scnprintf(buf, buflen, entry_stable, i,
run->h264.dpram->dpb[i].reference_ts);
}
buf += len;
buflen -= len;
}
......@@ -148,13 +163,20 @@ static void visl_get_ref_frames(struct visl_ctx *ctx, u8 *buf,
case VISL_CODEC_HEVC: {
char entry[] = "dpb[%d]:%u, vb2_index: %d\n";
char entry_stable[] = "dpb[%d]:%u\n";
struct vb2_buffer *vb2_buf;
for (i = 0; i < ARRAY_SIZE(run->hevc.dpram->dpb); i++) {
vb2_buf = vb2_find_buffer(cap_q, run->hevc.dpram->dpb[i].timestamp);
len = scnprintf(buf, buflen, entry, i,
run->hevc.dpram->dpb[i].timestamp,
vb2_buf ? vb2_buf->index : -1);
if (tpg_verbose && vb2_buf) {
len = scnprintf(buf, buflen, entry, i,
run->hevc.dpram->dpb[i].timestamp,
vb2_buf->index);
} else {
len = scnprintf(buf, buflen, entry_stable, i,
run->hevc.dpram->dpb[i].timestamp);
}
buf += len;
buflen -= len;
}
......@@ -171,43 +193,38 @@ static void visl_get_ref_frames(struct visl_ctx *ctx, u8 *buf,
int idx_alt2 = run->av1.frame->ref_frame_idx[ALT2_BUF_IDX];
int idx_alt = run->av1.frame->ref_frame_idx[ALT_BUF_IDX];
const u64 *reference_frame_ts = run->av1.frame->reference_frame_ts;
struct vb2_buffer *ref_last =
vb2_find_buffer(cap_q, run->av1.frame->reference_frame_ts[idx_last]);
vb2_find_buffer(cap_q, reference_frame_ts[idx_last]);
struct vb2_buffer *ref_last2 =
vb2_find_buffer(cap_q, run->av1.frame->reference_frame_ts[idx_last2]);
vb2_find_buffer(cap_q, reference_frame_ts[idx_last2]);
struct vb2_buffer *ref_last3 =
vb2_find_buffer(cap_q, run->av1.frame->reference_frame_ts[idx_last3]);
vb2_find_buffer(cap_q, reference_frame_ts[idx_last3]);
struct vb2_buffer *ref_golden =
vb2_find_buffer(cap_q, run->av1.frame->reference_frame_ts[idx_golden]);
vb2_find_buffer(cap_q, reference_frame_ts[idx_golden]);
struct vb2_buffer *ref_bwd =
vb2_find_buffer(cap_q, run->av1.frame->reference_frame_ts[idx_bwd]);
vb2_find_buffer(cap_q, reference_frame_ts[idx_bwd]);
struct vb2_buffer *ref_alt2 =
vb2_find_buffer(cap_q, run->av1.frame->reference_frame_ts[idx_alt2]);
vb2_find_buffer(cap_q, reference_frame_ts[idx_alt2]);
struct vb2_buffer *ref_alt =
vb2_find_buffer(cap_q, run->av1.frame->reference_frame_ts[idx_alt]);
scnprintf(buf, buflen,
"ref_last_ts: %llu, vb2_idx: %d\n"
"ref_last2_ts: %llu, vb2_idx: %d\n"
"ref_last3_ts: %llu, vb2_idx: %d\n"
"ref_golden_ts: %llu, vb2_idx: %d\n"
"ref_bwd_ts: %llu, vb2_idx: %d\n"
"ref_alt2_ts: %llu, vb2_idx: %d\n"
"ref_alt_ts: %llu, vb2_idx: %d\n",
run->av1.frame->reference_frame_ts[idx_last],
ref_last ? ref_last->index : -1,
run->av1.frame->reference_frame_ts[idx_last2],
ref_last2 ? ref_last2->index : -1,
run->av1.frame->reference_frame_ts[idx_last3],
ref_last3 ? ref_last3->index : -1,
run->av1.frame->reference_frame_ts[idx_golden],
ref_golden ? ref_golden->index : -1,
run->av1.frame->reference_frame_ts[idx_bwd],
ref_bwd ? ref_bwd->index : -1,
run->av1.frame->reference_frame_ts[idx_alt2],
ref_alt2 ? ref_alt2->index : -1,
run->av1.frame->reference_frame_ts[idx_alt],
ref_alt ? ref_alt->index : -1);
vb2_find_buffer(cap_q, reference_frame_ts[idx_alt]);
visl_print_ts_idx(&buf, &buflen, "ref_last_ts",
reference_frame_ts[idx_last], ref_last);
visl_print_ts_idx(&buf, &buflen, "ref_last2_ts",
reference_frame_ts[idx_last2], ref_last2);
visl_print_ts_idx(&buf, &buflen, "ref_last3_ts",
reference_frame_ts[idx_last3], ref_last3);
visl_print_ts_idx(&buf, &buflen, "ref_golden_ts",
reference_frame_ts[idx_golden], ref_golden);
visl_print_ts_idx(&buf, &buflen, "ref_bwd_ts",
reference_frame_ts[idx_bwd], ref_bwd);
visl_print_ts_idx(&buf, &buflen, "ref_alt2_ts",
reference_frame_ts[idx_alt2], ref_alt2);
visl_print_ts_idx(&buf, &buflen, "ref_alt_ts",
reference_frame_ts[idx_alt], ref_alt);
break;
}
}
......@@ -254,15 +271,23 @@ static void visl_tpg_fill_sequence(struct visl_ctx *ctx,
struct visl_run *run, char buf[], size_t bufsz)
{
u32 stream_ms;
stream_ms = jiffies_to_msecs(get_jiffies_64() - ctx->capture_streamon_jiffies);
int len;
if (tpg_verbose) {
stream_ms = jiffies_to_msecs(get_jiffies_64() - ctx->capture_streamon_jiffies);
len = scnprintf(buf, bufsz,
"stream time: %02d:%02d:%02d:%03d ",
(stream_ms / (60 * 60 * 1000)) % 24,
(stream_ms / (60 * 1000)) % 60,
(stream_ms / 1000) % 60,
stream_ms % 1000);
buf += len;
bufsz -= len;
}
scnprintf(buf, bufsz,
"stream time: %02d:%02d:%02d:%03d sequence:%u timestamp:%lld field:%s",
(stream_ms / (60 * 60 * 1000)) % 24,
(stream_ms / (60 * 1000)) % 60,
(stream_ms / 1000) % 60,
stream_ms % 1000,
"sequence:%u timestamp:%lld field:%s",
run->dst->sequence,
run->dst->vb2_buf.timestamp,
(run->dst->field == V4L2_FIELD_ALTERNATE) ?
......@@ -338,35 +363,37 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct visl_run *run)
frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf);
}
line++;
frame_dprintk(ctx->dev, run->dst->sequence, "");
scnprintf(buf, TPG_STR_BUF_SZ, "Output queue status:");
tpg_gen_text(&ctx->tpg, basep, line++ * line_height, 16, buf);
frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf);
if (tpg_verbose) {
line++;
frame_dprintk(ctx->dev, run->dst->sequence, "");
scnprintf(buf, TPG_STR_BUF_SZ, "Output queue status:");
tpg_gen_text(&ctx->tpg, basep, line++ * line_height, 16, buf);
frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf);
len = 0;
for (i = 0; i < vb2_get_num_buffers(out_q); i++) {
char entry[] = "index: %u, state: %s, request_fd: %d, ";
u32 old_len = len;
struct vb2_buffer *vb2;
char *q_status;
len = 0;
for (i = 0; i < vb2_get_num_buffers(out_q); i++) {
char entry[] = "index: %u, state: %s, request_fd: %d, ";
u32 old_len = len;
struct vb2_buffer *vb2;
char *q_status;
vb2 = vb2_get_buffer(out_q, i);
if (!vb2)
continue;
vb2 = vb2_get_buffer(out_q, i);
if (!vb2)
continue;
q_status = visl_get_vb2_state(vb2->state);
q_status = visl_get_vb2_state(vb2->state);
len += scnprintf(&buf[len], TPG_STR_BUF_SZ - len,
entry, i, q_status,
to_vb2_v4l2_buffer(vb2)->request_fd);
len += scnprintf(&buf[len], TPG_STR_BUF_SZ - len,
entry, i, q_status,
to_vb2_v4l2_buffer(vb2)->request_fd);
len += visl_fill_bytesused(to_vb2_v4l2_buffer(vb2),
&buf[len],
TPG_STR_BUF_SZ - len);
len += visl_fill_bytesused(to_vb2_v4l2_buffer(vb2),
&buf[len],
TPG_STR_BUF_SZ - len);
tpg_gen_text(&ctx->tpg, basep, line++ * line_height, 16, &buf[old_len]);
frame_dprintk(ctx->dev, run->dst->sequence, "%s", &buf[old_len]);
tpg_gen_text(&ctx->tpg, basep, line++ * line_height, 16, &buf[old_len]);
frame_dprintk(ctx->dev, run->dst->sequence, "%s", &buf[old_len]);
}
}
line++;
......@@ -398,32 +425,34 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct visl_run *run)
frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf);
}
line++;
frame_dprintk(ctx->dev, run->dst->sequence, "");
scnprintf(buf, TPG_STR_BUF_SZ, "Capture queue status:");
tpg_gen_text(&ctx->tpg, basep, line++ * line_height, 16, buf);
frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf);
if (tpg_verbose) {
line++;
frame_dprintk(ctx->dev, run->dst->sequence, "");
scnprintf(buf, TPG_STR_BUF_SZ, "Capture queue status:");
tpg_gen_text(&ctx->tpg, basep, line++ * line_height, 16, buf);
frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf);
len = 0;
for (i = 0; i < vb2_get_num_buffers(cap_q); i++) {
u32 old_len = len;
struct vb2_buffer *vb2;
char *q_status;
len = 0;
for (i = 0; i < vb2_get_num_buffers(cap_q); i++) {
u32 old_len = len;
struct vb2_buffer *vb2;
char *q_status;
vb2 = vb2_get_buffer(cap_q, i);
if (!vb2)
continue;
vb2 = vb2_get_buffer(cap_q, i);
if (!vb2)
continue;
q_status = visl_get_vb2_state(vb2->state);
q_status = visl_get_vb2_state(vb2->state);
len += scnprintf(&buf[len], TPG_STR_BUF_SZ - len,
"index: %u, status: %s, timestamp: %llu, is_held: %d",
vb2->index, q_status,
vb2->timestamp,
to_vb2_v4l2_buffer(vb2)->is_held);
len += scnprintf(&buf[len], TPG_STR_BUF_SZ - len,
"index: %u, status: %s, timestamp: %llu, is_held: %d",
vb2->index, q_status,
vb2->timestamp,
to_vb2_v4l2_buffer(vb2)->is_held);
tpg_gen_text(&ctx->tpg, basep, line++ * line_height, 16, &buf[old_len]);
frame_dprintk(ctx->dev, run->dst->sequence, "%s", &buf[old_len]);
tpg_gen_text(&ctx->tpg, basep, line++ * line_height, 16, &buf[old_len]);
frame_dprintk(ctx->dev, run->dst->sequence, "%s", &buf[old_len]);
}
}
}
......
drivers/media/test-drivers/visl/visl.h
+ 1
− 0
View file @ a89076ce
......@@ -85,6 +85,7 @@ extern unsigned int visl_dprintk_nframes;
extern bool keep_bitstream_buffers;
extern int bitstream_trace_frame_start;
extern unsigned int bitstream_trace_nframes;
extern bool tpg_verbose;
#define frame_dprintk(dev, current, fmt, arg...) \
do { \
......
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