diff options
Diffstat (limited to 'libavfilter/vf_showinfo.c')
| -rw-r--r-- | libavfilter/vf_showinfo.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index b53ccd10db..9d20b4831f 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -1,19 +1,19 @@ /* * Copyright (c) 2011 Stefano Sabatini - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -26,6 +26,7 @@ #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/pixdesc.h" +#include "libavutil/timestamp.h" #include "avfilter.h" #include "internal.h" #include "video.h" @@ -62,19 +63,23 @@ static int end_frame(AVFilterLink *inlink) } av_log(ctx, AV_LOG_INFO, - "n:%d pts:%"PRId64" pts_time:%f pos:%"PRId64" " + "n:%d pts:%s pts_time:%s pos:%"PRId64" " "fmt:%s sar:%d/%d s:%dx%d i:%c iskey:%d type:%c " - "checksum:%u plane_checksum:[%u %u %u %u]\n", + "checksum:%08X plane_checksum:[%08X", showinfo->frame, - picref->pts, picref->pts * av_q2d(inlink->time_base), picref->pos, + av_ts2str(picref->pts), av_ts2timestr(picref->pts, &inlink->time_base), picref->pos, av_pix_fmt_descriptors[picref->format].name, - picref->video->pixel_aspect.num, picref->video->pixel_aspect.den, + picref->video->sample_aspect_ratio.num, picref->video->sample_aspect_ratio.den, picref->video->w, picref->video->h, !picref->video->interlaced ? 'P' : /* Progressive */ picref->video->top_field_first ? 'T' : 'B', /* Top / Bottom */ picref->video->key_frame, av_get_picture_type_char(picref->video->pict_type), - checksum, plane_checksum[0], plane_checksum[1], plane_checksum[2], plane_checksum[3]); + checksum, plane_checksum[0]); + + for (plane = 1; picref->data[plane] && plane < 4; plane++) + av_log(ctx, AV_LOG_INFO, " %08X", plane_checksum[plane]); + av_log(ctx, AV_LOG_INFO, "]\n"); showinfo->frame++; return ff_end_frame(inlink->dst->outputs[0]); |