RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 16:52:31 +00:00
Code Issues Projects Releases Wiki Activity

vf_showinfo: switch to filter_frame

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Anton Khirnov 2012-11-28 21:10:06 +01:00 committed by Michael Niedermayer
parent 6be0df5080
commit 0663a9eab8
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavfilter/vf_showinfo.c
View File

@ -42,18 +42,17 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
return 0; return 0;
} }
static int end_frame(AVFilterLink *inlink) static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
{ {
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
ShowInfoContext *showinfo = ctx->priv; ShowInfoContext *showinfo = ctx->priv;
AVFilterBufferRef *picref = inlink->cur_buf;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
uint32_t plane_checksum[4] = {0}, checksum = 0; uint32_t plane_checksum[4] = {0}, checksum = 0;
int i, plane, vsub = desc->log2_chroma_h; int i, plane, vsub = desc->log2_chroma_h;
for (plane = 0; picref->data[plane] && plane < 4; plane++) { for (plane = 0; frame->data[plane] && plane < 4; plane++) {
int64_t linesize = av_image_get_linesize(picref->format, picref->video->w, plane); int64_t linesize = av_image_get_linesize(frame->format, frame->video->w, plane);
uint8_t *data = picref->data[plane]; uint8_t *data = frame->data[plane];
int h = plane == 1 || plane == 2 ? inlink->h >> vsub : inlink->h; int h = plane == 1 || plane == 2 ? inlink->h >> vsub : inlink->h;
if (linesize < 0) if (linesize < 0)
@ -62,7 +61,7 @@ static int end_frame(AVFilterLink *inlink)
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
plane_checksum[plane] = av_adler32_update(plane_checksum[plane], data, linesize); plane_checksum[plane] = av_adler32_update(plane_checksum[plane], data, linesize);
checksum = av_adler32_update(checksum, 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 " "fmt:%s sar:%d/%d s:%dx%d i:%c iskey:%d type:%c "
"checksum:%08X plane_checksum:[%08X", "checksum:%08X plane_checksum:[%08X",
showinfo->frame, 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, desc->name,
picref->video->sample_aspect_ratio.num, picref->video->sample_aspect_ratio.den, frame->video->sample_aspect_ratio.num, frame->video->sample_aspect_ratio.den,
picref->video->w, picref->video->h, frame->video->w, frame->video->h,
!picref->video->interlaced ? 'P' : /* Progressive */ !frame->video->interlaced ? 'P' : /* Progressive */
picref->video->top_field_first ? 'T' : 'B', /* Top / Bottom */ frame->video->top_field_first ? 'T' : 'B', /* Top / Bottom */
picref->video->key_frame, frame->video->key_frame,
av_get_picture_type_char(picref->video->pict_type), av_get_picture_type_char(frame->video->pict_type),
checksum, plane_checksum[0]); 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, " %08X", plane_checksum[plane]);
av_log(ctx, AV_LOG_INFO, "]\n"); av_log(ctx, AV_LOG_INFO, "]\n");
showinfo->frame++; 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[] = { static const AVFilterPad avfilter_vf_showinfo_inputs[] = {
@ -94,8 +93,7 @@ static const AVFilterPad avfilter_vf_showinfo_inputs[] = {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer = ff_null_get_video_buffer, .get_video_buffer = ff_null_get_video_buffer,
.start_frame = ff_null_start_frame, .filter_frame = filter_frame,
.end_frame = end_frame,
.min_perms = AV_PERM_READ, .min_perms = AV_PERM_READ,
}, },
{ NULL } { NULL }