[FFmpeg-soc] [soc]: r343 - in libavfilter: Makefile allfilters.h avfilter.c vf_rgb2bgr.c

[koorogi]

Author: koorogi
Date: Sun Jul  8 18:08:15 2007
New Revision: 343

Log:
Add an RGB24 <-> BGR24 conversion filter


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

Modified: libavfilter/Makefile
==============================================================================
--- libavfilter/Makefile	(original)
+++ libavfilter/Makefile	Sun Jul  8 18:08:15 2007
@@ -8,6 +8,7 @@ OBJECTS = avfilter.o          \
 		  vo_sdl.o            \
 		  vf_crop.o           \
 		  vf_passthrough.o    \
+		  vf_rgb2bgr          \
 		  vf_slicify.o        \
 
 all: filter_test

Modified: libavfilter/allfilters.h
==============================================================================
--- libavfilter/allfilters.h	(original)
+++ libavfilter/allfilters.h	Sun Jul  8 18:08:15 2007
@@ -25,5 +25,6 @@ extern AVFilter vsrc_dummy;
 extern AVFilter vsrc_ppm;
 extern AVFilter vf_crop;
 extern AVFilter vf_passthrough;
+extern AVFilter vf_rgb2bgr;
 extern AVFilter vf_slicify;
 extern AVFilter vo_sdl;

Modified: libavfilter/avfilter.c
==============================================================================
--- libavfilter/avfilter.c	(original)
+++ libavfilter/avfilter.c	Sun Jul  8 18:08:15 2007
@@ -239,6 +239,7 @@ void avfilter_init(void)
     avfilter_register(&vsrc_ppm);
     avfilter_register(&vf_crop);
     avfilter_register(&vf_passthrough);
+    avfilter_register(&vf_rgb2bgr)
     avfilter_register(&vf_slicify);
     avfilter_register(&vo_sdl);
 }

Added: libavfilter/vf_rgb2bgr.c
==============================================================================
--- (empty file)
+++ libavfilter/vf_rgb2bgr.c	Sun Jul  8 18:08:15 2007
@@ -0,0 +1,118 @@
+/*
+ * RGB <-> BGR conversion filter
+ * 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 <string.h>
+#include <stdio.h>
+
+#include "avfilter.h"
+
+typedef struct {
+    AVFilterPicRef *out;
+} RGBContext;
+
+static int *query_in_formats(AVFilterLink *link)
+{
+    return avfilter_make_format_list(2, PIX_FMT_RGB24, PIX_FMT_BGR24);
+}
+
+static int *query_out_formats(AVFilterLink *link)
+{
+    int format;
+
+    if(link->src->inputs[0]->format == PIX_FMT_RGB24)
+        format = PIX_FMT_BGR24;
+    else
+        format = PIX_FMT_RGB24;
+
+    return avfilter_make_format_list(1, format);
+}
+
+static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
+{
+    RGBContext *rgb = link->dst->priv;
+
+    rgb->out = avfilter_get_video_buffer(link->dst->outputs[0], AV_PERM_WRITE);
+    avfilter_default_start_frame(link, picref);
+    avfilter_start_frame(link->dst->outputs[0], avfilter_ref_pic(rgb->out));
+}
+
+static void end_frame(AVFilterLink *link)
+{
+    RGBContext *rgb = link->dst->priv;
+
+    avfilter_unref_pic(rgb->out);
+    rgb->out = NULL;
+
+    avfilter_default_end_frame(link);
+    avfilter_end_frame(link->dst->outputs[0]);
+}
+
+static void draw_slice(AVFilterLink *link, uint8_t *data[4], int y, int h)
+{
+    RGBContext *rgb = link->dst->priv;
+    uint8_t *out[4];
+    uint8_t *row[2], *cur[2];
+    int i, j;
+
+    row[0] = data[0];
+    row[1] = out[0] = &rgb->out->data[0][y * rgb->out->linesize[0]];
+    out[1] = out[2] = out[3] = 0;
+    for(i = 0; i < h; i ++) {
+        cur[0] = row[0];
+        cur[1] = row[1];
+        for(j = 0; j < link->cur_pic->w; j ++) {
+            cur[1][0] = cur[0][2];
+            cur[1][1] = cur[0][1];
+            cur[1][2] = cur[0][0];
+
+            cur[0] += 3;
+            cur[1] += 3;
+        }
+        row[0] += link->cur_pic->linesize[0];
+        row[1] += rgb->out->     linesize[0];
+    }
+    avfilter_draw_slice(link->dst->outputs[0], out, y, h);
+}
+
+static void request_frame(AVFilterLink *link)
+{
+    avfilter_request_frame(link->src->inputs[0]);
+}
+
+AVFilter vf_rgb2bgr =
+{
+    .name      = "rgb2bgr",
+    .author    = "Bobby Bingham",
+
+    .inputs    = (AVFilterPad[]) {{ .name            = "default",
+                                    .type            = AV_PAD_VIDEO,
+                                    .start_frame     = start_frame,
+                                    .draw_slice      = draw_slice,
+                                    .query_formats   = query_in_formats,
+                                    .end_frame       = end_frame, },
+                                  { .name = NULL}},
+    .outputs   = (AVFilterPad[]) {{ .name            = "default",
+                                    .type            = AV_PAD_VIDEO,
+                                    .request_frame   = request_frame,
+                                    .query_formats   = query_out_formats, },
+                                  { .name = NULL}},
+};
+