OSDN Git Service

lavfi/ashowinfo: only print checksum for the existing planes
authorStefano Sabatini <stefasab@gmail.com>
Thu, 9 Feb 2012 22:59:16 +0000 (23:59 +0100)
committerStefano Sabatini <stefasab@gmail.com>
Tue, 14 Feb 2012 17:01:57 +0000 (18:01 +0100)
Make the output a bit nicer.

libavfilter/af_ashowinfo.c

index e4dc6b3..12d0315 100644 (file)
@@ -66,7 +66,7 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref)
     av_log(ctx, AV_LOG_INFO,
            "n:%d pts:%s pts_time:%s pos:%"PRId64" "
            "fmt:%s chlayout:%s nb_samples:%d rate:%d planar:%d "
-           "checksum:%08X plane_checksum[%08X %08X %08X %08X %08X %08X %08X %08X]\n",
+           "checksum:%08X plane_checksum[%08X",
            showinfo->frame,
            av_ts2str(samplesref->pts), av_ts2timestr(samplesref->pts, &inlink->time_base),
            samplesref->pos,
@@ -76,11 +76,13 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref)
            samplesref->audio->sample_rate,
            samplesref->audio->planar,
            checksum,
-           plane_checksum[0], plane_checksum[1], plane_checksum[2], plane_checksum[3],
-           plane_checksum[4], plane_checksum[5], plane_checksum[6], plane_checksum[7]);
+           plane_checksum[0]);
 
-    showinfo->frame++;
+    for (plane = 1; samplesref->data[plane] && plane < 8; plane++)
+        av_log(ctx, AV_LOG_INFO, " %08X", plane_checksum[plane]);
+    av_log(ctx, AV_LOG_INFO, "]\n");
 
+    showinfo->frame++;
     avfilter_filter_samples(inlink->dst->outputs[0], samplesref);
 }