virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

lavfi/vf_framepack: fix scheduling.

Browse Source
This commit is contained in:
Nicolas George 2015-10-22 09:58:25 +02:00
parent d0b82d798d
commit f53c4b6a18
1 changed files with 15 additions and 3 deletions

18
libavfilter/vf_framepack.c

@ -268,25 +268,26 @@ static av_always_inline void spatial_frame_pack(AVFilterLink *outlink,
} }
} }
static int try_push_frame(AVFilterContext *ctx);
static int filter_frame_left(AVFilterLink *inlink, AVFrame *frame) static int filter_frame_left(AVFilterLink *inlink, AVFrame *frame)
{ {
FramepackContext *s = inlink->dst->priv; FramepackContext *s = inlink->dst->priv;
s->input_views[LEFT] = frame; s->input_views[LEFT] = frame;
return 0; return try_push_frame(inlink->dst);
} }
static int filter_frame_right(AVFilterLink *inlink, AVFrame *frame) static int filter_frame_right(AVFilterLink *inlink, AVFrame *frame)
{ {
FramepackContext *s = inlink->dst->priv; FramepackContext *s = inlink->dst->priv;
s->input_views[RIGHT] = frame; s->input_views[RIGHT] = frame;
return 0; return try_push_frame(inlink->dst);
} }
static int request_frame(AVFilterLink *outlink) static int request_frame(AVFilterLink *outlink)
{ {
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
FramepackContext *s = ctx->priv; FramepackContext *s = ctx->priv;
AVStereo3D *stereo;
int ret, i; int ret, i;
/* get a frame on the either input, stop as soon as a video ends */ /* get a frame on the either input, stop as soon as a video ends */
@ -297,7 +298,18 @@ static int request_frame(AVFilterLink *outlink)
return ret; return ret;
} }
} }
return 0;
}
static int try_push_frame(AVFilterContext *ctx)
{
FramepackContext *s = ctx->priv;
AVFilterLink *outlink = ctx->outputs[0];
AVStereo3D *stereo;
int ret, i;
if (!(s->input_views[0] && s->input_views[1]))
return 0;
if (s->format == AV_STEREO3D_FRAMESEQUENCE) { if (s->format == AV_STEREO3D_FRAMESEQUENCE) {
if (s->double_pts == AV_NOPTS_VALUE) if (s->double_pts == AV_NOPTS_VALUE)
s->double_pts = s->input_views[LEFT]->pts; s->double_pts = s->input_views[LEFT]->pts;