Add format and noformat filters.
Originally committed as revision 20390 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini
parent
51135d1d8e
commit
fcbed3c735
@ -111,6 +111,40 @@ corner of the input image.
|
||||
|
||||
The default value of ``width'' and ``height'' is 0.
|
||||
|
||||
@section format
|
||||
|
||||
Convert the input video to one of the specified pixel formats.
|
||||
Libavfilter will try to pick one that is supported as the input to
|
||||
the next filter.
|
||||
|
||||
The filter takes as argument a list of pixel format names, separated
|
||||
by ``:'', for example ``yuv420p:monow:rgb24''.
|
||||
|
||||
The following command:
|
||||
|
||||
@example
|
||||
./ffmpeg -i in.avi -vfilters "format=yuv420p" out.avi
|
||||
@end example
|
||||
|
||||
will convert the input video to the format ``yuv420p''.
|
||||
|
||||
@section noformat
|
||||
|
||||
Force libavfilter not to use any of the specified pixel formats as the
|
||||
input to the next filter.
|
||||
|
||||
The filter takes as argument a list of pixel format names, separated
|
||||
by ``:'', for example ``yuv420p:monow:rgb24''.
|
||||
|
||||
The following command:
|
||||
|
||||
@example
|
||||
./ffmpeg -i in.avi -vfilters "noformat=yuv420p, vflip" out.avi
|
||||
@end example
|
||||
|
||||
will make libavfilter use a format different from ``yuv420p'' as the
|
||||
input to the vflip filter.
|
||||
|
||||
@section null
|
||||
|
||||
Pass the source unchanged to the output.
|
||||
|
||||
@ -12,6 +12,8 @@ OBJS = allfilters.o \
|
||||
formats.o \
|
||||
|
||||
OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o
|
||||
OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o
|
||||
OBJS-$(CONFIG_NOFORMAT_FILTER) += vf_format.o
|
||||
OBJS-$(CONFIG_NULL_FILTER) += vf_null.o
|
||||
OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
|
||||
|
||||
|
||||
@ -35,6 +35,8 @@ void avfilter_register_all(void)
|
||||
initialized = 1;
|
||||
|
||||
REGISTER_FILTER (CROP,crop,vf);
|
||||
REGISTER_FILTER (FORMAT,format,vf);
|
||||
REGISTER_FILTER (NOFORMAT,noformat,vf);
|
||||
REGISTER_FILTER (NULL,null,vf);
|
||||
REGISTER_FILTER (VFLIP,vflip,vf);
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
#define AVFILTER_AVFILTER_H
|
||||
|
||||
#define LIBAVFILTER_VERSION_MAJOR 1
|
||||
#define LIBAVFILTER_VERSION_MINOR 5
|
||||
#define LIBAVFILTER_VERSION_MINOR 6
|
||||
#define LIBAVFILTER_VERSION_MICRO 0
|
||||
|
||||
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
|
||||
|
||||
154
libavfilter/vf_format.c
Normal file
154
libavfilter/vf_format.c
Normal file
@ -0,0 +1,154 @@
|
||||
/*
|
||||
* copyright (c) 2007 Bobby Bingham
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* FFmpeg is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with FFmpeg; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file libavfilter/vf_format.c
|
||||
* video format and noformat filters
|
||||
*/
|
||||
|
||||
#include "avfilter.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];
|
||||
} FormatContext;
|
||||
|
||||
#define PIX_FMT_NAME_MAXSIZE 32
|
||||
|
||||
static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
|
||||
{
|
||||
FormatContext *format = ctx->priv;
|
||||
const char *cur, *sep;
|
||||
char pix_fmt_name[PIX_FMT_NAME_MAXSIZE];
|
||||
int pix_fmt_name_len;
|
||||
enum PixelFormat pix_fmt;
|
||||
|
||||
/* parse the list of formats */
|
||||
for (cur = args; cur; cur = sep ? sep+1 : NULL) {
|
||||
if (!(sep = strchr(cur, ':')))
|
||||
pix_fmt_name_len = strlen(cur);
|
||||
else
|
||||
pix_fmt_name_len = sep - cur;
|
||||
if (pix_fmt_name_len >= PIX_FMT_NAME_MAXSIZE) {
|
||||
av_log(ctx, AV_LOG_ERROR, "Format name too long\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
memcpy(pix_fmt_name, cur, pix_fmt_name_len);
|
||||
pix_fmt_name[pix_fmt_name_len] = 0;
|
||||
pix_fmt = avcodec_get_pix_fmt(pix_fmt_name);
|
||||
|
||||
if (pix_fmt == PIX_FMT_NONE) {
|
||||
av_log(ctx, AV_LOG_ERROR, "Unknown pixel format: %s\n", pix_fmt_name);
|
||||
return -1;
|
||||
}
|
||||
|
||||
format->listed_pix_fmt_flags[pix_fmt] = 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static AVFilterFormats *make_format_list(FormatContext *format, int flag)
|
||||
{
|
||||
AVFilterFormats *formats;
|
||||
enum PixelFormat pix_fmt;
|
||||
|
||||
formats = av_mallocz(sizeof(AVFilterFormats));
|
||||
formats->formats = av_malloc(sizeof(enum PixelFormat) * PIX_FMT_NB);
|
||||
|
||||
for (pix_fmt = 0; pix_fmt < PIX_FMT_NB; pix_fmt++)
|
||||
if (format->listed_pix_fmt_flags[pix_fmt] == flag)
|
||||
formats->formats[formats->format_count++] = pix_fmt;
|
||||
|
||||
return formats;
|
||||
}
|
||||
|
||||
static int query_formats_format(AVFilterContext *ctx)
|
||||
{
|
||||
avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 1));
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int query_formats_noformat(AVFilterContext *ctx)
|
||||
{
|
||||
avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 0));
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
|
||||
{
|
||||
avfilter_start_frame(link->dst->outputs[0], picref);
|
||||
}
|
||||
|
||||
static void end_frame(AVFilterLink *link)
|
||||
{
|
||||
avfilter_end_frame(link->dst->outputs[0]);
|
||||
}
|
||||
|
||||
static void draw_slice(AVFilterLink *link, int y, int h)
|
||||
{
|
||||
avfilter_draw_slice(link->dst->outputs[0], y, h);
|
||||
}
|
||||
|
||||
AVFilter avfilter_vf_format = {
|
||||
.name = "format",
|
||||
.description = "Convert the input video to one of the specified pixel formats.",
|
||||
|
||||
.init = init,
|
||||
|
||||
.query_formats = query_formats_format,
|
||||
|
||||
.priv_size = sizeof(FormatContext),
|
||||
|
||||
.inputs = (AVFilterPad[]) {{ .name = "default",
|
||||
.type = CODEC_TYPE_VIDEO,
|
||||
.start_frame = start_frame,
|
||||
.draw_slice = draw_slice,
|
||||
.end_frame = end_frame, },
|
||||
{ .name = NULL}},
|
||||
.outputs = (AVFilterPad[]) {{ .name = "default",
|
||||
.type = CODEC_TYPE_VIDEO },
|
||||
{ .name = NULL}},
|
||||
};
|
||||
|
||||
AVFilter avfilter_vf_noformat = {
|
||||
.name = "noformat",
|
||||
.description = "Force libavfilter not to use any of the specified pixel formats as the input to the next filter.",
|
||||
|
||||
.init = init,
|
||||
|
||||
.query_formats = query_formats_noformat,
|
||||
|
||||
.priv_size = sizeof(FormatContext),
|
||||
|
||||
.inputs = (AVFilterPad[]) {{ .name = "default",
|
||||
.type = CODEC_TYPE_VIDEO,
|
||||
.start_frame = start_frame,
|
||||
.draw_slice = draw_slice,
|
||||
.end_frame = end_frame, },
|
||||
{ .name = NULL}},
|
||||
.outputs = (AVFilterPad[]) {{ .name = "default",
|
||||
.type = CODEC_TYPE_VIDEO },
|
||||
{ .name = NULL}},
|
||||
};
|
||||
Loading…
x
Reference in New Issue
Block a user