From 0663a9eab8b89a6ff5a169ad1055734e39d8b333 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 28 Nov 2012 21:10:06 +0100 Subject: vf_showinfo: switch to filter_frame Signed-off-by: Michael Niedermayer --- libavfilter/vf_showinfo.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'libavfilter/vf_showinfo.c') diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 07b42db765..1cad3c93a6 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -42,18 +42,17 @@ static av_cold int init(AVFilterContext *ctx, const char *args) return 0; } -static int end_frame(AVFilterLink *inlink) +static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame) { AVFilterContext *ctx = inlink->dst; ShowInfoContext *showinfo = ctx->priv; - AVFilterBufferRef *picref = inlink->cur_buf; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); uint32_t plane_checksum[4] = {0}, checksum = 0; int i, plane, vsub = desc->log2_chroma_h; - for (plane = 0; picref->data[plane] && plane < 4; plane++) { - int64_t linesize = av_image_get_linesize(picref->format, picref->video->w, plane); - uint8_t *data = picref->data[plane]; + for (plane = 0; frame->data[plane] && plane < 4; plane++) { + int64_t linesize = av_image_get_linesize(frame->format, frame->video->w, plane); + uint8_t *data = frame->data[plane]; int h = plane == 1 || plane == 2 ? inlink->h >> vsub : inlink->h; if (linesize < 0) @@ -62,7 +61,7 @@ static int end_frame(AVFilterLink *inlink) for (i = 0; i < h; i++) { plane_checksum[plane] = av_adler32_update(plane_checksum[plane], data, linesize); checksum = av_adler32_update(checksum, data, linesize); - data += picref->linesize[plane]; + data += frame->linesize[plane]; } } @@ -71,22 +70,22 @@ static int end_frame(AVFilterLink *inlink) "fmt:%s sar:%d/%d s:%dx%d i:%c iskey:%d type:%c " "checksum:%08X plane_checksum:[%08X", showinfo->frame, - av_ts2str(picref->pts), av_ts2timestr(picref->pts, &inlink->time_base), picref->pos, + av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base), frame->pos, desc->name, - 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), + frame->video->sample_aspect_ratio.num, frame->video->sample_aspect_ratio.den, + frame->video->w, frame->video->h, + !frame->video->interlaced ? 'P' : /* Progressive */ + frame->video->top_field_first ? 'T' : 'B', /* Top / Bottom */ + frame->video->key_frame, + av_get_picture_type_char(frame->video->pict_type), checksum, plane_checksum[0]); - for (plane = 1; picref->data[plane] && plane < 4; plane++) + for (plane = 1; frame->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]); + return ff_filter_frame(inlink->dst->outputs[0], frame); } static const AVFilterPad avfilter_vf_showinfo_inputs[] = { @@ -94,8 +93,7 @@ static const AVFilterPad avfilter_vf_showinfo_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .get_video_buffer = ff_null_get_video_buffer, - .start_frame = ff_null_start_frame, - .end_frame = end_frame, + .filter_frame = filter_frame, .min_perms = AV_PERM_READ, }, { NULL } -- cgit v1.2.3