Move code out of if
[ffmpeg.git] / libavfilter / avfilter.c
index 08a7484..420e7c2 100644 (file)
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/imgconvert.h"
 #include "avfilter.h"
-#include "allfilters.h"
 
 /** list of registered filters */
 struct FilterList
@@ -67,7 +67,7 @@ void avfilter_insert_pad(unsigned idx, unsigned *count, size_t padidx_off,
     (*count) ++;
     for(i = idx+1; i < *count; i ++)
         if(*links[i])
-            (*(unsigned *)((uint8_t *)(*links[i]) + padidx_off)) ++;
+            (*(unsigned *)((uint8_t *) *links[i] + padidx_off)) ++;
 }
 
 int avfilter_link(AVFilterContext *src, unsigned srcpad,
@@ -80,7 +80,7 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad,
         return -1;
 
     src->outputs[srcpad] =
-    dst->inputs[dstpad]  = link = av_mallocz(sizeof(AVFilterLink));
+    dst-> inputs[dstpad] = link = av_mallocz(sizeof(AVFilterLink));
 
     link->src     = src;
     link->dst     = dst;
@@ -94,8 +94,6 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad,
 int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt,
                            unsigned in, unsigned out)
 {
-    AVFilterFormats *formats;
-
     av_log(link->dst, AV_LOG_INFO, "auto-inserting filter '%s'\n",
             filt->filter->name);
 
@@ -113,7 +111,7 @@ int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt,
 
     /* if any information on supported colorspaces already exists on the
      * link, we need to preserve that */
-    if((formats = link->out_formats))
+    if(link->out_formats)
         avfilter_formats_changeref(&link->out_formats,
                                    &filt->outputs[out]->out_formats);
 
@@ -134,8 +132,8 @@ int avfilter_config_links(AVFilterContext *filter)
         case AVLINK_INIT:
             continue;
         case AVLINK_STARTINIT:
-            av_log(filter, AV_LOG_ERROR, "circular filter chain detected\n");
-            return -1;
+            av_log(filter, AV_LOG_INFO, "circular filter chain detected\n");
+            return 0;
         case AVLINK_UNINIT:
             link->init_state = AVLINK_STARTINIT;
 
@@ -148,8 +146,8 @@ int avfilter_config_links(AVFilterContext *filter)
                 return -1;
 
             if((config_link = link_dpad(link).config_props))
-            if(config_link(link))
-                return -1;
+                if(config_link(link))
+                    return -1;
 
             link->init_state = AVLINK_INIT;
         }
@@ -186,12 +184,12 @@ int avfilter_poll_frame(AVFilterLink *link)
 
     if(link_spad(link).poll_frame)
         return link_spad(link).poll_frame(link);
-    else
-        for (i=0; i<link->src->input_count; i++) {
-            if(!link->src->inputs[i])
-                return -1;
-            min = FFMIN(min, avfilter_poll_frame(link->src->inputs[i]));
-        }
+
+    for (i=0; i<link->src->input_count; i++) {
+        if(!link->src->inputs[i])
+            return -1;
+        min = FFMIN(min, avfilter_poll_frame(link->src->inputs[i]));
+    }
 
     return min;
 }
