vsrc_testsrc: allow to set the sample aspect ratio

Add the sar option. Useful for debugging/testing purposes.

diff --git a/doc/filters.texi b/doc/filters.texi
index 69ba4b1..6b0d6ac 100644 (file)
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -2340,6 +2340,9 @@ generated per second. It has to be a string in the format
 number or a valid video frame rate abbreviation. The default value is
 "25".
 
+@item sar
+Set the sample aspect ratio of the sourced video.
+
 @item duration
 Set the video duration of the sourced video. The accepted syntax is:
 @example

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 68b5d23..03fc83a 100644 (file)
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -30,7 +30,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  2
 #define LIBAVFILTER_VERSION_MINOR 34
-#define LIBAVFILTER_VERSION_MICRO  0
+#define LIBAVFILTER_VERSION_MICRO  1
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \

diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c
index e2cf4d4..1e3516d 100644 (file)
--- a/libavfilter/vsrc_testsrc.c
+++ b/libavfilter/vsrc_testsrc.c
@@ -46,6 +46,8 @@ typedef struct {
     char *size;                 ///< video frame size
     char *rate;                 ///< video frame rate
     char *duration;             ///< total duration of the generated video
+    AVRational sar;             ///< sample aspect ratio
+
     void (* fill_picture_fn)(AVFilterContext *ctx, AVFilterBufferRef *picref);
 
     /* only used by rgbtest */
@@ -60,6 +62,7 @@ static const AVOption testsrc_options[]= {
     { "rate",     "set video rate",     OFFSET(rate),     FF_OPT_TYPE_STRING, {.str = "25"},      0, 0 },
     { "r",        "set video rate",     OFFSET(rate),     FF_OPT_TYPE_STRING, {.str = "25"},      0, 0 },
     { "duration", "set video duration", OFFSET(duration), FF_OPT_TYPE_STRING, {.str = NULL},      0, 0 },
+    { "sar",      "set video sample aspect ratio", OFFSET(sar), FF_OPT_TYPE_RATIONAL, {.dbl= 1},  0, INT_MAX },
     { NULL },
 };
 
@@ -100,9 +103,10 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
     test->nb_frame = 0;
     test->pts = 0;
 
-    av_log(ctx, AV_LOG_INFO, "size:%dx%d rate:%d/%d duration:%f\n",
+    av_log(ctx, AV_LOG_INFO, "size:%dx%d rate:%d/%d duration:%f sar:%d/%d\n",
            test->w, test->h, frame_rate_q.num, frame_rate_q.den,
-           duration < 0 ? -1 : test->max_pts * av_q2d(test->time_base));
+           duration < 0 ? -1 : test->max_pts * av_q2d(test->time_base),
+           test->sar.num, test->sar.den);
     return 0;
 }
 
@@ -112,6 +116,7 @@ static int config_props(AVFilterLink *outlink)
 
     outlink->w = test->w;
     outlink->h = test->h;
+    outlink->sample_aspect_ratio = test->sar;
     outlink->time_base = test->time_base;
 
     return 0;
@@ -127,6 +132,7 @@ static int request_frame(AVFilterLink *outlink)
     picref = avfilter_get_video_buffer(outlink, AV_PERM_WRITE,
                                        test->w, test->h);
     picref->pts = test->pts++;
+    picref->video->sample_aspect_ratio = test->sar;
     test->nb_frame++;
     test->fill_picture_fn(outlink->src, picref);