virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

lavfi/vignette: add aspect option.

Browse Source
This commit is contained in:
Clément Bœsch 2013-05-30 20:27:55 +02:00
parent 33620e243f
commit 2886e8065e
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/filters.texi
View File

@ -7005,6 +7005,13 @@ Default value is @samp{init}.
@item dither @item dither
Set dithering to reduce the circular banding effects. Default is @code{1} Set dithering to reduce the circular banding effects. Default is @code{1}
(enabled). (enabled).
@item aspect
Set vignette aspect. This setting allows to adjust the shape of the vignette.
Setting this value to the SAR of the input will make a rectangular vignetting
following the dimensions of the video.
Default is @code{1/1}.
@end table @end table
@subsection Expressions @subsection Expressions

9
libavfilter/vf_vignette.c
View File

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <float.h> /* DBL_MAX */
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/eval.h" #include "libavutil/eval.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
@ -65,6 +67,8 @@ typedef struct {
float xscale, yscale; float xscale, yscale;
uint32_t dither; uint32_t dither;
int do_dither; int do_dither;
AVRational aspect;
AVRational scale;
} VignetteContext; } VignetteContext;
#define OFFSET(x) offsetof(VignetteContext, x) #define OFFSET(x) offsetof(VignetteContext, x)
@ -81,6 +85,7 @@ static const AVOption vignette_options[] = {
{ "init", "eval expressions once during initialization", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_INIT}, .flags = FLAGS, .unit = "eval" }, { "init", "eval expressions once during initialization", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_INIT}, .flags = FLAGS, .unit = "eval" },
{ "frame", "eval expressions for each frame", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_FRAME}, .flags = FLAGS, .unit = "eval" }, { "frame", "eval expressions for each frame", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_FRAME}, .flags = FLAGS, .unit = "eval" },
{ "dither", "set dithering", OFFSET(do_dither), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, FLAGS }, { "dither", "set dithering", OFFSET(do_dither), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, FLAGS },
{ "aspect", "set aspect ratio", OFFSET(aspect), AV_OPT_TYPE_RATIONAL, {.dbl = 1}, 0, DBL_MAX, .flags = FLAGS },
{ NULL } { NULL }
}; };
@ -281,10 +286,10 @@ static int config_props(AVFilterLink *inlink)
if (!sar.num || !sar.den) if (!sar.num || !sar.den)
sar.num = sar.den = 1; sar.num = sar.den = 1;
if (sar.num > sar.den) { if (sar.num > sar.den) {
s->xscale = av_q2d(sar); s->xscale = av_q2d(av_div_q(sar, s->aspect));
s->yscale = 1; s->yscale = 1;
} else { } else {
s->yscale = av_q2d(av_inv_q(sar)); s->yscale = av_q2d(av_div_q(s->aspect, sar));
s->xscale = 1; s->xscale = 1;
} }
s->dmax = hypot(inlink->w / 2., inlink->h / 2.); s->dmax = hypot(inlink->w / 2., inlink->h / 2.);