X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fdefaults.c;h=3f5f6e197622ed2954d26fa9d5867fd52ca6291e;hb=5bb5c1dc86e93a681ad6555dc98afec0055b69e5;hp=50b13dc416efc8b088790725a70f2302a8e0c6f5;hpb=4d62c9d377816676e095c034b687c5ca1211fc6f;p=ffmpeg

diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c
index 50b13dc416e..3f5f6e19762 100644
--- a/libavfilter/defaults.c
+++ b/libavfilter/defaults.c
@@ -19,42 +19,44 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/imgconvert.h"
 #include "avfilter.h"
 
 /* TODO: buffer pool.  see comment for avfilter_default_get_video_buffer() */
-void avfilter_default_free_video_buffer(AVFilterPic *pic)
+static void avfilter_default_free_video_buffer(AVFilterPic *pic)
 {
-    avpicture_free((AVPicture *) pic);
+    av_free(pic->data[0]);
     av_free(pic);
 }
 
-AVFilterPicRef *avfilter_next_get_video_buffer(AVFilterLink *link, int perms)
-{
-    if(!link->dst->outputs[0])
-        return NULL;
-    return avfilter_get_video_buffer(link->dst->outputs[0], perms);
-}
-
 /* 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)
+AVFilterPicRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms, int w, int h)
 {
     AVFilterPic *pic = av_mallocz(sizeof(AVFilterPic));
     AVFilterPicRef *ref = av_mallocz(sizeof(AVFilterPicRef));
+    int i, tempsize;
+    char *buf;
 
     ref->pic   = pic;
-    ref->w     = link->w;
-    ref->h     = link->h;
-    ref->perms = perms;
+    ref->w     = pic->w = w;
+    ref->h     = pic->h = h;
 
-    /* we always give the destination filter read access by default */
-    avfilter_add_pic_perms(ref, link->dst, AV_PERM_READ);
+    /* make sure the buffer gets read permission or it's useless for output */
+    ref->perms = perms | AV_PERM_READ;
 
     pic->refcount = 1;
     pic->format   = link->format;
     pic->free     = avfilter_default_free_video_buffer;
-    avpicture_alloc((AVPicture *)pic, pic->format, ref->w, ref->h);
+    ff_fill_linesize((AVPicture *)pic, pic->format, ref->w);
+
+    for (i=0; i<4;i++)
+        pic->linesize[i] = FFALIGN(pic->linesize[i], 16);
+
+    tempsize = ff_fill_pointer((AVPicture *)pic, NULL, pic->format, ref->h);
+    buf = av_malloc(tempsize);
+    ff_fill_pointer((AVPicture *)pic, buf, pic->format, ref->h);
 
     memcpy(ref->data,     pic->data,     sizeof(pic->data));
     memcpy(ref->linesize, pic->linesize, sizeof(pic->linesize));
@@ -70,12 +72,25 @@ void avfilter_default_start_frame(AVFilterLink *link, AVFilterPicRef *picref)
         out = link->dst->outputs[0];
 
     if(out) {
-        out->outpic      = avfilter_get_video_buffer(out, AV_PERM_WRITE);
+        out->outpic      = avfilter_get_video_buffer(out, AV_PERM_WRITE, out->w, out->h);
         out->outpic->pts = picref->pts;
-        avfilter_start_frame(out, avfilter_ref_pic(out->outpic, out->dst, ~0));
+        out->outpic->pos = picref->pos;
+        out->outpic->pixel_aspect = picref->pixel_aspect;
+        avfilter_start_frame(out, avfilter_ref_pic(out->outpic, ~0));
     }
 }
 
+void avfilter_default_draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
+{
+    AVFilterLink *out = NULL;
+
+    if(link->dst->output_count)
+        out = link->dst->outputs[0];
+
+    if(out)
+        avfilter_draw_slice(out, y, h, slice_dir);
+}
+
 void avfilter_default_end_frame(AVFilterLink *link)
 {
     AVFilterLink *out = NULL;
@@ -106,33 +121,47 @@ int avfilter_default_config_output_link(AVFilterLink *link)
     } 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 -1;
     }
 
     return 0;
 }
 
 /**
- * default config_link() implementation for input video links to simplify
- * the implementation of one input one output video filters */
-int avfilter_default_config_input_link(AVFilterLink *link)
+ * A helper for query_formats() which sets all links to the same list of
+ * formats. If there are no links hooked to this filter, the list of formats is
+ * freed.
+ *
+ * FIXME: this will need changed for filters with a mix of pad types
+ * (video + audio, etc)
+ */
+void avfilter_set_common_formats(AVFilterContext *ctx, AVFilterFormats *formats)
 {
-    if(!link->dst->output_count)
-        return 0;
-    return avfilter_config_link(link->dst->outputs[0]);
+    int count = 0, i;
+
+    for(i = 0; i < ctx->input_count; i ++) {
+        if(ctx->inputs[i]) {
+            avfilter_formats_ref(formats, &ctx->inputs[i]->out_formats);
+            count ++;
+        }
+    }
+    for(i = 0; i < ctx->output_count; i ++) {
+        if(ctx->outputs[i]) {
+            avfilter_formats_ref(formats, &ctx->outputs[i]->in_formats);
+            count ++;
+        }
+    }
+
+    if(!count) {
+        av_free(formats->formats);
+        av_free(formats->refs);
+        av_free(formats);
+    }
 }
 
-/**
- * default query_formats() implementation for output video links to simplify
- * the implementation of one input one output video filters */
-int *avfilter_default_query_output_formats(AVFilterLink *link)
+int avfilter_default_query_formats(AVFilterContext *ctx)
 {
-    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);
+    avfilter_set_common_formats(ctx, avfilter_all_colorspaces());
+    return 0;
 }