[FFmpeg-soc] [soc]: r1819 - in libavfilter: Makefile allfilters.h avfilter.c vf_setpts.c
victor
subversion at mplayerhq.hu
Sat Jan 12 01:35:30 CET 2008
Author: victor
Date: Sat Jan 12 01:35:29 2008
New Revision: 1819
Log:
Presentation timestamp (PTS) modification filter
Added:
libavfilter/vf_setpts.c
Modified:
libavfilter/Makefile
libavfilter/allfilters.h
libavfilter/avfilter.c
Modified: libavfilter/Makefile
==============================================================================
--- libavfilter/Makefile (original)
+++ libavfilter/Makefile Sat Jan 12 01:35:29 2008
@@ -18,6 +18,7 @@ OBJS-yes = vf_crop.o \
vf_overlay.o \
vf_rotate.o \
vf_scale.o \
+ vf_setpts.o \
vf_slicify.o \
vf_split.o \
vf_transpose.o \
Modified: libavfilter/allfilters.h
==============================================================================
--- libavfilter/allfilters.h (original)
+++ libavfilter/allfilters.h Sat Jan 12 01:35:29 2008
@@ -34,6 +34,7 @@ extern AVFilter avfilter_vf_noformat;
extern AVFilter avfilter_vf_overlay;
extern AVFilter avfilter_vf_rotate;
extern AVFilter avfilter_vf_scale;
+extern AVFilter avfilter_vf_setpts;
extern AVFilter avfilter_vf_slicify;
extern AVFilter avfilter_vf_split;
extern AVFilter avfilter_vf_transpose;
Modified: libavfilter/avfilter.c
==============================================================================
--- libavfilter/avfilter.c (original)
+++ libavfilter/avfilter.c Sat Jan 12 01:35:29 2008
@@ -303,6 +303,7 @@ void avfilter_init(void)
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);
Added: libavfilter/vf_setpts.c
==============================================================================
--- (empty file)
+++ libavfilter/vf_setpts.c Sat Jan 12 01:35:29 2008
@@ -0,0 +1,135 @@
+/*
+ * Video presentation timestamp (PTS) modification filter
+ * copyright (c) 2008 Victor Paesa
+ *
+ * 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
+ */
+
+/*
+ # A few usage examples follow, usable too as test scenarios.
+ #TODO Eventually move them into FFmpeg docs.
+
+ # Start counting PTS from zero
+ ffmpeg -i input.avi -vfilters setpts=PTS-STARTPTS output.avi
+
+ # Fast motion
+ ffmpeg -i input.avi -vfilters setpts=0.5*PTS output.avi
+
+ # Fixed rate 25 fps
+ ffmpeg -i input.avi -vfilters setpts=N*AVTB/25 output.avi
+
+ # Fixed rate 25 fps with some jitter
+ ffmpeg -i input.avi -vfilters 'setpts=AVTB/25*(N+0.05*sin(N*2*PI/25))' output.avi
+*/
+
+#include "eval.h"
+
+#include "avfilter.h"
+
+const char *const_names[]={
+ "PI",
+ "E",
+ "AVTB", ///< AV_TIME_BASE
+ "N", ///< frame number (starting at zero)
+ "PTS", ///< original pts
+ "STARTPTS", ///< pts at start of movie
+ // TODO Add multiple inputs/outputs to filter
+ // TODO Add functions of pin number: pts(), startpts()
+ NULL
+};
+
+enum PosOfValue {
+ POV_PI,
+ POV_E,
+ POV_AVTB,
+ POV_N,
+ POV_PTS,
+ POV_STARTPTS,
+ POV_NULL
+};
+
+typedef struct {
+ AVEvalExpr *expr;
+ double const_values[POV_NULL+1];
+} SetPTSContext;
+
+static int init(AVFilterContext *ctx, const char *args, void *opaque)
+{
+ SetPTSContext *setpts = ctx->priv;
+ char *error;
+
+ setpts->expr = ff_parse(args ? args : "PTS",
+ const_names, NULL, NULL, NULL, NULL, &error);
+ if (! setpts->expr)
+ av_log(ctx, AV_LOG_ERROR,
+ "init() cannot parse expresion '%s' due to %s\n", args, error);
+
+ setpts->const_values[POV_PI ] = M_PI;
+ setpts->const_values[POV_E ] = M_E;
+ setpts->const_values[POV_AVTB ] = AV_TIME_BASE;
+ setpts->const_values[POV_N ] = 0.0;
+ setpts->const_values[POV_STARTPTS] = AV_NOPTS_VALUE;
+ setpts->const_values[POV_NULL ] = 0.0;
+
+ return !setpts->expr;
+}
+
+static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
+{
+ SetPTSContext *setpts = link->dst->priv;
+ AVFilterPicRef *ref2 = avfilter_ref_pic(picref, ~0);
+
+
+ if (setpts->const_values[POV_STARTPTS] == AV_NOPTS_VALUE)
+ setpts->const_values[POV_STARTPTS] = ref2->pts;
+ setpts->const_values[POV_PTS] = ref2->pts;
+
+ //av_log(NULL, AV_LOG_INFO, "pts org:%lld final:%lld\n", ref2->pts,
+ // (uint64_t) ff_parse_eval(setpts->expr, setpts->const_values, setpts));
+
+ ref2->pts =
+ (uint64_t) ff_parse_eval(setpts->expr, setpts->const_values, setpts);
+
+ setpts->const_values[POV_N ] += 1.0;
+
+ avfilter_start_frame(link->dst->outputs[0], ref2);
+}
+
+static void uninit(AVFilterContext *ctx)
+{
+ SetPTSContext *setpts = ctx->priv;
+ ff_eval_free(setpts->expr);
+}
+
+AVFilter avfilter_vf_setpts =
+{
+ .name = "setpts",
+ .author = "Victor Paesa",
+
+ .init = init,
+ .uninit = uninit,
+
+ .priv_size = sizeof(SetPTSContext),
+
+ .inputs = (AVFilterPad[]) {{ .name = "default",
+ .type = AV_PAD_VIDEO,
+ .start_frame = start_frame,},
+ { .name = NULL}},
+ .outputs = (AVFilterPad[]) {{ .name = "default",
+ .type = AV_PAD_VIDEO,},
+ { .name = NULL}},
+};
More information about the FFmpeg-soc
mailing list