highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework filter initialization sequence. Now supports passing user parameters,

Browse Source 
querying supported colorspaces, etc.

Commited in SoC by Bobby Bingham on 2007-07-05 20:48:48

Originally committed as revision 11974 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak
2008-02-15 21:35:45 +00:00
parent 89e64908a3
commit e0752603a1
1 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
libavfilter/avfilter.c
View File

@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
@@ -91,6 +92,7 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad,
AVFilterContext *dst, unsigned dstpad) AVFilterContext *dst, unsigned dstpad)
{ {
AVFilterLink *link; AVFilterLink *link;
int *fmts[2], i, j;
if(src->outputs[srcpad] || dst->inputs[dstpad]) if(src->outputs[srcpad] || dst->inputs[dstpad])
return -1; return -1;
@@ -104,7 +106,29 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad,
link->dstpad = dstpad; link->dstpad = dstpad;
link->cur_pic = NULL; link->cur_pic = NULL;
src->filter->outputs[dstpad].set_video_props(link); /* find a format both filters support - TODO: auto-insert conversion filter */
fmts[0] = src->filter->outputs[srcpad].query_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;
}
src->filter->outputs[srcpad].config_props(link);
dst->filter->inputs[dstpad].config_props(link);
return 0; return 0;
} }
@@ -263,9 +287,21 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args)
if(filter->filter->init) if(filter->filter->init)
if((ret = filter->filter->init(filter, args))) return ret; if((ret = filter->filter->init(filter, args))) return ret;
for(i = 0; i < pad_count(filter->filter->outputs); i ++)
if(filter->outputs[i])
filter->filter->outputs[i].set_video_props(filter->outputs[i]);
return 0; 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;
}