media: visl: Add codec specific variability on output frames

When running tests with different input data, the stable output frames
could be too similar and hide possible issues.

This commit adds variation by using some codec specific parameters.

Only HEVC and H.264 support this.

Reviewed-by: Daniel Almeida <daniel.almeida@collabora.com>
Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil: add media: prefix to Subject]

diff --git a/drivers/media/test-drivers/visl/visl-dec.c b/drivers/media/test-drivers/visl/visl-dec.c
index e9fa80f18a15c460bd4034c4b6b89e52da315b9a..6a9639bd4d61ad6aaf5b636998a506dcbd1f45a8 100644 (file)
--- a/drivers/media/test-drivers/visl/visl-dec.c
+++ b/drivers/media/test-drivers/visl/visl-dec.c
@@ -295,6 +295,35 @@ static void visl_tpg_fill_sequence(struct visl_ctx *ctx,
                  " top" : " bottom") : "none");
 }
 
+static bool visl_tpg_fill_codec_specific(struct visl_ctx *ctx,
+                                        struct visl_run *run,
+                                        char buf[], size_t bufsz)
+{
+       /*
+        * To add variability, we need a value that is stable for a given
+        * input but is different than already shown fields.
+        * The pic order count value defines the display order of the frames
+        * (which can be different than the decoding order that is shown with
+        * the sequence number).
+        * Therefore it is stable for a given input and will add a different
+        * value that is more specific to the way the input is encoded.
+        */
+       switch (ctx->current_codec) {
+       case VISL_CODEC_H264:
+               scnprintf(buf, bufsz,
+                         "H264: %u", run->h264.dpram->pic_order_cnt_lsb);
+               break;
+       case VISL_CODEC_HEVC:
+               scnprintf(buf, bufsz,
+                         "HEVC: %d", run->hevc.dpram->pic_order_cnt_val);
+               break;
+       default:
+               return false;
+       }
+
+       return true;
+}
+
 static void visl_tpg_fill(struct visl_ctx *ctx, struct visl_run *run)
 {
        u8 *basep[TPG_MAX_PLANES][2];
@@ -327,6 +356,13 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct visl_run *run)
        frame_dprintk(ctx->dev, run->dst->sequence, "");
        line++;
 
+       if (visl_tpg_fill_codec_specific(ctx, run, buf, TPG_STR_BUF_SZ)) {
+               tpg_gen_text(&ctx->tpg, basep, line++ * line_height, 16, buf);
+               frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf);
+               frame_dprintk(ctx->dev, run->dst->sequence, "");
+               line++;
+       }
+
        visl_get_ref_frames(ctx, buf, TPG_STR_BUF_SZ, run);
 
        while ((line_str = strsep(&tmp, "\n")) && strlen(line_str)) {