Browse Source

avfilter: handle error in query_formats() of a bunch of random video filters

tags/n2.7
Clément Bœsch 10 years ago
parent
commit
fd682b1892
27 changed files with 118 additions and 83 deletions
  1. +8
    -1
      libavfilter/f_select.c
  2. +4
    -2
      libavfilter/vf_codecview.c
  3. +4
    -3
      libavfilter/vf_colorbalance.c
  4. +4
    -4
      libavfilter/vf_colormatrix.c
  5. +4
    -2
      libavfilter/vf_curves.c
  6. +4
    -2
      libavfilter/vf_dctdnoiz.c
  7. +4
    -2
      libavfilter/vf_decimate.c
  8. +4
    -3
      libavfilter/vf_delogo.c
  9. +4
    -4
      libavfilter/vf_deshake.c
  10. +4
    -3
      libavfilter/vf_drawbox.c
  11. +10
    -5
      libavfilter/vf_edgedetect.c
  12. +4
    -4
      libavfilter/vf_elbg.c
  13. +4
    -4
      libavfilter/vf_eq.c
  14. +4
    -2
      libavfilter/vf_fieldmatch.c
  15. +4
    -4
      libavfilter/vf_gradfun.c
  16. +4
    -3
      libavfilter/vf_histeq.c
  17. +4
    -4
      libavfilter/vf_hqdn3d.c
  18. +4
    -2
      libavfilter/vf_hqx.c
  19. +4
    -4
      libavfilter/vf_hue.c
  20. +4
    -4
      libavfilter/vf_idet.c
  21. +4
    -3
      libavfilter/vf_lenscorrection.c
  22. +4
    -3
      libavfilter/vf_libopencv.c
  23. +4
    -3
      libavfilter/vf_lut.c
  24. +4
    -2
      libavfilter/vf_lut3d.c
  25. +4
    -4
      libavfilter/vf_mcdeint.c
  26. +4
    -4
      libavfilter/vf_mpdecimate.c
  27. +4
    -2
      libavfilter/vf_owdenoise.c

+ 8
- 1
libavfilter/f_select.c View File

@@ -416,11 +416,18 @@ static int query_formats(AVFilterContext *ctx)
if (!select->do_scene_detect) {
return ff_default_query_formats(ctx);
} else {
int ret;
static const enum AVPixelFormat pix_fmts[] = {
AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);

if (!fmts_list)
return AVERROR(ENOMEM);
ret = ff_set_common_formats(ctx, fmts_list);
if (ret < 0)
return ret;
}
return 0;
}


+ 4
- 2
libavfilter/vf_codecview.c View File

