lavfi: remove some draw_slice related code that has become unneeded

Michael Niedermayer committed 13 years ago

Commit c0c0b191 parent 8997a0f3 files · +5 −34Browse files

Unified · Split

3 files

libavfilter/avfilter.c +1 −1
libavfilter/internal.h +0 −10
libavfilter/video.c +4 −23

@@ -421,7 +421,7 @@ int avfilter_register(AVFilter *filter) · 420 unmodified lines
421	for(i=0; filter->inputs && filter->inputs[i].name; i++) {	421	for(i=0; filter->inputs && filter->inputs[i].name; i++) {
422	const AVFilterPad *input = &filter->inputs[i];	422	const AVFilterPad *input = &filter->inputs[i];
423	av_assert0( !input->filter_frame	423	av_assert0( !input->filter_frame
424	\|\| (!input->start_frame && !input->end_frame && !input->draw_slice));	424	\|\| (!input->start_frame && !input->end_frame));
425	}	425	}
426		426
427	registered_avfilters[next_registered_avfilter_idx++] = filter;	427	registered_avfilters[next_registered_avfilter_idx++] = filter;

libavfilter/internal.h+0−10

@@ -127,16 +127,6 @@ struct AVFilterPad { · 126 unmodified lines
127	*/	127	*/
128	int (end_frame)(AVFilterLink link);	128	int (end_frame)(AVFilterLink link);
129		129
130	/**
131	* Slice drawing callback. This is where a filter receives video data
132	* and should do its processing.
133	*
134	* Input video pads only.
135	*
136	* @return >= 0 on success, a negative AVERROR on error.
137	*/
138	int (draw_slice)(AVFilterLink link, int y, int height, int slice_dir);
139
140	/**	130	/**
141	* Filtering callback. This is where a filter receives a frame with	131	* Filtering callback. This is where a filter receives a frame with
142	* audio/video data and should do its processing.	132	* audio/video data and should do its processing.

libavfilter/video.c+4−23

     if (inlink->dst->nb_outputs)
         outlink = inlink->dst->outputs[0];
-    if (outlink && (inlink->dstpad->start_frame || inlink->dstpad->end_frame || inlink->dstpad->draw_slice)) {
+    if (outlink && (inlink->dstpad->start_frame || inlink->dstpad->end_frame)) {
         AVFilterBufferRef *buf_out;
         outlink->out_buf = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
         if (!outlink->out_buf)
             int ret = inlink->dstpad->filter_frame(inlink, inlink->cur_buf);
             inlink->cur_buf = NULL;
             return ret;
-        } else if (inlink->dstpad->start_frame || inlink->dstpad->end_frame || inlink->dstpad->draw_slice){
+        } else if (inlink->dstpad->start_frame || inlink->dstpad->end_frame){
             return ff_end_frame(outlink);
         } else {
             int ret = ff_filter_frame(outlink, inlink->cur_buf);
     return ret;
 }
-static int default_draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
-{
-    AVFilterLink *outlink = NULL;
-    if (inlink->dst->nb_outputs)
-        outlink = inlink->dst->outputs[0];
-    if (outlink && (inlink->dstpad->start_frame || inlink->dstpad->end_frame || inlink->dstpad->draw_slice))
-        return ff_draw_slice(outlink, y, h, slice_dir);
-    return 0;
-}
 int ff_draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
 {
     uint8_t *src[4], *dst[4];
-    int i, j, vsub, ret;
+    int i, j, vsub;
-    int (*draw_slice)(AVFilterLink *, int, int, int);
     FF_TPRINTF_START(NULL, draw_slice); ff_tlog_link(NULL, link, 0); ff_tlog(NULL, " y:%d h:%d dir:%d\n", y, h, slice_dir);
         }
     }
-    if (!(draw_slice = link->dstpad->draw_slice))
-        draw_slice = default_draw_slice;
-    ret = draw_slice(link, y, h, slice_dir);
-    if (ret < 0)
-        clear_link(link);
-    else
         /* incoming buffers must not be freed in start frame,
            because they can still be in use by the automatic copy mechanism */
         av_assert1(link->cur_buf_copy->buf->refcount > 0);
-    return ret;
+    return 0;
 }

lavfi: remove some draw_slice related code that has become unneeded

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code