[FFmpeg-soc] [soc]: r421 - in libavfilter: Makefile avfilter.c avfilter.h avfiltergraph.c avfiltergraph.h filter_test.c
koorogi
subversion at mplayerhq.hu
Sat Jul 14 23:20:21 CEST 2007
Author: koorogi
Date: Sat Jul 14 23:20:21 2007
New Revision: 421
Log:
Split filter graphs out into their own source & header files.
Added:
libavfilter/avfiltergraph.c
- copied, changed from r419, /libavfilter/avfilter.c
libavfilter/avfiltergraph.h
- copied, changed from r418, /libavfilter/avfilter.h
Modified:
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/filter_test.c
Modified: libavfilter/Makefile
==============================================================================
--- libavfilter/Makefile (original)
+++ libavfilter/Makefile Sat Jul 14 23:20:21 2007
@@ -3,6 +3,7 @@ CFLAGS = -g -I../libavcodec -I../libavut
LIBS = ../libavcodec/libavcodec.a ../libavutil/libavutil.a -lm -lSDL
OBJECTS = avfilter.o \
+ avfiltergraph.o \
vsrc_dummy.o \
vsrc_ppm.o \
vo_sdl.o \
Modified: libavfilter/avfilter.c
==============================================================================
--- libavfilter/avfilter.c (original)
+++ libavfilter/avfilter.c Sat Jul 14 23:20:21 2007
@@ -31,33 +31,6 @@
static int filter_count = 0;
static AVFilter **filters = NULL;
-struct AVFilterGraph {
- unsigned filter_count;
- AVFilterContext **filters;
-};
-
-AVFilterGraph *avfilter_create_graph(void)
-{
- return av_mallocz(sizeof(AVFilterGraph));
-}
-
-void avfilter_destroy_graph(AVFilterGraph *graph)
-{
- unsigned i;
-
- for(i = 0; i < graph->filter_count; i ++)
- avfilter_destroy(graph->filters[i]);
- av_free(graph->filters);
- av_free(graph);
-}
-
-void avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
-{
- graph->filters = av_realloc(graph->filters,
- sizeof(AVFilterContext*) * ++graph->filter_count);
- graph->filters[graph->filter_count - 1] = filter;
-}
-
/* TODO: buffer pool. see comment for avfilter_default_get_video_buffer() */
void avfilter_default_free_video_buffer(AVFilterPic *pic)
{
Modified: libavfilter/avfilter.h
==============================================================================
--- libavfilter/avfilter.h (original)
+++ libavfilter/avfilter.h Sat Jul 14 23:20:21 2007
@@ -225,24 +225,4 @@ void avfilter_destroy(AVFilterContext *f
int *avfilter_make_format_list(int len, ...);
-typedef struct AVFilterGraph AVFilterGraph;
-
-/**
- * Create a new filter graph
- */
-AVFilterGraph *avfilter_create_graph(void);
-
-/**
- * Destroy a filter graph, and any filters in it.
- * @param graph The filter graph to destroy
- */
-void avfilter_destroy_graph(AVFilterGraph *graph);
-
-/**
- * Add an existing filter instance to a filter graph.
- * @param graph The filter graph
- * @param filter The filter to be added
- */
-void avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter);
-
#endif /* FFMPEG_AVFILTER_H */
Copied: libavfilter/avfiltergraph.c (from r419, /libavfilter/avfilter.c)
==============================================================================
--- /libavfilter/avfilter.c (original)
+++ libavfilter/avfiltergraph.c Sat Jul 14 23:20:21 2007
@@ -1,5 +1,5 @@
/*
- * Filter layer
+ * Filter graphs
* copyright (c) 2007 Bobby Bingham
*
* This file is part of FFmpeg.
@@ -19,17 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
#include "avfilter.h"
-#include "allfilters.h"
-
-/** list of registered filters, sorted by name */
-static int filter_count = 0;
-static AVFilter **filters = NULL;
+#include "avfiltergraph.h"
struct AVFilterGraph {
unsigned filter_count;
@@ -58,333 +49,3 @@ void avfilter_graph_add_filter(AVFilterG
graph->filters[graph->filter_count - 1] = filter;
}
-/* TODO: buffer pool. see comment for avfilter_default_get_video_buffer() */
-void avfilter_default_free_video_buffer(AVFilterPic *pic)
-{
- avpicture_free((AVPicture *) pic);
- av_free(pic);
-}
-
-/* TODO: set the buffer's priv member to a context structure for the whole
- * filter chain. This will allow for a buffer pool instead of the constant
- * alloc & free cycle currently implemented. */
-AVFilterPicRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms)
-{
- AVFilterPic *pic = av_mallocz(sizeof(AVFilterPic));
- AVFilterPicRef *ref = av_mallocz(sizeof(AVFilterPicRef));
-
- ref->pic = pic;
- ref->w = link->w;
- ref->h = link->h;
- ref->perms = perms;
-
- pic->refcount = 1;
- pic->format = link->format;
- pic->free = avfilter_default_free_video_buffer;
- avpicture_alloc((AVPicture *)pic, pic->format, ref->w, ref->h);
-
- memcpy(ref->data, pic->data, sizeof(pic->data));
- memcpy(ref->linesize, pic->linesize, sizeof(pic->linesize));
-
- return ref;
-}
-
-void avfilter_default_start_frame(AVFilterLink *link, AVFilterPicRef *picref)
-{
- AVFilterLink *out = link->dst->outputs[0];
-
- link->cur_pic = picref;
-
- if(out) {
- out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE);
- out->outpic->pts = picref->pts;
- avfilter_start_frame(out, avfilter_ref_pic(out->outpic, ~0));
- }
-}
-
-void avfilter_default_end_frame(AVFilterLink *link)
-{
- AVFilterLink *out = link->dst->outputs[0];
-
- avfilter_unref_pic(link->cur_pic);
- link->cur_pic = NULL;
-
- if(out) {
- avfilter_unref_pic(out->outpic);
- out->outpic = NULL;
- avfilter_end_frame(out);
- }
-}
-
-AVFilterPicRef *avfilter_ref_pic(AVFilterPicRef *ref, int pmask)
-{
- AVFilterPicRef *ret = av_malloc(sizeof(AVFilterPicRef));
- memcpy(ret, ref, sizeof(AVFilterPicRef));
- ret->perms &= pmask;
- ret->pic->refcount ++;
- return ret;
-}
-
-void avfilter_unref_pic(AVFilterPicRef *ref)
-{
- if(-- ref->pic->refcount == 0)
- ref->pic->free(ref->pic);
- av_free(ref);
-}
-
-/**
- * default config_link() implementation for output video links to simplify
- * the implementation of one input one output video filters */
-static int default_config_output_link(AVFilterLink *link)
-{
- link->w = link->src->inputs[0]->w;
- link->h = link->src->inputs[0]->h;
-
- return 0;
-}
-
-/**
- * default query_formats() implementation for output video links to simplify
- * the implementation of one input one output video filters */
-static int *default_query_output_formats(AVFilterLink *link)
-{
- return avfilter_make_format_list(1, link->src->inputs[0]->format);
-}
-
-int avfilter_link(AVFilterContext *src, unsigned srcpad,
- AVFilterContext *dst, unsigned dstpad)
-{
- AVFilterLink *link;
- int *fmts[2], i, j;
-
- if(src->outputs[srcpad] || dst->inputs[dstpad])
- return -1;
-
- src->outputs[srcpad] =
- dst->inputs[dstpad] = link = av_malloc(sizeof(AVFilterLink));
-
- link->src = src;
- link->dst = dst;
- link->srcpad = srcpad;
- link->dstpad = dstpad;
- link->cur_pic = NULL;
-
- /* find a format both filters support - TODO: auto-insert conversion filter */
- link->format = -1;
- if(src->filter->outputs[srcpad].query_formats)
- fmts[0] = src->filter->outputs[srcpad].query_formats(link);
- else
- fmts[0] = default_query_output_formats(link);
- fmts[1] = dst->filter-> inputs[dstpad].query_formats(link);
- for(i = 0; fmts[0][i] != -1; i ++)
- for(j = 0; fmts[1][j] != -1; j ++)
- if(fmts[0][i] == fmts[1][j]) {
- link->format = fmts[0][i];
- goto format_done;
- }
-
-format_done:
- av_free(fmts[0]);
- av_free(fmts[1]);
- if(link->format == -1) {
- /* failed to find a format. fail at creating the link */
- av_free(link);
- src->outputs[srcpad] = NULL;
- dst->inputs[dstpad] = NULL;
- return -1;
- }
-
- if (src->filter->outputs[srcpad].config_props)
- src->filter->outputs[srcpad].config_props(link);
- else
- default_config_output_link(link);
-
- if (dst->filter->inputs[dstpad].config_props)
- dst->filter->inputs[dstpad].config_props(link);
-
- return 0;
-}
-
-AVFilterPicRef *avfilter_get_video_buffer(AVFilterLink *link, int perms)
-{
- AVFilterPicRef *ret = NULL;
-
- if(link->dst->filter->inputs[link->dstpad].get_video_buffer)
- ret = link->dst->filter->inputs[link->dstpad].get_video_buffer(link, perms);
-
- if(!ret)
- ret = avfilter_default_get_video_buffer(link, perms);
-
- return ret;
-}
-
-void avfilter_request_frame(AVFilterLink *link)
-{
- const AVFilterPad *pad = &link->src->filter->outputs[link->srcpad];
-
- if(pad->request_frame)
- pad->request_frame(link);
- else if(link->src->inputs[0])
- avfilter_request_frame(link->src->inputs[0]);
-}
-
-/* XXX: should we do the duplicating of the picture ref here, instead of
- * forcing the source filter to do it? */
-void avfilter_start_frame(AVFilterLink *link, AVFilterPicRef *picref)
-{
- void (*start_frame)(AVFilterLink *, AVFilterPicRef *);
-
- start_frame = link->dst->filter->inputs[link->dstpad].start_frame;
- if(!start_frame)
- start_frame = avfilter_default_start_frame;
-
- start_frame(link, picref);
-}
-
-void avfilter_end_frame(AVFilterLink *link)
-{
- void (*end_frame)(AVFilterLink *);
-
- end_frame = link->dst->filter->inputs[link->dstpad].end_frame;
- if(!end_frame)
- end_frame = avfilter_default_end_frame;
-
- end_frame(link);
-}
-
-void avfilter_draw_slice(AVFilterLink *link, uint8_t *data[4], int y, int h)
-{
- link->dst->filter->inputs[link->dstpad].draw_slice(link, data, y, h);
-}
-
-static int filter_cmp(const void *aa, const void *bb)
-{
- const AVFilter *a = *(const AVFilter **)aa, *b = *(const AVFilter **)bb;
- return strcmp(a->name, b->name);
-}
-
-AVFilter *avfilter_get_by_name(char *name)
-{
- AVFilter key = { .name = name, };
- AVFilter *key2 = &key;
- AVFilter **ret;
-
- ret = bsearch(&key2, filters, filter_count, sizeof(AVFilter **), filter_cmp);
- if(ret)
- return *ret;
- return NULL;
-}
-
-/* FIXME: insert in order, rather than insert at end + resort */
-void avfilter_register(AVFilter *filter)
-{
- filters = av_realloc(filters, sizeof(AVFilter*) * (filter_count+1));
- filters[filter_count] = filter;
- qsort(filters, ++filter_count, sizeof(AVFilter **), filter_cmp);
-}
-
-void avfilter_init(void)
-{
- avfilter_register(&vsrc_dummy);
- avfilter_register(&vsrc_ppm);
- avfilter_register(&vf_crop);
- avfilter_register(&vf_passthrough);
- avfilter_register(&vf_rgb2bgr);
- avfilter_register(&vf_slicify);
- avfilter_register(&vo_sdl);
-}
-
-void avfilter_uninit(void)
-{
- av_freep(&filters);
- filter_count = 0;
-}
-
-static int pad_count(const AVFilterPad *pads)
-{
- AVFilterPad *p = (AVFilterPad *) pads;
- int count;
-
- for(count = 0; p->name; count ++) p ++;
- return count;
-}
-
-static const char *filter_name(void *p)
-{
- AVFilterContext *filter = p;
- return filter->filter->name;
-}
-
-AVFilterContext *avfilter_create(AVFilter *filter, char *inst_name)
-{
- AVFilterContext *ret = av_malloc(sizeof(AVFilterContext));
-
- ret->av_class = av_mallocz(sizeof(AVClass));
- ret->av_class->item_name = filter_name;
- ret->filter = filter;
- ret->name = inst_name ? av_strdup(inst_name) : NULL;
- ret->inputs = av_mallocz(sizeof(AVFilterLink*) * pad_count(filter->inputs));
- ret->outputs = av_mallocz(sizeof(AVFilterLink*) * pad_count(filter->outputs));
- ret->priv = av_mallocz(filter->priv_size);
-
- return ret;
-}
-
-void avfilter_destroy(AVFilterContext *filter)
-{
- int i;
-
- if(filter->filter->uninit)
- filter->filter->uninit(filter);
-
- for(i = 0; i < pad_count(filter->filter->inputs); i ++) {
- if(filter->inputs[i])
- filter->inputs[i]->src->outputs[filter->inputs[i]->srcpad] = NULL;
- av_free(filter->inputs[i]);
- }
- for(i = 0; i < pad_count(filter->filter->outputs); i ++) {
- if(filter->outputs[i])
- filter->outputs[i]->dst->inputs[filter->outputs[i]->dstpad] = NULL;
- av_free(filter->outputs[i]);
- }
-
- av_free(filter->name);
- av_free(filter->inputs);
- av_free(filter->outputs);
- av_free(filter->priv);
- av_free(filter->av_class);
- av_free(filter);
-}
-
-AVFilterContext *avfilter_create_by_name(char *name, char *inst_name)
-{
- AVFilter *filt;
-
- if(!(filt = avfilter_get_by_name(name))) return NULL;
- return avfilter_create(filt, inst_name);
-}
-
-int avfilter_init_filter(AVFilterContext *filter, const char *args)
-{
- int ret, i;
-
- if(filter->filter->init)
- if((ret = filter->filter->init(filter, args))) return ret;
- return 0;
-}
-
-int *avfilter_make_format_list(int len, ...)
-{
- int *ret, i;
- va_list vl;
-
- ret = av_malloc(sizeof(int) * (len + 1));
- va_start(vl, len);
- for(i = 0; i < len; i ++)
- ret[i] = va_arg(vl, int);
- va_end(vl);
- ret[len] = -1;
-
- return ret;
-}
-
Copied: libavfilter/avfiltergraph.h (from r418, /libavfilter/avfilter.h)
==============================================================================
--- /libavfilter/avfilter.h (original)
+++ libavfilter/avfiltergraph.h Sat Jul 14 23:20:21 2007
@@ -1,5 +1,5 @@
/*
- * Filter layer
+ * Filter graphs
* copyright (c) 2007 Bobby Bingham
*
* This file is part of FFmpeg.
@@ -19,211 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef FFMPEG_AVFILTER_H
-#define FFMPEG_AVFILTER_H
-
-#include "avcodec.h"
-
-typedef struct AVFilterContext AVFilterContext;
-typedef struct AVFilterLink AVFilterLink;
-typedef struct AVFilterPad AVFilterPad;
-
-/* TODO: look for other flags which may be useful in this structure (interlace
- * flags, etc)
- */
-/**
- * A reference-counted picture data type used by the filter system. Filters
- * should not store pointers to this structure directly, but instead use the
- * AVFilterPicRef structure below
- */
-typedef struct AVFilterPic
-{
- uint8_t *data[4];
- int linesize[4]; ///< number of bytes per line
- enum PixelFormat format;
-
- unsigned refcount;
- void *priv;
- void (*free)(struct AVFilterPic *pic);
-} AVFilterPic;
-
-/**
- * A reference to an AVFilterPic. Since filters can manipulate the origin of
- * a picture to, for example, crop image without any memcpy, the picture origin
- * and dimensions are per-reference properties. Linesize is also useful for
- * image flipping, frame to field filters, etc, and so is also per-reference.
- *
- * TODO: add anything necessary for frame reordering
- */
-typedef struct AVFilterPicRef
-{
- AVFilterPic *pic;
- uint8_t *data[4];
- int linesize[4];
- int w, h;
-
- int64_t pts; ///< presentation timestamp in milliseconds
-
- int perms; ///< permissions
-#define AV_PERM_READ 0x01 ///< can read from the buffer
-#define AV_PERM_WRITE 0x02 ///< can write to the buffer
-#define AV_PERM_PRESERVE 0x04 ///< nobody else can overwrite the buffer
-#define AV_PERM_REUSE 0x08 ///< can output the buffer multiple times
-} AVFilterPicRef;
-
-/**
- * Add a new reference to a picture.
- * @param ref An existing reference to the picture
- * @param pmask A bitmask containing the allowable permissions in the new reference
- * @return A new reference to the picture with the same properties as the old
- */
-AVFilterPicRef *avfilter_ref_pic(AVFilterPicRef *ref, int pmask);
-
-/**
- * Remove a reference to a picture. If this is the last reference to the
- * picture, the picture itself is also automatically freed.
- * @param ref Reference to the picture.
- */
-void avfilter_unref_pic(AVFilterPicRef *ref);
-
-struct AVFilterPad
-{
- /**
- * Pad name. The name is unique among inputs and among oututs, but an
- * input may have the same name as an output.
- */
- char *name;
-
- /**
- * AVFilterPad type. Only video supported now, hopefully someone will
- * add audio in the future.
- */
- int type;
-#define AV_PAD_VIDEO 0
-
- /**
- * Callback to get a list of supported formats. The returned list should
- * be terminated by -1. This is used for both input and output pads and
- * is required for both.
- */
- int *(*query_formats)(AVFilterLink *link);
-
- /**
- * Callback called before passing the first slice of a new frame. If
- * NULL, the filter layer will default to storing a reference to the
- * picture inside the link structure.
- */
- void (*start_frame)(AVFilterLink *link, AVFilterPicRef *picref);
-
- /**
- * Callback function to get a buffer. If NULL, the filter system will
- * handle buffer requests. Only required for input video pads.
- */
- AVFilterPicRef *(*get_video_buffer)(AVFilterLink *link, int perms);
-
- /**
- * Callback called after the slices of a frame are completely sent. If
- * NULL, the filter layer will default to releasing the reference stored
- * in the link structure during start_frame().
- */
- void (*end_frame)(AVFilterLink *link);
-
- /**
- * Slice drawing callback. This is where a filter receives video data
- * and should do its processing. Only required for input video pads.
- */
- void (*draw_slice)(AVFilterLink *link, uint8_t *data[4], int y, int height);
-
- /**
- * Frame request callback. A call to this should result in at least one
- * frame being output over the given link. Video output pads only.
- */
- void (*request_frame)(AVFilterLink *link);
-
- /**
- * Link configuration callback. For output pads, this should set the link
- * properties such as width/height. NOTE: this should not set the format
- * property - that is negotiated between filters by the filter system using
- * the query_formats() callback.
- *
- * For input pads, this should check the properties of the link, and update
- * the filter's internal state as necessary.
- */
- int (*config_props)(AVFilterLink *link);
-};
-
-/* the default implementations of start_frame() and end_frame() */
-void avfilter_default_start_frame(AVFilterLink *link, AVFilterPicRef *picref);
-void avfilter_default_end_frame(AVFilterLink *link);
-
-typedef struct
-{
- char *name;
- char *author;
-
- int priv_size;
-
- /**
- * Filter initialization function. Args contains the user-supplied
- * parameters. FIXME: maybe an AVOption-based system would be better?
- */
- int (*init)(AVFilterContext *ctx, const char *args);
- void (*uninit)(AVFilterContext *ctx);
-
- const AVFilterPad *inputs; /// NULL terminated list of inputs. NULL if none
- const AVFilterPad *outputs; /// NULL terminated list of outputs. NULL if none
-} AVFilter;
-
-struct AVFilterContext
-{
- AVClass *av_class;
-
- AVFilter *filter;
-
- char *name;
-
- AVFilterLink **inputs;
- AVFilterLink **outputs;
-
- void *priv;
-};
-
-struct AVFilterLink
-{
- AVFilterContext *src;
- unsigned int srcpad;
-
- AVFilterContext *dst;
- unsigned int dstpad;
-
- int w, h;
- enum PixelFormat format;
-
- AVFilterPicRef *cur_pic;
- AVFilterPicRef *outpic;
-};
-
-/** Link two filters together */
-int avfilter_link(AVFilterContext *src, unsigned srcpad,
- AVFilterContext *dst, unsigned dstpad);
-
-AVFilterPicRef *avfilter_get_video_buffer(AVFilterLink *link, int perms);
-void avfilter_request_frame(AVFilterLink *link);
-void avfilter_start_frame(AVFilterLink *link, AVFilterPicRef *picref);
-void avfilter_end_frame(AVFilterLink *link);
-void avfilter_draw_slice(AVFilterLink *link, uint8_t *data[4], int y, int h);
-
-void avfilter_init(void);
-void avfilter_uninit(void);
-void avfilter_register(AVFilter *filter);
-AVFilter *avfilter_get_by_name(char *name);
-
-AVFilterContext *avfilter_create(AVFilter *filter, char *inst_name);
-AVFilterContext *avfilter_create_by_name(char *name, char *inst_name);
-int avfilter_init_filter(AVFilterContext *filter, const char *args);
-void avfilter_destroy(AVFilterContext *filter);
+#ifndef FFMPEG_AVFILTER_GRAPH_H
+#define FFMPEG_AVFILTER_GRAPH_H
-int *avfilter_make_format_list(int len, ...);
+#include "avfilter.h"
typedef struct AVFilterGraph AVFilterGraph;
Modified: libavfilter/filter_test.c
==============================================================================
--- libavfilter/filter_test.c (original)
+++ libavfilter/filter_test.c Sat Jul 14 23:20:21 2007
@@ -23,6 +23,7 @@
#include <string.h>
#include "avfilter.h"
+#include "avfiltergraph.h"
int64_t sdl_display(AVFilterContext *ctx);
More information about the FFmpeg-soc
mailing list