@@ -201,13 +199,14 @@ int avfilter_poll_frame(AVFilterLink *link)
 void avfilter_start_frame(AVFilterLink *link, AVFilterPicRef *picref)
 {
     void (*start_frame)(AVFilterLink *, AVFilterPicRef *);
+    AVFilterPad *dst = &link_dpad(link);
 
-    if(!(start_frame = link_dpad(link).start_frame))
+    if(!(start_frame = dst->start_frame))
         start_frame = avfilter_default_start_frame;
 
     /* prepare to copy the picture if it has insufficient permissions */
-    if((link_dpad(link).min_perms & picref->perms) != link_dpad(link).min_perms ||
-        link_dpad(link).rej_perms & picref->perms) {
+    if((dst->min_perms & picref->perms) != dst->min_perms ||
+        dst->rej_perms & picref->perms) {
         /*
         av_log(link->dst, AV_LOG_INFO,
                 "frame copy needed (have perms %x, need %x, reject %x)\n",
@@ -215,7 +214,7 @@ void avfilter_start_frame(AVFilterLink *link, AVFilterPicRef *picref)
                 link_dpad(link).min_perms, link_dpad(link).rej_perms);
         */
 
-        link->cur_pic = avfilter_default_get_video_buffer(link, link_dpad(link).min_perms);
+        link->cur_pic = avfilter_default_get_video_buffer(link, dst->min_perms);
         link->srcpic = picref;
         link->cur_pic->pts = link->srcpic->pts;
     }
@@ -252,31 +251,32 @@ void avfilter_draw_slice(AVFilterLink *link, int y, int h)
     if(link->srcpic) {
         avcodec_get_chroma_sub_sample(link->format, &hsub, &vsub);
 
-        src[0] = link->srcpic-> data[0] + y * link->srcpic-> linesize[0];
-        dst[0] = link->cur_pic->data[0] + y * link->cur_pic->linesize[0];
-        for(i = 1; i < 4; i ++) {
+        for(i = 0; i < 4; i ++) {
             if(link->srcpic->data[i]) {
-                src[i] = link->srcpic-> data[i] + (y >> vsub) * link->srcpic-> linesize[i];
-                dst[i] = link->cur_pic->data[i] + (y >> vsub) * link->cur_pic->linesize[i];
+                src[i] = link->srcpic-> data[i] +
+                    (y >> (i==0 ? 0 : vsub)) * link->srcpic-> linesize[i];
+                dst[i] = link->cur_pic->data[i] +
+                    (y >> (i==0 ? 0 : vsub)) * link->cur_pic->linesize[i];
             } else
                 src[i] = dst[i] = NULL;
         }
 
         for(i = 0; i < 4; i ++) {
+            int planew =
+                ff_get_plane_bytewidth(link->format, link->cur_pic->w, i);
+
             if(!src[i]) continue;
 
             for(j = 0; j < h >> (i==0 ? 0 : vsub); j ++) {
-                memcpy(dst[i], src[i], link->cur_pic->linesize[i]);
+                memcpy(dst[i], src[i], planew);
                 src[i] += link->srcpic ->linesize[i];
                 dst[i] += link->cur_pic->linesize[i];
             }
         }
     }
 
-    if(!link_dpad(link).draw_slice)
-        return;
-
-    link_dpad(link).draw_slice(link, y, h);
+    if(link_dpad(link).draw_slice)
+        link_dpad(link).draw_slice(link, y, h);
 }
 
 AVFilter *avfilter_get_by_name(const char *name)
@@ -299,31 +299,6 @@ void avfilter_register(AVFilter *filter)
     filters         = newfilt;
 }
 
-void avfilter_init(void)
-{
-    avfilter_register(&avfilter_vf_crop);
-    avfilter_register(&avfilter_vf_fifo);
-    avfilter_register(&avfilter_vf_format);
-    avfilter_register(&avfilter_vf_fps);
-    avfilter_register(&avfilter_vf_graph);
-    avfilter_register(&avfilter_vf_graphdesc);
-    avfilter_register(&avfilter_vf_graphfile);
-    avfilter_register(&avfilter_vf_hflip);
-    avfilter_register(&avfilter_vf_negate);
-    avfilter_register(&avfilter_vf_noformat);
-    avfilter_register(&avfilter_vf_overlay);
-    avfilter_register(&avfilter_vf_rotate);
-    avfilter_register(&avfilter_vf_scale);
-    avfilter_register(&avfilter_vf_setpts);
-    avfilter_register(&avfilter_vf_slicify);
-    avfilter_register(&avfilter_vf_split);
-    avfilter_register(&avfilter_vf_transpose);
-    avfilter_register(&avfilter_vf_vflip);
-#ifdef CONFIG_AVFILTER_LAVF
-    avfilter_register(&avfilter_vsrc_movie);
-#endif //CONFIG_AVFILTER_LAVF
-}
-
 void avfilter_uninit(void)
 {
     struct FilterList *tmp;
@@ -348,6 +323,11 @@ static const char *filter_name(void *p)
     return filter->filter->name;
 }
 
+static const AVClass avfilter_class = {
+    "AVFilter",
+    filter_name
+};
+
 AVFilterContext *avfilter_open(AVFilter *filter, const char *inst_name)
 {
     AVFilterContext *ret;
@@ -357,8 +337,7 @@ AVFilterContext *avfilter_open(AVFilter *filter, const char *inst_name)
 
     ret = av_malloc(sizeof(AVFilterContext));
 
-    ret->av_class = av_mallocz(sizeof(AVClass));
-    ret->av_class->item_name = filter_name;
+    ret->av_class = &avfilter_class;
     ret->filter   = filter;
     ret->name     = inst_name ? av_strdup(inst_name) : NULL;
     ret->priv     = av_mallocz(filter->priv_size);
@@ -400,7 +379,6 @@ void avfilter_destroy(AVFilterContext *filter)
     av_freep(&filter->inputs);
     av_freep(&filter->outputs);
     av_freep(&filter->priv);
-    av_freep(&filter->av_class);
     av_free(filter);
 }