[FFmpeg-soc] [soc]: r746 - in libavfilter: Makefile allfilters.h avfilter.c vf_overlay.c

koorogi subversion at mplayerhq.hu
Mon Aug 13 18:53:19 CEST 2007


Author: koorogi
Date: Mon Aug 13 18:53:19 2007
New Revision: 746

Log:
Add a filter to overlay one video on top of another, picture-in-picture style.


Added:
   libavfilter/vf_overlay.c
Modified:
   libavfilter/Makefile
   libavfilter/allfilters.h
   libavfilter/avfilter.c

Modified: libavfilter/Makefile
==============================================================================
--- libavfilter/Makefile	(original)
+++ libavfilter/Makefile	Mon Aug 13 18:53:19 2007
@@ -12,6 +12,7 @@ OBJS-yes = vsrc_dummy.o \
            vo_sdl.o \
            vf_crop.o \
            vf_fps.o \
+           vf_overlay.o \
            vf_passthrough.o \
            vf_rgb2bgr.o \
            vf_slicify.o \

Modified: libavfilter/allfilters.h
==============================================================================
--- libavfilter/allfilters.h	(original)
+++ libavfilter/allfilters.h	Mon Aug 13 18:53:19 2007
@@ -26,6 +26,7 @@ extern AVFilter vsrc_ppm;
 extern AVFilter vf_crop;
 extern AVFilter vf_fps;
 extern AVFilter vf_graph;
+extern AVFilter vf_overlay;
 extern AVFilter vf_passthrough;
 extern AVFilter vf_rgb2bgr;
 extern AVFilter vf_slicify;

Modified: libavfilter/avfilter.c
==============================================================================
--- libavfilter/avfilter.c	(original)
+++ libavfilter/avfilter.c	Mon Aug 13 18:53:19 2007
@@ -220,6 +220,7 @@ void avfilter_init(void)
     avfilter_register(&vf_crop);
     avfilter_register(&vf_fps);
     avfilter_register(&vf_graph);
+    avfilter_register(&vf_overlay);
     avfilter_register(&vf_passthrough);
     avfilter_register(&vf_rgb2bgr);
     avfilter_register(&vf_slicify);

