[FFmpeg-soc] [soc]: r592 - in libavfilter: Makefile avfilter.c avfilter.h defaults.c
koorogi
subversion at mplayerhq.hu
Thu Aug 2 17:14:05 CEST 2007
Author: koorogi
Date: Thu Aug 2 17:14:05 2007
New Revision: 592
Log:
Move default entry point implementations to their own file.
Make them externally visible because they may be useful for filters to use.
Added:
libavfilter/defaults.c
- copied, changed from r574, /libavfilter/avfilter.c
Modified:
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/avfilter.h
Modified: libavfilter/Makefile
==============================================================================
--- libavfilter/Makefile (original)
+++ libavfilter/Makefile Thu Aug 2 17:14:05 2007
@@ -4,6 +4,7 @@ CFLAGS+=-I$(SRC_PATH)/libavcodec
OBJS = avfilter.o \
avfiltergraph.o \
+ defaults.o \
# TODO: real conditional compilation
OBJS-yes = vsrc_dummy.o \
Modified: libavfilter/avfilter.c
==============================================================================
--- libavfilter/avfilter.c (original)
+++ libavfilter/avfilter.c Thu Aug 2 17:14:05 2007
@@ -31,70 +31,6 @@
static int filter_count = 0;
static AVFilter **filters = NULL;
-/* 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 = NULL;
-
- if(link->dst->output_count)
- 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 = NULL;
-
- if(link->dst->output_count)
- 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));
@@ -111,37 +47,6 @@ void avfilter_unref_pic(AVFilterPicRef *
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)
-{
- if(link->src->input_count && link->src->inputs[0]) {
- link->w = link->src->inputs[0]->w;
- link->h = link->src->inputs[0]->h;
- } else {
- /* XXX: any non-simple filter which would cause this branch to be taken
- * really should implement its own config_props() for this link. */
- link->w =
- link->h = 0;
- }
-
- 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)
-{
- if(link->src->input_count && link->src->inputs[0])
- return avfilter_make_format_list(1, link->src->inputs[0]->format);
- else
- /* XXX: any non-simple filter which would cause this branch to be taken
- * really should implement its own query_formats() for this link */
- return avfilter_make_format_list(0);
-}
-
int avfilter_link(AVFilterContext *src, unsigned srcpad,
AVFilterContext *dst, unsigned dstpad)
{
@@ -166,7 +71,7 @@ int avfilter_link(AVFilterContext *src,
if(src->output_pads[srcpad].query_formats)
fmts[0] = src->output_pads[srcpad].query_formats(link);
else
- fmts[0] = default_query_output_formats(link);
+ fmts[0] = avfilter_default_query_output_formats(link);
fmts[1] = dst->input_pads[dstpad].query_formats(link);
for(i = 0; fmts[0][i] != -1; i ++)
for(j = 0; fmts[1][j] != -1; j ++)
@@ -189,7 +94,7 @@ format_done:
if (src->output_pads[srcpad].config_props)
src->output_pads[srcpad].config_props(link);
else
- default_config_output_link(link);
+ avfilter_default_config_output_link(link);
if (dst->input_pads[dstpad].config_props)
dst->input_pads[dstpad].config_props(link);
Modified: libavfilter/avfilter.h
==============================================================================
--- libavfilter/avfilter.h (original)
+++ libavfilter/avfilter.h Thu Aug 2 17:14:05 2007
@@ -152,9 +152,13 @@ struct AVFilterPad
int (*config_props)(AVFilterLink *link);
};
-/* the default implementations of start_frame() and end_frame() */
+/* the default implementations of filter entry points */
void avfilter_default_start_frame(AVFilterLink *link, AVFilterPicRef *picref);
void avfilter_default_end_frame(AVFilterLink *link);
+int avfilter_default_config_output_link(AVFilterLink *link);
+int *avfilter_default_query_output_formats(AVFilterLink *link);
+AVFilterPicRef *avfilter_default_get_video_buffer(AVFilterLink *link,
+ int perms);
typedef struct
{
Copied: libavfilter/defaults.c (from r574, /libavfilter/avfilter.c)
==============================================================================
--- /libavfilter/avfilter.c (original)
+++ libavfilter/defaults.c Thu Aug 2 17:14:05 2007
@@ -1,5 +1,5 @@
/*
- * Filter layer
+ * Filter layer - default implementations
* copyright (c) 2007 Bobby Bingham
*
* This file is part of FFmpeg.
@@ -19,17 +19,7 @@
* 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;
/* TODO: buffer pool. see comment for avfilter_default_get_video_buffer() */
void avfilter_default_free_video_buffer(AVFilterPic *pic)
@@ -95,26 +85,10 @@ void avfilter_default_end_frame(AVFilter
}
}
-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)
+int avfilter_default_config_output_link(AVFilterLink *link)
{
if(link->src->input_count && link->src->inputs[0]) {
link->w = link->src->inputs[0]->w;
@@ -132,7 +106,7 @@ static int default_config_output_link(AV
/**
* 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)
+int *avfilter_default_query_output_formats(AVFilterLink *link)
{
if(link->src->input_count && link->src->inputs[0])
return avfilter_make_format_list(1, link->src->inputs[0]->format);
@@ -142,255 +116,3 @@ static int *default_query_output_formats
return avfilter_make_format_list(0);
}
-int avfilter_link(AVFilterContext *src, unsigned srcpad,
- AVFilterContext *dst, unsigned dstpad)
-{
- AVFilterLink *link;
- int *fmts[2], i, j;
-
- if(src->output_count <= srcpad || dst->input_count <= dstpad ||
- 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->output_pads[srcpad].query_formats)
- fmts[0] = src->output_pads[srcpad].query_formats(link);
- else
- fmts[0] = default_query_output_formats(link);
- fmts[1] = dst->input_pads[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->output_pads[srcpad].config_props)
- src->output_pads[srcpad].config_props(link);
- else
- default_config_output_link(link);
-
- if (dst->input_pads[dstpad].config_props)
- dst->input_pads[dstpad].config_props(link);
-
- return 0;
-}
-
-AVFilterPicRef *avfilter_get_video_buffer(AVFilterLink *link, int perms)
-{
- AVFilterPicRef *ret = NULL;
-
- if(link->dst->input_pads[link->dstpad].get_video_buffer)
- ret = link->dst->input_pads[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->output_pads[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->input_pads[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->input_pads[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)
-{
- if(!link->dst->input_pads[link->dstpad].draw_slice)
- return;
-
- link->dst->input_pads[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_graph);
- 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->priv = av_mallocz(filter->priv_size);
-
- ret->input_count = pad_count(filter->inputs);
- ret->input_pads = av_malloc(sizeof(AVFilterPad) * ret->input_count);
- memcpy(ret->input_pads, filter->inputs, sizeof(AVFilterPad)*ret->input_count);
- ret->inputs = av_mallocz(sizeof(AVFilterLink*) * ret->input_count);
-
- ret->output_count = pad_count(filter->outputs);
- ret->output_pads = av_malloc(sizeof(AVFilterPad) * ret->output_count);
- memcpy(ret->output_pads, filter->outputs, sizeof(AVFilterPad)*ret->output_count);
- ret->outputs = av_mallocz(sizeof(AVFilterLink*) * ret->output_count);
-
- return ret;
-}
-
-void avfilter_destroy(AVFilterContext *filter)
-{
- int i;
-
- if(filter->filter->uninit)
- filter->filter->uninit(filter);
-
- for(i = 0; i < filter->input_count; i ++) {
- if(filter->inputs[i])
- filter->inputs[i]->src->outputs[filter->inputs[i]->srcpad] = NULL;
- av_free(filter->inputs[i]);
- }
- for(i = 0; i < filter->output_count; 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->input_pads);
- av_free(filter->output_pads);
- 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, void *opaque)
-{
- int ret;
-
- if(filter->filter->init)
- if((ret = filter->filter->init(filter, args, opaque))) 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;
-}
-
More information about the FFmpeg-soc
mailing list