virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

lavfi/concat: switch to filter_frame.

Browse Source
This commit is contained in:
Clément Bœsch 2012-11-29 12:23:26 +01:00
parent ea3bad0e9e
commit b99f1303ad
1 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libavfilter/avf_concat.c
View File

@ -178,16 +178,7 @@ static void push_frame(AVFilterContext *ctx, unsigned in_no,
in->pts = av_rescale(in->pts, in->nb_frames, in->nb_frames - 1); in->pts = av_rescale(in->pts, in->nb_frames, in->nb_frames - 1);
buf->pts += cat->delta_ts; buf->pts += cat->delta_ts;
switch (buf->type) { ff_filter_frame(outlink, buf);
case AVMEDIA_TYPE_VIDEO:
ff_start_frame(outlink, buf);
ff_draw_slice(outlink, 0, outlink->h, 1);
ff_end_frame(outlink);
break;
case AVMEDIA_TYPE_AUDIO:
ff_filter_frame(outlink, buf);
break;
}
} }
static void process_frame(AVFilterLink *inlink, AVFilterBufferRef *buf) static void process_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
@ -227,23 +218,6 @@ static AVFilterBufferRef *get_audio_buffer(AVFilterLink *inlink, int perms,
return ff_get_audio_buffer(outlink, perms, nb_samples); return ff_get_audio_buffer(outlink, perms, nb_samples);
} }
static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
{
return 0;
}
static int draw_slice(AVFilterLink *inlink, int y, int h, int dir)
{
return 0;
}
static int end_frame(AVFilterLink *inlink)
{
process_frame(inlink, inlink->cur_buf);
inlink->cur_buf = NULL;
return 0;
}
static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf) static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
{ {
process_frame(inlink, buf); process_frame(inlink, buf);
@ -389,16 +363,10 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
.min_perms = AV_PERM_READ | AV_PERM_PRESERVE, .min_perms = AV_PERM_READ | AV_PERM_PRESERVE,
.get_video_buffer = get_video_buffer, .get_video_buffer = get_video_buffer,
.get_audio_buffer = get_audio_buffer, .get_audio_buffer = get_audio_buffer,
.filter_frame = filter_frame,
}; };
snprintf(name, sizeof(name), "in%d:%c%d", seg, "va"[type], str); snprintf(name, sizeof(name), "in%d:%c%d", seg, "va"[type], str);
pad.name = av_strdup(name); pad.name = av_strdup(name);
if (type == AVMEDIA_TYPE_VIDEO) {
pad.start_frame = start_frame;
pad.draw_slice = draw_slice;
pad.end_frame = end_frame;
} else {
pad.filter_frame = filter_frame;
}
ff_insert_inpad(ctx, ctx->nb_inputs, &pad); ff_insert_inpad(ctx, ctx->nb_inputs, &pad);
} }
} }