* format and noformat video filters
*/
+#include <string.h>
+
+#include "libavutil/internal.h"
+#include "libavutil/mem.h"
#include "libavutil/pixdesc.h"
#include "avfilter.h"
+#include "formats.h"
+#include "internal.h"
#include "video.h"
typedef struct {
* List of flags telling if a given image format has been listed
* as argument to the filter.
*/
- int listed_pix_fmt_flags[PIX_FMT_NB];
+ int listed_pix_fmt_flags[AV_PIX_FMT_NB];
} FormatContext;
-#define PIX_FMT_NAME_MAXSIZE 32
+#define AV_PIX_FMT_NAME_MAXSIZE 32
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
{
FormatContext *format = ctx->priv;
const char *cur, *sep;
- char pix_fmt_name[PIX_FMT_NAME_MAXSIZE];
+ char pix_fmt_name[AV_PIX_FMT_NAME_MAXSIZE];
int pix_fmt_name_len;
- enum PixelFormat pix_fmt;
+ enum AVPixelFormat pix_fmt;
/* parse the list of formats */
for (cur = args; cur; cur = sep ? sep+1 : NULL) {
pix_fmt_name_len = strlen(cur);
else
pix_fmt_name_len = sep - cur;
- if (pix_fmt_name_len >= PIX_FMT_NAME_MAXSIZE) {
+ if (pix_fmt_name_len >= AV_PIX_FMT_NAME_MAXSIZE) {
av_log(ctx, AV_LOG_ERROR, "Format name too long\n");
return -1;
}
pix_fmt_name[pix_fmt_name_len] = 0;
pix_fmt = av_get_pix_fmt(pix_fmt_name);
- if (pix_fmt == PIX_FMT_NONE) {
+ if (pix_fmt == AV_PIX_FMT_NONE) {
av_log(ctx, AV_LOG_ERROR, "Unknown pixel format: %s\n", pix_fmt_name);
return -1;
}
static AVFilterFormats *make_format_list(FormatContext *format, int flag)
{
AVFilterFormats *formats;
- enum PixelFormat pix_fmt;
+ enum AVPixelFormat pix_fmt;
formats = av_mallocz(sizeof(AVFilterFormats));
- formats->formats = av_malloc(sizeof(enum PixelFormat) * PIX_FMT_NB);
+ formats->formats = av_malloc(sizeof(enum AVPixelFormat) * AV_PIX_FMT_NB);
- for (pix_fmt = 0; pix_fmt < PIX_FMT_NB; pix_fmt++)
+ for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++)
if (format->listed_pix_fmt_flags[pix_fmt] == flag)
formats->formats[formats->format_count++] = pix_fmt;
#if CONFIG_FORMAT_FILTER
static int query_formats_format(AVFilterContext *ctx)
{
- avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 1));
+ ff_set_common_formats(ctx, make_format_list(ctx->priv, 1));
return 0;
}
+static const AVFilterPad avfilter_vf_format_inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .get_video_buffer = ff_null_get_video_buffer,
+ },
+ { NULL }
+};
+
+static const AVFilterPad avfilter_vf_format_outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO
+ },
+ { NULL }
+};
+
AVFilter avfilter_vf_format = {
.name = "format",
.description = NULL_IF_CONFIG_SMALL("Convert the input video to one of the specified pixel formats."),
.priv_size = sizeof(FormatContext),
- .inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
- .get_video_buffer= ff_null_get_video_buffer,
- .start_frame = ff_null_start_frame,
- .draw_slice = ff_null_draw_slice,
- .end_frame = ff_null_end_frame, },
- { .name = NULL}},
- .outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AVMEDIA_TYPE_VIDEO },
- { .name = NULL}},
+ .inputs = avfilter_vf_format_inputs,
+ .outputs = avfilter_vf_format_outputs,
};
#endif /* CONFIG_FORMAT_FILTER */
#if CONFIG_NOFORMAT_FILTER
static int query_formats_noformat(AVFilterContext *ctx)
{
- avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 0));
+ ff_set_common_formats(ctx, make_format_list(ctx->priv, 0));
return 0;
}
+static const AVFilterPad avfilter_vf_noformat_inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .get_video_buffer = ff_null_get_video_buffer,
+ },
+ { NULL }
+};
+
+static const AVFilterPad avfilter_vf_noformat_outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO
+ },
+ { NULL }
+};
+
AVFilter avfilter_vf_noformat = {
.name = "noformat",
.description = NULL_IF_CONFIG_SMALL("Force libavfilter not to use any of the specified pixel formats for the input to the next filter."),
.priv_size = sizeof(FormatContext),
- .inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
- .get_video_buffer= ff_null_get_video_buffer,
- .start_frame = ff_null_start_frame,
- .draw_slice = ff_null_draw_slice,
- .end_frame = ff_null_end_frame, },
- { .name = NULL}},
- .outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AVMEDIA_TYPE_VIDEO },
- { .name = NULL}},
+ .inputs = avfilter_vf_noformat_inputs,
+ .outputs = avfilter_vf_noformat_outputs,
};
#endif /* CONFIG_NOFORMAT_FILTER */