RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vf_scale: Add an option to pass the scaler params 

Reported-By: zehan@magicpony.technology
This commit is contained in:
Luca Barbato 2015-08-25 23:04:12 +02:00
parent c23999be13
commit b1abd2aaf9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/vf_scale.c
View File

@ -79,6 +79,7 @@ typedef struct ScaleContext {
*/ */
int w, h; int w, h;
unsigned int flags; ///sws flags unsigned int flags; ///sws flags
double param[2]; // sws params
int hsub, vsub; ///< chroma subsampling int hsub, vsub; ///< chroma subsampling
int slice_y; ///< top of current output slice int slice_y; ///< top of current output slice
@ -238,7 +239,7 @@ static int config_props(AVFilterLink *outlink)
else { else {
scale->sws = sws_getContext(inlink ->w, inlink ->h, inlink ->format, scale->sws = sws_getContext(inlink ->w, inlink ->h, inlink ->format,
outlink->w, outlink->h, outlink->format, outlink->w, outlink->h, outlink->format,
scale->flags, NULL, NULL, NULL); scale->flags, NULL, NULL, scale->param);
if (!scale->sws) if (!scale->sws)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -300,6 +301,8 @@ static const AVOption options[] = {
{ "w", "Output video width", OFFSET(w_expr), AV_OPT_TYPE_STRING, { .str = "iw" }, .flags = FLAGS }, { "w", "Output video width", OFFSET(w_expr), AV_OPT_TYPE_STRING, { .str = "iw" }, .flags = FLAGS },
{ "h", "Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, { .str = "ih" }, .flags = FLAGS }, { "h", "Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, { .str = "ih" }, .flags = FLAGS },
{ "flags", "Flags to pass to libswscale", OFFSET(flags_str), AV_OPT_TYPE_STRING, { .str = "bilinear" }, .flags = FLAGS }, { "flags", "Flags to pass to libswscale", OFFSET(flags_str), AV_OPT_TYPE_STRING, { .str = "bilinear" }, .flags = FLAGS },
{ "param0", "Scaler param 0", OFFSET(param[0]), AV_OPT_TYPE_DOUBLE, { .dbl = SWS_PARAM_DEFAULT }, INT_MIN, INT_MAX, FLAGS },
{ "param1", "Scaler param 1", OFFSET(param[1]), AV_OPT_TYPE_DOUBLE, { .dbl = SWS_PARAM_DEFAULT }, INT_MIN, INT_MAX, FLAGS },
{ NULL }, { NULL },
}; };