Added: libavfilter/vf_overlay.c
==============================================================================
--- (empty file)
+++ libavfilter/vf_overlay.c	Mon Aug 13 18:53:19 2007
@@ -0,0 +1,247 @@
+/*
+ * Filter to overlay one video on top of another
+ * copyright (c) 2007 Bobby Bingham
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdio.h>
+
+#include "avfilter.h"
+
+typedef struct {
+    int x, y;                   //< position of subpicture
+
+    /** pics[0][0..1] are pictures for the main image.
+     *  pics[1][0..1] are pictures for the sub image */
+    AVFilterPicRef *pics[2][2];
+
+    int bpp;                    //< bytes per pixel
+    int hsub, vsub;             //< chroma subsampling
+} OverlayContext;
+
+static int init(AVFilterContext *ctx, const char *args, void *opaque)
+{
+    OverlayContext *over = ctx->priv;
+
+    if(!args || sscanf(args, "%d:%d", &over->x, &over->y) != 2) {
+        over->x =
+        over->y = 0;
+    }
+
+    return 0;
+}
+
+static void uninit(AVFilterContext *ctx)
+{
+    OverlayContext *over = ctx->priv;
+    int i, j;
+
+    for(i = 0; i < 2; i ++)
+        for(j = 0; j < 2; j ++)
+            if(over->pics[i][j])
+                avfilter_unref_pic(over->pics[i][j]);
+}
+
+static int *query_formats_main(AVFilterLink *link)
+{
+    return avfilter_make_format_list(31,
+                PIX_FMT_YUV444P,  PIX_FMT_YUV422P,  PIX_FMT_YUV420P,
+                PIX_FMT_YUV411P,  PIX_FMT_YUV410P,
+                PIX_FMT_YUYV422,  PIX_FMT_UYVY422,  PIX_FMT_UYYVYY411,
+                PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P,
+                PIX_FMT_YUV440P,  PIX_FMT_YUVJ440P,
+                PIX_FMT_RGB32,    PIX_FMT_BGR32,
+                PIX_FMT_RGB32_1,  PIX_FMT_BGR32_1,
+                PIX_FMT_RGB24,    PIX_FMT_BGR24,
+                PIX_FMT_RGB565,   PIX_FMT_BGR565,
+                PIX_FMT_RGB555,   PIX_FMT_BGR555,
+                PIX_FMT_RGB8,     PIX_FMT_BGR8,
+                PIX_FMT_RGB4_BYTE,PIX_FMT_BGR4_BYTE,
+                PIX_FMT_GRAY16BE, PIX_FMT_GRAY16LE,
+                PIX_FMT_GRAY8,    PIX_FMT_PAL8);
+}
+
+static int *query_formats_sub(AVFilterLink *link)
+{
+    return avfilter_make_format_list(1, link->dst->inputs[0]->format);
+}
+
+static int config_input_main(AVFilterLink *link)
+{
+    OverlayContext *over = link->dst->priv;
+
+    switch(link->format) {
+    case PIX_FMT_RGB32:
+    case PIX_FMT_BGR32:
+        over->bpp = 4;
+        break;
+    case PIX_FMT_RGB24:
+    case PIX_FMT_BGR24:
+        over->bpp = 3;
+        break;
+    case PIX_FMT_RGB565:
+    case PIX_FMT_RGB555:
+    case PIX_FMT_BGR565:
+    case PIX_FMT_BGR555:
+    case PIX_FMT_GRAY16BE:
+    case PIX_FMT_GRAY16LE:
+        over->bpp = 2;
+        break;
+    default:
+        over->bpp = 1;
+    }
+
+    avcodec_get_chroma_sub_sample(link->format, &over->hsub, &over->vsub);
+
+    /* TODO: unlink the subpicture link if it is using a different format */
+
+    return avfilter_config_link(link->dst->outputs[0]);
+}
+
+static int config_input_sub(AVFilterLink *link)
+{
+    if(!link->dst->inputs[0])
+        return -1;
+    return link->format != link->dst->inputs[0]->format;
+}
+
+static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
+{
+    OverlayContext *over = link->dst->priv;
+    if(over->pics[link->dstpad][0])
+        avfilter_unref_pic(over->pics[link->dstpad][0]);
+    over->pics[link->dstpad][0] = over->pics[link->dstpad][1];
+    over->pics[link->dstpad][1] = picref;
+}
+
+static void end_frame(AVFilterLink *link)
+{
+}
+
+static void draw_slice(AVFilterLink *link, uint8_t *data[4], int y, int h)
+{
+}
+
+static int lower_timestamp(OverlayContext *over)
+{
+    if(!over->pics[0][0] &&
+       !over->pics[1][0]) return 2;
+    if(!over->pics[0][0]) return 0;
+    if(!over->pics[1][0]) return 1;
+
+    if(over->pics[0][0]->pts == over->pics[1][0]->pts) return 2;
+    return !!(over->pics[0][0]->pts < over->pics[1][0]->pts);
+}
+
+static void copy_image(AVFilterPicRef *dst, int x, int y,
+                       AVFilterPicRef *src, int w, int h,
+                       int bpp, int hsub, int vsub)
+{
+    AVPicture pic;
+    int i;
+
+    memcpy(&pic, &dst->data, sizeof(AVPicture));
+    pic.data[0] += x * bpp;
+    pic.data[0] += y * pic.linesize[0];
+    for(i = 1; i < 4; i ++) {
+        if(pic.data[i]) {
+            pic.data[i] +=  x >> hsub;
+            pic.data[i] += (y >> vsub) * pic.linesize[i];
+        }
+    }
+
+    av_picture_copy(&pic, (AVPicture *)src->data, dst->pic->format, w, h);
+}
+
+static int request_frame(AVFilterLink *link)
+{
+    AVFilterPicRef *pic;
+    OverlayContext *over = link->src->priv;
+    int idx;
+    int x, y, w, h;
+
+    /* the first time through, we need to pull a couple frames */
+    if(!over->pics[0][1] && !over->pics[1][1] &&
+       (avfilter_request_frame(link->src->inputs[0]) ||
+        avfilter_request_frame(link->src->inputs[1])))
+        return -1;
+
+    /* then we pull a frame from the stream which currently has a lower pts */
+    if((idx = lower_timestamp(over)) == 2) {
+        if(avfilter_request_frame(link->src->inputs[0]) ||
+           avfilter_request_frame(link->src->inputs[1]))
+            return -1;
+    } else
+        if(avfilter_request_frame(link->src->inputs[idx]))
+            return -1;
+
+    /* we draw the output frame */
+    pic = avfilter_get_video_buffer(link, AV_PERM_WRITE);
+    if(over->pics[0][0])
+        copy_image(pic, 0, 0, over->pics[0][0], link->w, link->h,
+                   over->bpp, over->hsub, over->vsub);
+    x = FFMIN(over->x, link->w-1);
+    y = FFMIN(over->y, link->h-1);
+    w = FFMIN(link->w-x, over->pics[1][0]->w);
+    h = FFMIN(link->h-y, over->pics[1][0]->h);
+    if(over->pics[1][0])
+        copy_image(pic, x, y, over->pics[1][0], w, h,
+                   over->bpp, over->hsub, over->vsub);
+
+    /* we give the output frame the higher of the two current pts values */
+    pic->pts = over->pics[!lower_timestamp(over)][0]->pts;
+
+    /* and send it to the next filter */
+    avfilter_start_frame(link, avfilter_ref_pic(pic, ~0));
+    avfilter_draw_slice (link, pic->data, 0, pic->h);
+    avfilter_end_frame  (link);
+
+    return 0;
+}
+
+AVFilter vf_overlay =
+{
+    .name      = "overlay",
+    .author    = "Bobby Bingham",
+
+    .init      = init,
+    .uninit    = uninit,
+
+    .priv_size = sizeof(OverlayContext),
+
+    .inputs    = (AVFilterPad[]) {{ .name            = "default",
+                                    .type            = AV_PAD_VIDEO,
+                                    .start_frame     = start_frame,
+                                    .draw_slice      = draw_slice,
+                                    .query_formats   = query_formats_main,
+                                    .config_props    = config_input_main,
+                                    .end_frame       = end_frame, },
+                                  { .name            = "sub",
+                                    .type            = AV_PAD_VIDEO,
+                                    .start_frame     = start_frame,
+                                    .draw_slice      = draw_slice,
+                                    .query_formats   = query_formats_sub,
+                                    .config_props    = config_input_sub,
+                                    .end_frame       = end_frame, },
+                                  { .name = NULL}},
+    .outputs   = (AVFilterPad[]) {{ .name            = "default",
+                                    .type            = AV_PAD_VIDEO,
+                                    .request_frame   = request_frame, },
+                                  { .name = NULL}},
+};
+



More information about the FFmpeg-soc mailing list