virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavfi/framestep: remove request_frame hack

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2013-04-11 00:09:47 +00:00
parent f77db72965
commit 7c79ec66b6
1 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavfilter/vf_framestep.c
View File

@@ -30,7 +30,7 @@
typedef struct { typedef struct {
const AVClass *class; const AVClass *class;
int frame_step, frame_count, frame_selected; int frame_step, frame_count;
} FrameStepContext; } FrameStepContext;
#define OFFSET(x) offsetof(FrameStepContext, x) #define OFFSET(x) offsetof(FrameStepContext, x)
@@ -49,6 +49,7 @@ static int config_output_props(AVFilterLink *outlink)
FrameStepContext *framestep = ctx->priv; FrameStepContext *framestep = ctx->priv;
AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *inlink = ctx->inputs[0];
outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
outlink->frame_rate = outlink->frame_rate =
av_div_q(inlink->frame_rate, (AVRational){framestep->frame_step, 1}); av_div_q(inlink->frame_rate, (AVRational){framestep->frame_step, 1});
@@ -64,34 +65,17 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *ref)
FrameStepContext *framestep = inlink->dst->priv; FrameStepContext *framestep = inlink->dst->priv;
if (!(framestep->frame_count++ % framestep->frame_step)) { if (!(framestep->frame_count++ % framestep->frame_step)) {
framestep->frame_selected = 1;
return ff_filter_frame(inlink->dst->outputs[0], ref); return ff_filter_frame(inlink->dst->outputs[0], ref);
} else { } else {
framestep->frame_selected = 0;
av_frame_free(&ref); av_frame_free(&ref);
return 0; return 0;
} }
} }
static int request_frame(AVFilterLink *outlink)
{
FrameStepContext *framestep = outlink->src->priv;
AVFilterLink *inlink = outlink->src->inputs[0];
int ret;
framestep->frame_selected = 0;
do {
ret = ff_request_frame(inlink);
} while (!framestep->frame_selected && ret >= 0);
return ret;
}
static const AVFilterPad framestep_inputs[] = { static const AVFilterPad framestep_inputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer = ff_null_get_video_buffer,
.filter_frame = filter_frame, .filter_frame = filter_frame,
}, },
{ NULL } { NULL }
@@ -102,7 +86,6 @@ static const AVFilterPad framestep_outputs[] = {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.config_props = config_output_props, .config_props = config_output_props,
.request_frame = request_frame,
}, },
{ NULL } { NULL }
}; };