virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avfilter/vf_scale: split the scale_frame function from filter_frame for activate function support

Browse Source 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Limin Wang 2019-09-07 23:11:25 +08:00 committed by Michael Niedermayer
parent 5b12a47e08
commit cbc63d61b2
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavfilter/vf_scale.c
View File

@ -412,7 +412,7 @@ static int scale_slice(AVFilterLink *link, AVFrame *out_buf, AVFrame *cur_pic, s
out,out_stride); out,out_stride);
} }
static int filter_frame(AVFilterLink *link, AVFrame *in) static int scale_frame(AVFilterLink *link, AVFrame *in, AVFrame **frame_out)
{ {
ScaleContext *scale = link->dst->priv; ScaleContext *scale = link->dst->priv;
AVFilterLink *outlink = link->dst->outputs[0]; AVFilterLink *outlink = link->dst->outputs[0];
@ -421,6 +421,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
char buf[32]; char buf[32];
int in_range; int in_range;
*frame_out = NULL;
if (in->colorspace == AVCOL_SPC_YCGCO) if (in->colorspace == AVCOL_SPC_YCGCO)
av_log(link->dst, AV_LOG_WARNING, "Detected unsupported YCgCo colorspace.\n"); av_log(link->dst, AV_LOG_WARNING, "Detected unsupported YCgCo colorspace.\n");
@ -449,8 +450,10 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
return ret; return ret;
} }
if (!scale->sws) if (!scale->sws) {
return ff_filter_frame(outlink, in); *frame_out = in;
return 0;
}
scale->hsub = desc->log2_chroma_w; scale->hsub = desc->log2_chroma_w;
scale->vsub = desc->log2_chroma_h; scale->vsub = desc->log2_chroma_h;
@ -460,6 +463,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
av_frame_free(&in); av_frame_free(&in);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
*frame_out = out;
av_frame_copy_props(out, in); av_frame_copy_props(out, in);
out->width = outlink->w; out->width = outlink->w;
@ -533,7 +537,21 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
} }
av_frame_free(&in); av_frame_free(&in);
return ff_filter_frame(outlink, out); return 0;
}
static int filter_frame(AVFilterLink *link, AVFrame *in)
{
AVFilterContext *ctx = link->dst;
AVFilterLink *outlink = ctx->outputs[0];
AVFrame *out;
int ret;
ret = scale_frame(link, in, &out);
if (out)
return ff_filter_frame(outlink, out);
return ret;
} }
static int filter_frame_ref(AVFilterLink *link, AVFrame *in) static int filter_frame_ref(AVFilterLink *link, AVFrame *in)