virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Make input/output pads modifiable on a per-instance basis.

Browse Source 
This makes it possible to change filter callbacks (eg. to a SIMD version
on supported processors).  It also allows filters to change their own
input and output pads.

Commited in SoC by Bobby Bingham on 2007-07-31 19:20:54

Originally committed as revision 11995 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak
2008-02-15 21:37:07 +00:00
parent c6b0aa6802
commit c5ef7d7b3e
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
libavfilter/avfilter.c
View File

@@ -163,11 +163,11 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad,
/* find a format both filters support - TODO: auto-insert conversion filter */ /* find a format both filters support - TODO: auto-insert conversion filter */
link->format = -1; link->format = -1;
if(src->filter->outputs[srcpad].query_formats) if(src->output_pads[srcpad].query_formats)
fmts[0] = src->filter->outputs[srcpad].query_formats(link); fmts[0] = src->output_pads[srcpad].query_formats(link);
else else
fmts[0] = default_query_output_formats(link); fmts[0] = default_query_output_formats(link);
fmts[1] = dst->filter-> inputs[dstpad].query_formats(link); fmts[1] = dst->input_pads[dstpad].query_formats(link);
for(i = 0; fmts[0][i] != -1; i ++) for(i = 0; fmts[0][i] != -1; i ++)
for(j = 0; fmts[1][j] != -1; j ++) for(j = 0; fmts[1][j] != -1; j ++)
if(fmts[0][i] == fmts[1][j]) { if(fmts[0][i] == fmts[1][j]) {
@@ -186,13 +186,13 @@ format_done:
return -1; return -1;
} }
if (src->filter->outputs[srcpad].config_props) if (src->output_pads[srcpad].config_props)
src->filter->outputs[srcpad].config_props(link); src->output_pads[srcpad].config_props(link);
else else
default_config_output_link(link); default_config_output_link(link);
if (dst->filter->inputs[dstpad].config_props) if (dst->input_pads[dstpad].config_props)
dst->filter->inputs[dstpad].config_props(link); dst->input_pads[dstpad].config_props(link);
return 0; return 0;
} }
@@ -201,8 +201,8 @@ AVFilterPicRef *avfilter_get_video_buffer(AVFilterLink *link, int perms)
{ {
AVFilterPicRef *ret = NULL; AVFilterPicRef *ret = NULL;
if(link->dst->filter->inputs[link->dstpad].get_video_buffer) if(link->dst->input_pads[link->dstpad].get_video_buffer)
ret = link->dst->filter->inputs[link->dstpad].get_video_buffer(link, perms); ret = link->dst->input_pads[link->dstpad].get_video_buffer(link, perms);
if(!ret) if(!ret)
ret = avfilter_default_get_video_buffer(link, perms); ret = avfilter_default_get_video_buffer(link, perms);
@@ -212,7 +212,7 @@ AVFilterPicRef *avfilter_get_video_buffer(AVFilterLink *link, int perms)
void avfilter_request_frame(AVFilterLink *link) void avfilter_request_frame(AVFilterLink *link)
{ {
const AVFilterPad *pad = &link->src->filter->outputs[link->srcpad]; const AVFilterPad *pad = &link->src->output_pads[link->srcpad];
if(pad->request_frame) if(pad->request_frame)
pad->request_frame(link); pad->request_frame(link);
@@ -226,7 +226,7 @@ void avfilter_start_frame(AVFilterLink *link, AVFilterPicRef *picref)
{ {
void (*start_frame)(AVFilterLink *, AVFilterPicRef *); void (*start_frame)(AVFilterLink *, AVFilterPicRef *);
start_frame = link->dst->filter->inputs[link->dstpad].start_frame; start_frame = link->dst->input_pads[link->dstpad].start_frame;
if(!start_frame) if(!start_frame)
start_frame = avfilter_default_start_frame; start_frame = avfilter_default_start_frame;
@@ -237,7 +237,7 @@ void avfilter_end_frame(AVFilterLink *link)
{ {
void (*end_frame)(AVFilterLink *); void (*end_frame)(AVFilterLink *);
end_frame = link->dst->filter->inputs[link->dstpad].end_frame; end_frame = link->dst->input_pads[link->dstpad].end_frame;
if(!end_frame) if(!end_frame)
end_frame = avfilter_default_end_frame; end_frame = avfilter_default_end_frame;
@@ -246,10 +246,10 @@ void avfilter_end_frame(AVFilterLink *link)
void avfilter_draw_slice(AVFilterLink *link, uint8_t *data[4], int y, int h) void avfilter_draw_slice(AVFilterLink *link, uint8_t *data[4], int y, int h)
{ {
if(!link->dst->filter->inputs[link->dstpad].draw_slice) if(!link->dst->input_pads[link->dstpad].draw_slice)
return; return;
link->dst->filter->inputs[link->dstpad].draw_slice(link, data, y, h); link->dst->input_pads[link->dstpad].draw_slice(link, data, y, h);
} }
static int filter_cmp(const void *aa, const void *bb) static int filter_cmp(const void *aa, const void *bb)
@@ -321,8 +321,13 @@ AVFilterContext *avfilter_create(AVFilter *filter, char *inst_name)
ret->priv = av_mallocz(filter->priv_size); ret->priv = av_mallocz(filter->priv_size);
ret->input_count = pad_count(filter->inputs); 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->inputs = av_mallocz(sizeof(AVFilterLink*) * ret->input_count);
ret->output_count = pad_count(filter->outputs); 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); ret->outputs = av_mallocz(sizeof(AVFilterLink*) * ret->output_count);
return ret; return ret;
@@ -335,18 +340,20 @@ void avfilter_destroy(AVFilterContext *filter)
if(filter->filter->uninit) if(filter->filter->uninit)
filter->filter->uninit(filter); filter->filter->uninit(filter);
for(i = 0; i < pad_count(filter->filter->inputs); i ++) { for(i = 0; i < filter->input_count; i ++) {
if(filter->inputs[i]) if(filter->inputs[i])
filter->inputs[i]->src->outputs[filter->inputs[i]->srcpad] = NULL; filter->inputs[i]->src->outputs[filter->inputs[i]->srcpad] = NULL;
av_free(filter->inputs[i]); av_free(filter->inputs[i]);
} }
for(i = 0; i < pad_count(filter->filter->outputs); i ++) { for(i = 0; i < filter->output_count; i ++) {
if(filter->outputs[i]) if(filter->outputs[i])
filter->outputs[i]->dst->inputs[filter->outputs[i]->dstpad] = NULL; filter->outputs[i]->dst->inputs[filter->outputs[i]->dstpad] = NULL;
av_free(filter->outputs[i]); av_free(filter->outputs[i]);
} }
av_free(filter->name); av_free(filter->name);
av_free(filter->input_pads);
av_free(filter->output_pads);
av_free(filter->inputs); av_free(filter->inputs);
av_free(filter->outputs); av_free(filter->outputs);
av_free(filter->priv); av_free(filter->priv);