This is in preparation for adding an audio split filter.
---
libavfilter/Makefile | 2 +-
libavfilter/split.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++
libavfilter/vf_split.c | 108 ------------------------------------------------
3 files changed, 109 insertions(+), 109 deletions(-)
create mode 100644 libavfilter/split.c
delete mode 100644 libavfilter/vf_split.c
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index fc96f42..1a436d2 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -68,7 +68,7 @@ OBJS-$(CONFIG_SETSAR_FILTER) += vf_aspect.o
OBJS-$(CONFIG_SETTB_FILTER) += vf_settb.o
OBJS-$(CONFIG_SHOWINFO_FILTER) += vf_showinfo.o
OBJS-$(CONFIG_SLICIFY_FILTER) += vf_slicify.o
-OBJS-$(CONFIG_SPLIT_FILTER) += vf_split.o
+OBJS-$(CONFIG_SPLIT_FILTER) += split.o
OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o
OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o
OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
diff --git a/libavfilter/split.c b/libavfilter/split.c
new file mode 100644
index 0000000..da6b3ff
--- /dev/null
+++ b/libavfilter/split.c
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2007 Bobby Bingham
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Video splitter
+ */
+
+#include "avfilter.h"
+
+static int split_init(AVFilterContext *ctx, const char *args, void *opaque)
+{
+ int i, nb_outputs = 2;
+
+ if (args) {
+ nb_outputs = strtol(args, NULL, 0);
+ if (nb_outputs <= 0) {
+ av_log(ctx, AV_LOG_ERROR, "Invalid number of outputs specified:
%d.\n",
+ nb_outputs);
+ return AVERROR(EINVAL);
+ }
+ }
+
+ for (i = 0; i < nb_outputs; i++) {
+ char name[32];
+ AVFilterPad pad = { 0 };
+
+ snprintf(name, sizeof(name), "output%d", i);
+ pad.type = AVMEDIA_TYPE_VIDEO;
+ pad.name = av_strdup(name);
+
+ avfilter_insert_outpad(ctx, i, &pad);
+ }
+
+ return 0;
+}
+
+static void split_uninit(AVFilterContext *ctx)
+{
+ int i;
+
+ for (i = 0; i < ctx->output_count; i++)
+ av_freep(&ctx->output_pads[i].name);
+}
+
+static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
+{
+ AVFilterContext *ctx = inlink->dst;
+ int i;
+
+ for (i = 0; i < ctx->output_count; i++)
+ avfilter_start_frame(ctx->outputs[i],
+ avfilter_ref_buffer(picref, ~AV_PERM_WRITE));
+}
+
+static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
+{
+ AVFilterContext *ctx = inlink->dst;
+ int i;
+
+ for (i = 0; i < ctx->output_count; i++)
+ avfilter_draw_slice(ctx->outputs[i], y, h, slice_dir);
+}
+
+static void end_frame(AVFilterLink *inlink)
+{
+ AVFilterContext *ctx = inlink->dst;
+ int i;
+
+ for (i = 0; i < ctx->output_count; i++)
+ avfilter_end_frame(ctx->outputs[i]);
+
+ avfilter_unref_buffer(inlink->cur_buf);
+}
+
+AVFilter avfilter_vf_split = {
+ .name = "split",
+ .description = NULL_IF_CONFIG_SMALL("Pass on the input to two outputs."),
+
+ .init = split_init,
+ .uninit = split_uninit,
+
+ .inputs = (AVFilterPad[]) {{ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .get_video_buffer=
avfilter_null_get_video_buffer,
+ .start_frame = start_frame,
+ .draw_slice = draw_slice,
+ .end_frame = end_frame, },
+ { .name = NULL}},
+ .outputs = (AVFilterPad[]) {{ .name = NULL}},
+};
diff --git a/libavfilter/vf_split.c b/libavfilter/vf_split.c
deleted file mode 100644
index da6b3ff..0000000
--- a/libavfilter/vf_split.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2007 Bobby Bingham
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Video splitter
- */
-
-#include "avfilter.h"
-
-static int split_init(AVFilterContext *ctx, const char *args, void *opaque)
-{
- int i, nb_outputs = 2;
-
- if (args) {
- nb_outputs = strtol(args, NULL, 0);
- if (nb_outputs <= 0) {
- av_log(ctx, AV_LOG_ERROR, "Invalid number of outputs specified:
%d.\n",
- nb_outputs);
- return AVERROR(EINVAL);
- }
- }
-
- for (i = 0; i < nb_outputs; i++) {
- char name[32];
- AVFilterPad pad = { 0 };
-
- snprintf(name, sizeof(name), "output%d", i);
- pad.type = AVMEDIA_TYPE_VIDEO;
- pad.name = av_strdup(name);
-
- avfilter_insert_outpad(ctx, i, &pad);
- }
-
- return 0;
-}
-
-static void split_uninit(AVFilterContext *ctx)
-{
- int i;
-
- for (i = 0; i < ctx->output_count; i++)
- av_freep(&ctx->output_pads[i].name);
-}
-
-static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
-{
- AVFilterContext *ctx = inlink->dst;
- int i;
-
- for (i = 0; i < ctx->output_count; i++)
- avfilter_start_frame(ctx->outputs[i],
- avfilter_ref_buffer(picref, ~AV_PERM_WRITE));
-}
-
-static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
-{
- AVFilterContext *ctx = inlink->dst;
- int i;
-
- for (i = 0; i < ctx->output_count; i++)
- avfilter_draw_slice(ctx->outputs[i], y, h, slice_dir);
-}
-
-static void end_frame(AVFilterLink *inlink)
-{
- AVFilterContext *ctx = inlink->dst;
- int i;
-
- for (i = 0; i < ctx->output_count; i++)
- avfilter_end_frame(ctx->outputs[i]);
-
- avfilter_unref_buffer(inlink->cur_buf);
-}
-
-AVFilter avfilter_vf_split = {
- .name = "split",
- .description = NULL_IF_CONFIG_SMALL("Pass on the input to two outputs."),
-
- .init = split_init,
- .uninit = split_uninit,
-
- .inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
- .get_video_buffer=
avfilter_null_get_video_buffer,
- .start_frame = start_frame,
- .draw_slice = draw_slice,
- .end_frame = end_frame, },
- { .name = NULL}},
- .outputs = (AVFilterPad[]) {{ .name = NULL}},
-};
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