@@ -62,8 +62,10 @@ static int query_formats(AVFilterContext *ctx)
// TODO: we can probably add way more pixel formats without any other
// changes; anything with 8-bit luma in first plane should be working
static const enum AVPixelFormat pix_fmts[] = {AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int clip_line(int *sx, int *sy, int *ex, int *ey, int maxx)


+ 4
- 3
libavfilter/vf_colorbalance.c View File

@@ -76,9 +76,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_RGB0, AV_PIX_FMT_BGR0,
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_output(AVFilterLink *outlink)


+ 4
- 4
libavfilter/vf_colormatrix.c View File

@@ -353,10 +353,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_UYVY422,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int filter_frame(AVFilterLink *link, AVFrame *in)


+ 4
- 2
libavfilter/vf_curves.c View File

@@ -464,8 +464,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_RGB0, AV_PIX_FMT_BGR0,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 2
libavfilter/vf_dctdnoiz.c View File

@@ -600,8 +600,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB24,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

typedef struct ThreadData {


+ 4
- 2
libavfilter/vf_decimate.c View File

@@ -350,8 +350,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_output(AVFilterLink *outlink)


+ 4
- 3
libavfilter/vf_delogo.c View File

@@ -177,9 +177,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUVA420P, AV_PIX_FMT_GRAY8,
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static av_cold int init(AVFilterContext *ctx)


+ 4
- 4
libavfilter/vf_deshake.c View File

@@ -396,10 +396,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P,
AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_props(AVFilterLink *link)


+ 4
- 3
libavfilter/vf_drawbox.c View File

@@ -112,9 +112,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ440P,
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 10
- 5
libavfilter/vf_edgedetect.c View File

@@ -78,17 +78,22 @@ static av_cold int init(AVFilterContext *ctx)
static int query_formats(AVFilterContext *ctx)
{
const EdgeDetectContext *edgedetect = ctx->priv;
static const enum AVPixelFormat wires_pix_fmts[] = {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE};
static const enum AVPixelFormat colormix_pix_fmts[] = {AV_PIX_FMT_GBRP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE};
AVFilterFormats *fmts_list;
const enum AVPixelFormat *pix_fmts = NULL;

if (edgedetect->mode == MODE_WIRES) {
static const enum AVPixelFormat pix_fmts[] = {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
pix_fmts = wires_pix_fmts;
} else if (edgedetect->mode == MODE_COLORMIX) {
static const enum AVPixelFormat pix_fmts[] = {AV_PIX_FMT_GBRP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
pix_fmts = colormix_pix_fmts;
} else {
av_assert0(0);
}
return 0;
fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_props(AVFilterLink *inlink)


+ 4
- 4
libavfilter/vf_elbg.c View File

@@ -80,10 +80,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

#define NB_COMPONENTS 3


+ 4
- 4
libavfilter/vf_eq.c View File

@@ -233,10 +233,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUV444P,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pixel_fmts_eq));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pixel_fmts_eq);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int filter_frame(AVFilterLink *inlink, AVFrame *in)


+ 4
- 2
libavfilter/vf_fieldmatch.c View File

@@ -855,8 +855,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 4
libavfilter/vf_gradfun.c View File

@@ -155,10 +155,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_GBRP,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 3
libavfilter/vf_histeq.c View File

@@ -99,9 +99,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 4
libavfilter/vf_hqdn3d.c View File

@@ -253,10 +253,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUV444P16,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 2
libavfilter/vf_hqx.c View File

@@ -462,8 +462,10 @@ HQX_FUNC(4)
static int query_formats(AVFilterContext *ctx)
{
static const enum AVPixelFormat pix_fmts[] = {AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_output(AVFilterLink *outlink)


+ 4
- 4
libavfilter/vf_hue.c View File

@@ -233,10 +233,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUVA420P,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_props(AVFilterLink *inlink)


+ 4
- 4
libavfilter/vf_idet.c View File

@@ -399,10 +399,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUVA420P,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_output(AVFilterLink *outlink)


+ 4
- 3
libavfilter/vf_lenscorrection.c View File

@@ -107,9 +107,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP,
AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static av_cold void uninit(AVFilterContext *ctx)


+ 4
- 3
libavfilter/vf_libopencv.c View File

@@ -63,9 +63,10 @@ static int query_formats(AVFilterContext *ctx)
static const enum AVPixelFormat pix_fmts[] = {
AV_PIX_FMT_BGR24, AV_PIX_FMT_BGRA, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE
};

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

typedef struct OCVContext {


+ 4
- 3
libavfilter/vf_lut.c View File

@@ -130,9 +130,10 @@ static int query_formats(AVFilterContext *ctx)
const enum AVPixelFormat *pix_fmts = s->is_rgb ? rgb_pix_fmts :
s->is_yuv ? yuv_pix_fmts :
all_pix_fmts;

ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

/**


+ 4
- 2
libavfilter/vf_lut3d.c View File

@@ -471,8 +471,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 4
libavfilter/vf_mcdeint.c View File

@@ -163,10 +163,10 @@ static int query_formats(AVFilterContext *ctx)
static const enum PixelFormat pix_fmts[] = {
AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int filter_frame(AVFilterLink *inlink, AVFrame *inpic)


+ 4
- 4
libavfilter/vf_mpdecimate.c View File

@@ -158,10 +158,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUVA420P,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


+ 4
- 2
libavfilter/vf_owdenoise.c View File

@@ -267,8 +267,10 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUVA420P,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list);
}

static int config_input(AVFilterLink *inlink)


Loading…
Cancel
Save