har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vsrc_testsrc: allow to set the sample aspect ratio

Browse Source 
Add the sar option. Useful for debugging/testing purposes.
This commit is contained in:
Stefano Sabatini 2011-08-21 15:12:40 +02:00
parent 6a5c693a18
commit 34c997599e
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/filters.texi
View File

@ -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 number or a valid video frame rate abbreviation. The default value is
"25". "25".
@item sar
Set the sample aspect ratio of the sourced video.
@item duration @item duration
Set the video duration of the sourced video. The accepted syntax is: Set the video duration of the sourced video. The accepted syntax is:
@example @example

2
libavfilter/avfilter.h
View File

@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 2 #define LIBAVFILTER_VERSION_MAJOR 2
#define LIBAVFILTER_VERSION_MINOR 34 #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, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \

10
libavfilter/vsrc_testsrc.c
View File

@ -46,6 +46,8 @@ typedef struct {
char *size; ///< video frame size char *size; ///< video frame size
char *rate; ///< video frame rate char *rate; ///< video frame rate
char *duration; ///< total duration of the generated video char *duration; ///< total duration of the generated video
AVRational sar; ///< sample aspect ratio
void (* fill_picture_fn)(AVFilterContext *ctx, AVFilterBufferRef *picref); void (* fill_picture_fn)(AVFilterContext *ctx, AVFilterBufferRef *picref);
/* only used by rgbtest */ /* 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 }, { "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 }, { "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 }, { "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 }, { NULL },
}; };
@ -100,9 +103,10 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
test->nb_frame = 0; test->nb_frame = 0;
test->pts = 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, 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; return 0;
} }
@ -112,6 +116,7 @@ static int config_props(AVFilterLink *outlink)
outlink->w = test->w; outlink->w = test->w;
outlink->h = test->h; outlink->h = test->h;
outlink->sample_aspect_ratio = test->sar;
outlink->time_base = test->time_base; outlink->time_base = test->time_base;
return 0; return 0;
@ -127,6 +132,7 @@ static int request_frame(AVFilterLink *outlink)
picref = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, picref = avfilter_get_video_buffer(outlink, AV_PERM_WRITE,
test->w, test->h); test->w, test->h);
picref->pts = test->pts++; picref->pts = test->pts++;
picref->video->sample_aspect_ratio = test->sar;
test->nb_frame++; test->nb_frame++;
test->fill_picture_fn(outlink->src, picref); test->fill_picture_fn(outlink->src, picref);