[FFmpeg-devel] [PATCH] lavfi/select: make lavc dependency optional.

[Clément Bœsch]

On Wed, Sep 19, 2012 at 09:50:58AM +0200, Stefano Sabatini wrote:
> On date Tuesday 2012-09-18 20:05:46 +0200, Clément Bœsch encoded:
> > ---
> >  configure               |  1 -
> >  libavfilter/vf_select.c | 17 ++++++++++++++---
> >  2 files changed, 14 insertions(+), 4 deletions(-)
> > 
> > diff --git a/configure b/configure
> > index 469eacf..521e057 100755
> > --- a/configure
> > +++ b/configure
> > @@ -1912,7 +1912,6 @@ pan_filter_deps="swresample"
> >  removelogo_filter_deps="avcodec avformat swscale"
> >  scale_filter_deps="swscale"
> >  smartblur_filter_deps="gpl swscale"
> > -select_filter_deps="avcodec"
> >  showspectrum_filter_deps="avcodec"
> >  super2xsai_filter_deps="gpl"
> >  tinterlace_filter_deps="gpl"
> > diff --git a/libavfilter/vf_select.c b/libavfilter/vf_select.c
> > index 72af50e..27de8e6 100644
> > --- a/libavfilter/vf_select.c
> > +++ b/libavfilter/vf_select.c
> > @@ -25,13 +25,16 @@
> >  
> >  #include "libavutil/eval.h"
> >  #include "libavutil/fifo.h"
> > -#include "libavcodec/dsputil.h"
> >  #include "libavutil/internal.h"
> >  #include "avfilter.h"
> >  #include "formats.h"
> >  #include "internal.h"
> >  #include "video.h"
> >  
> > +#if CONFIG_AVCODEC
> > +#include "libavcodec/dsputil.h"
> > +#endif
> > +
> >  static const char *const var_names[] = {
> >      "TB",                ///< timebase
> >  
> > @@ -116,9 +119,11 @@ typedef struct {
> >      AVExpr *expr;
> >      double var_values[VAR_VARS_NB];
> >      int do_scene_detect;            ///< 1 if the expression requires scene detection variables, 0 otherwise
> > +#if CONFIG_AVCODEC
> >      AVCodecContext *avctx;          ///< codec context required for the DSPContext (scene detect only)
> >      DSPContext c;                   ///< context providing optimized SAD methods   (scene detect only)
> >      double prev_mafd;               ///< previous MAFD                             (scene detect only)
> > +#endif
> >      AVFilterBufferRef *prev_picref; ///< previous frame                            (scene detect only)
> >      double select;
> >      int cache_frames;
> > @@ -143,6 +148,10 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
> >      }
> >  
> >      select->do_scene_detect = args && strstr(args, "scene");
> 
> > +    if (select->do_scene_detect && !CONFIG_AVCODEC) {
> > +        av_log(ctx, AV_LOG_ERROR, "Scene detection is not available without libavcodec.\n");
> > +        return AVERROR(ENOMEM);
> 
> That's a weird error code, I'd say AVERROR(EINVAL).
> 

Ehm yeah, fixed.

> > +    }
> >      return 0;
> >  }
> >  
> > @@ -175,7 +184,7 @@ static int config_input(AVFilterLink *inlink)
> >      select->var_values[VAR_INTERLACE_TYPE_T] = INTERLACE_TYPE_T;
> >      select->var_values[VAR_INTERLACE_TYPE_B] = INTERLACE_TYPE_B;
> >  
> > -    if (select->do_scene_detect) {
> > +    if (CONFIG_AVCODEC && select->do_scene_detect) {
> >          select->avctx = avcodec_alloc_context3(NULL);
> >          if (!select->avctx)
> >              return AVERROR(ENOMEM);
> > @@ -184,6 +193,7 @@ static int config_input(AVFilterLink *inlink)
> >      return 0;
> >  }
> >  
> > +#if CONFIG_AVCODEC
> >  static double get_scene_score(AVFilterContext *ctx, AVFilterBufferRef *picref)
> >  {
> >      double ret = 0;
> > @@ -217,6 +227,7 @@ static double get_scene_score(AVFilterContext *ctx, AVFilterBufferRef *picref)
> >      select->prev_picref = avfilter_ref_buffer(picref, ~0);
> >      return ret;
> >  }
> > +#endif
> >  
> >  #define D2TS(d)  (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d))
> >  #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts))
> > @@ -227,7 +238,7 @@ static int select_frame(AVFilterContext *ctx, AVFilterBufferRef *picref)
> >      AVFilterLink *inlink = ctx->inputs[0];
> >      double res;
> >  
> > -    if (select->do_scene_detect)
> > +    if (CONFIG_AVCODEC && select->do_scene_detect)
> >          select->var_values[VAR_SCENE] = get_scene_score(ctx, picref);
> >      if (isnan(select->var_values[VAR_START_PTS]))
> >          select->var_values[VAR_START_PTS] = TS2D(picref->pts);
> 
> Looks fine otherwise, maybe add a note in the docs about the
> requirement, also bump micro. Thanks.

I think the error message is more than enough; it will likely only affect
API developers, who will realize soon enough they require libavcodec.

Bumped micro and applied, thanks

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120920/3e9faa04/attachment.asc>