virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-24 17:12:34 +02:00
Code Issues Releases Activity

lavfi/testsrc: set output framerate

Browse Source
This commit is contained in:
Stefano Sabatini 2012-08-16 21:53:30 +02:00
parent e5ae2f9126
commit 7cd5fa35fe
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/version.h
View File

@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 10 #define LIBAVFILTER_VERSION_MINOR 10
#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_MICRO 101
#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, \

24
libavfilter/vsrc_testsrc.c
View File

@ -50,9 +50,9 @@ typedef struct {
const AVClass *class; const AVClass *class;
int w, h; int w, h;
unsigned int nb_frame; unsigned int nb_frame;
AVRational time_base; AVRational time_base, frame_rate;
int64_t pts, max_pts; int64_t pts, max_pts;
char *rate; ///< video frame rate char *frame_rate_str; ///< video frame rate
char *duration; ///< total duration of the generated video char *duration; ///< total duration of the generated video
AVRational sar; ///< sample aspect ratio AVRational sar; ///< sample aspect ratio
int nb_decimals; int nb_decimals;
@ -77,8 +77,8 @@ typedef struct {
static const AVOption options[] = { static const AVOption options[] = {
{ "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "320x240"}, 0, 0, FLAGS }, { "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "320x240"}, 0, 0, FLAGS },
{ "s", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "320x240"}, 0, 0, FLAGS }, { "s", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "320x240"}, 0, 0, FLAGS },
{ "rate", "set video rate", OFFSET(rate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, FLAGS }, { "rate", "set video rate", OFFSET(frame_rate_str), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, FLAGS },
{ "r", "set video rate", OFFSET(rate), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, FLAGS }, { "r", "set video rate", OFFSET(frame_rate_str), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, FLAGS },
{ "duration", "set video duration", OFFSET(duration), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS }, { "duration", "set video duration", OFFSET(duration), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS },
{ "d", "set video duration", OFFSET(duration), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS }, { "d", "set video duration", OFFSET(duration), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS },
{ "sar", "set video sample aspect ratio", OFFSET(sar), AV_OPT_TYPE_RATIONAL, {.dbl= 1}, 0, INT_MAX, FLAGS }, { "sar", "set video sample aspect ratio", OFFSET(sar), AV_OPT_TYPE_RATIONAL, {.dbl= 1}, 0, INT_MAX, FLAGS },
@ -96,7 +96,7 @@ static const AVOption options[] = {
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx, const char *args)
{ {
TestSourceContext *test = ctx->priv; TestSourceContext *test = ctx->priv;
AVRational frame_rate_q; AVRational time_base;
int64_t duration = -1; int64_t duration = -1;
int ret = 0; int ret = 0;
@ -105,8 +105,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
if ((ret = (av_set_options_string(test, args, "=", ":"))) < 0) if ((ret = (av_set_options_string(test, args, "=", ":"))) < 0)
return ret; return ret;
if ((ret = av_parse_video_rate(&frame_rate_q, test->rate)) < 0) { if ((ret = av_parse_video_rate(&test->frame_rate, test->frame_rate_str)) < 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'\n", test->rate); av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'\n", test->frame_rate_str);
return ret; return ret;
} }
@ -133,16 +133,15 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
} }
} }
test->time_base.num = frame_rate_q.den; test->time_base = av_inv_q(test->frame_rate);
test->time_base.den = frame_rate_q.num;
test->max_pts = duration >= 0 ? test->max_pts = duration >= 0 ?
av_rescale_q(duration, AV_TIME_BASE_Q, test->time_base) : -1; av_rescale_q(duration, AV_TIME_BASE_Q, test->time_base) : -1;
test->nb_frame = 0; test->nb_frame = 0;
test->pts = 0; test->pts = 0;
av_log(ctx, AV_LOG_VERBOSE, "size:%dx%d rate:%d/%d duration:%f sar:%d/%d\n", av_log(ctx, AV_LOG_VERBOSE, "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, test->frame_rate.num, test->frame_rate.den,
duration < 0 ? -1 : test->max_pts * av_q2d(test->time_base), duration < 0 ? -1 : test->max_pts * av_q2d(time_base),
test->sar.num, test->sar.den); test->sar.num, test->sar.den);
return 0; return 0;
} }
@ -162,7 +161,8 @@ 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->sample_aspect_ratio = test->sar;
outlink->time_base = test->time_base; outlink->frame_rate = test->frame_rate;
outlink->time_base = test->time_base;
return 0; return 0;
} }