X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvsrc_nullsrc.c;h=629de78a1871214d1f39caf450a93b7107fd878e;hb=eb040dbbd39898f03e5057a21b0981a8ffe9f37b;hp=43561991272d404bb3bda7cec18468525afa5be6;hpb=ba87f0801d77c21eb1e4891ca1f846500bbb0939;p=ffmpeg

diff --git a/libavfilter/vsrc_nullsrc.c b/libavfilter/vsrc_nullsrc.c
index 43561991272..629de78a187 100644
--- a/libavfilter/vsrc_nullsrc.c
+++ b/libavfilter/vsrc_nullsrc.c
@@ -1,18 +1,18 @@
 /*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * 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.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -21,10 +21,31 @@
  * null video source
  */
 
+#include "libavutil/avstring.h"
+#include "libavutil/eval.h"
+#include "libavutil/parseutils.h"
 #include "avfilter.h"
 
+static const char *var_names[] = {
+    "E",
+    "PHI",
+    "PI",
+    "AVTB",   /* default timebase 1/AV_TIME_BASE */
+    NULL
+};
+
+enum var_name {
+    VAR_E,
+    VAR_PHI,
+    VAR_PI,
+    VAR_AVTB,
+    VAR_VARS_NB
+};
+
 typedef struct {
     int w, h;
+    char tb_expr[256];
+    double var_values[VAR_VARS_NB];
 } NullContext;
 
 static int init(AVFilterContext *ctx, const char *args, void *opaque)
@@ -33,13 +54,14 @@ static int init(AVFilterContext *ctx, const char *args, void *opaque)
 
     priv->w = 352;
     priv->h = 288;
+    av_strlcpy(priv->tb_expr, "AVTB", sizeof(priv->tb_expr));
 
     if (args)
-        sscanf(args, "%d:%d", &priv->w, &priv->h);
+        sscanf(args, "%d:%d:%255[^:]", &priv->w, &priv->h, priv->tb_expr);
 
     if (priv->w <= 0 || priv->h <= 0) {
         av_log(ctx, AV_LOG_ERROR, "Non-positive size values are not acceptable.\n");
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     return 0;
@@ -47,12 +69,36 @@ static int init(AVFilterContext *ctx, const char *args, void *opaque)
 
 static int config_props(AVFilterLink *outlink)
 {
-    NullContext *priv = outlink->src->priv;
+    AVFilterContext *ctx = outlink->src;
+    NullContext *priv = ctx->priv;
+    AVRational tb;
+    int ret;
+    double res;
+
+    priv->var_values[VAR_E]    = M_E;
+    priv->var_values[VAR_PHI]  = M_PHI;
+    priv->var_values[VAR_PI]   = M_PI;
+    priv->var_values[VAR_AVTB] = av_q2d(AV_TIME_BASE_Q);
+
+    if ((ret = av_expr_parse_and_eval(&res, priv->tb_expr, var_names, priv->var_values,
+                                      NULL, NULL, NULL, NULL, NULL, 0, NULL)) < 0) {
+        av_log(ctx, AV_LOG_ERROR, "Invalid expression '%s' for timebase.\n", priv->tb_expr);
+        return ret;
+    }
+    tb = av_d2q(res, INT_MAX);
+    if (tb.num <= 0 || tb.den <= 0) {
+        av_log(ctx, AV_LOG_ERROR,
+               "Invalid non-positive value for the timebase %d/%d.\n",
+               tb.num, tb.den);
+        return AVERROR(EINVAL);
+    }
 
     outlink->w = priv->w;
     outlink->h = priv->h;
+    outlink->time_base = tb;
 
-    av_log(outlink->src, AV_LOG_INFO, "w:%d h:%d\n", priv->w, priv->h);
+    av_log(outlink->src, AV_LOG_INFO, "w:%d h:%d tb:%d/%d\n", priv->w, priv->h,
+           tb.num, tb.den);
 
     return 0;
 }
@@ -64,7 +110,7 @@ static int request_frame(AVFilterLink *link)
 
 AVFilter avfilter_vsrc_nullsrc = {
     .name        = "nullsrc",
-    .description = "Null video source, never return images.",
+    .description = NULL_IF_CONFIG_SMALL("Null video source, never return images."),
 
     .init       = init,
     .priv_size = sizeof(NullContext),