RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-27 01:01:07 +00:00
Code Issues Projects Releases Wiki Activity

testsrc: set output framerate

Browse Source 
(cherry picked from ffmpeg commit 7cd5fa35fe)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Stefano Sabatini 2015-11-03 09:57:22 -08:00 committed by Anton Khirnov
parent 9df477e03e
commit 5e91a5c5cf
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/vsrc_testsrc.c
View File

@ -46,7 +46,7 @@ typedef struct TestSourceContext {
const AVClass *class; const AVClass *class;
int h, w; int h, w;
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 *size; ///< video frame size char *size; ///< video frame size
char *rate; ///< video frame rate char *rate; ///< video frame rate
@ -75,7 +75,6 @@ static const AVOption testsrc_options[] = {
static av_cold int init_common(AVFilterContext *ctx) static av_cold int init_common(AVFilterContext *ctx)
{ {
TestSourceContext *test = ctx->priv; TestSourceContext *test = ctx->priv;
AVRational frame_rate_q;
int64_t duration = -1; int64_t duration = -1;
int ret = 0; int ret = 0;
@ -84,8 +83,7 @@ static av_cold int init_common(AVFilterContext *ctx)
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->rate)) < 0) {
frame_rate_q.den <= 0 || frame_rate_q.num <= 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->rate);
return ret; return ret;
} }
@ -95,15 +93,14 @@ static av_cold int init_common(AVFilterContext *ctx)
return ret; return ret;
} }
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_DEBUG, "size:%dx%d rate:%d/%d duration:%f sar:%d/%d\n", av_log(ctx, AV_LOG_DEBUG, "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(test->time_base),
test->sar.num, test->sar.den); test->sar.num, test->sar.den);
return 0; return 0;
@ -116,7 +113,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;
} }