virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter: let single output frame A->V filters set reasonable frame rate

Browse Source
This commit is contained in:
Paul B Mahol 2022-04-10 22:39:12 +02:00
parent 7ac559b819
commit 6e45acd23b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/avf_showspectrum.c
View File

@ -1241,6 +1241,8 @@ static int config_output(AVFilterLink *outlink)
int ret = av_parse_video_rate(&s->frame_rate, s->rate_str); int ret = av_parse_video_rate(&s->frame_rate, s->rate_str);
if (ret < 0) if (ret < 0)
return ret; return ret;
} else if (s->single_pic) {
s->frame_rate = av_make_q(1, 1);
} else { } else {
s->frame_rate = s->auto_frame_rate; s->frame_rate = s->auto_frame_rate;
} }

7
libavfilter/avf_showwaves.c
View File

@ -437,8 +437,11 @@ static int config_output(AVFilterLink *outlink)
outlink->h = showwaves->h; outlink->h = showwaves->h;
outlink->sample_aspect_ratio = (AVRational){1,1}; outlink->sample_aspect_ratio = (AVRational){1,1};
outlink->frame_rate = av_div_q((AVRational){inlink->sample_rate,showwaves->n}, if (showwaves->single_pic)
(AVRational){showwaves->w,1}); outlink->frame_rate = av_make_q(1, 1);
else
outlink->frame_rate = av_div_q((AVRational){inlink->sample_rate,showwaves->n},
(AVRational){showwaves->w,1});
av_log(ctx, AV_LOG_VERBOSE, "s:%dx%d r:%f n:%d\n", av_log(ctx, AV_LOG_VERBOSE, "s:%dx%d r:%f n:%d\n",
showwaves->w, showwaves->h, av_q2d(outlink->frame_rate), showwaves->n); showwaves->w, showwaves->h, av_q2d(outlink->frame_rate), showwaves->n);