[FFmpeg-devel] [PATCH] lavfi/overlay: add dynamic x/y expression evaluation support

[Stefano Sabatini]

On date Tuesday 2013-04-09 00:36:04 +0200, Clément Bœsch encoded:
> On Mon, Apr 08, 2013 at 08:12:22PM +0200, Stefano Sabatini wrote:
> [...]
> > From f7894f04e5dfe49f8ae60fe02d5a19bdba7e32aa Mon Sep 17 00:00:00 2001
> > From: Stefano Sabatini <stefasab at gmail.com>
> > Date: Tue, 19 Feb 2013 20:10:02 +0100
> > Subject: [PATCH] lavfi/overlay: add dynamic expression evaluation support
> > 
> > Add support for dynamic x, y expressions evaluation.
> > 
> > Also add support for an evaluation mode which allows to disable per-frame
> > evaluation, so that there is no speedloss in case the expression does not
> > depend on frame variables.
> > 
> > TODO: bump micro
> > ---
> >  doc/filters.texi         |   81 ++++++++++++++++++++++++-------
> >  libavfilter/vf_overlay.c |  120 +++++++++++++++++++++++++++++++++-------------
> >  2 files changed, 150 insertions(+), 51 deletions(-)
> > 
> > diff --git a/doc/filters.texi b/doc/filters.texi
> > index 630db43..7ffb30e 100644
> > --- a/doc/filters.texi
> > +++ b/doc/filters.texi
> > @@ -5,7 +5,7 @@ Filtering in FFmpeg is enabled through the libavfilter library.
> >  
> >  In libavfilter, it is possible for filters to have multiple inputs and
> >  multiple outputs.
> > -To illustrate the sorts of things that are possible, we can
> > +To illustrate the sorts of things that are possible, we cyesan
> 
> Your keyboard doesn't feel good.
> 
> >  use a complex filtergraph. For example, the following one:
> >  
> >  @example
> > @@ -4243,26 +4243,31 @@ arguments are interpreted according to the syntax @var{x}:@var{y}.
> >  A description of the accepted options follows.
> >  
> >  @table @option
> > - at item x, y
> > + at item x
> > + at item y
> >  Set the expression for the x and y coordinates of the overlayed video
> > -on the main video. Default value is 0.
> > -
> > -The @var{x} and @var{y} expressions can contain the following
> > -parameters:
> > - at table @option
> > - at item main_w, main_h
> > -main input width and height
> > +on the main video. Default value is "0" for both expressions. In case
> > +the expression is invalid, it is set to a huge value (meaning that the
> > +overlay will not be displayed within the output visible area).
> >  
> > - at item W, H
> > -same as @var{main_w} and @var{main_h}
> > + at item eval
> > +Set when the expressions for @option{x} and @option{y} are evaluated.
> >  
> 
> Did you really split eval/enable?

Approved on IRC, pushed.
-- 
FFmpeg = Fierce and Freak Multipurpose Pitiless Ephemeral Generator