[FFmpeg-devel] [PATCH 2/4] lavfi/bbox: make min_val user configurable

[Stefano Sabatini]

On date Sunday 2013-05-26 10:00:56 +0000, Paul B Mahol encoded:
> Signed-off-by: Paul B Mahol <onemda at gmail.com>
> ---
>  libavfilter/vf_bbox.c | 17 +++++++++++++++--
>  1 file changed, 15 insertions(+), 2 deletions(-)
> 
> diff --git a/libavfilter/vf_bbox.c b/libavfilter/vf_bbox.c
> index db73f01..9e1c801 100644
> --- a/libavfilter/vf_bbox.c
> +++ b/libavfilter/vf_bbox.c
> @@ -23,6 +23,7 @@
>   * bounding box detection filter
>   */
>  
> +#include "libavutil/opt.h"
>  #include "libavutil/pixdesc.h"
>  #include "libavutil/timestamp.h"
>  #include "avfilter.h"
> @@ -30,9 +31,20 @@
>  #include "internal.h"
>  
>  typedef struct {
> -    int unused;
> +    const AVClass *class;
> +    int min_val;
>  } BBoxContext;
>  
> +#define OFFSET(x) offsetof(BBoxContext, x)
> +#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
> +
> +static const AVOption bbox_options[] = {
> +    { "min_val", "set minimum luminance value for bounding box", OFFSET(min_val), AV_OPT_TYPE_INT, { .i64 = 16 }, 0, 255, FLAGS },
> +    { NULL }
> +};
> +
> +AVFILTER_DEFINE_CLASS(bbox);
> +
>  static int query_formats(AVFilterContext *ctx)
>  {
>      static const enum AVPixelFormat pix_fmts[] = {
> @@ -58,7 +70,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
>      has_bbox =
>          ff_calculate_bounding_box(&box,
>                                    frame->data[0], frame->linesize[0],
> -                                  inlink->w, inlink->h, 16);
> +                                  inlink->w, inlink->h, bbox->min_val);
>      w = box.x2 - box.x1 + 1;
>      h = box.y2 - box.y1 + 1;
>  
> @@ -100,6 +112,7 @@ AVFilter avfilter_vf_bbox = {
>      .name          = "bbox",
>      .description   = NULL_IF_CONFIG_SMALL("Compute bounding box for each frame."),
>      .priv_size     = sizeof(BBoxContext),
> +    .priv_class    = &bbox_class,
>      .query_formats = query_formats,
>      .inputs        = bbox_inputs,
>      .outputs       = bbox_outputs,

Missing docs update, should be fine otherwise. A micro bump is
recommended as well.
-- 
FFmpeg = Fierce and Faithful Mastodontic Portable Evanescent Gymnast