From: Anton Khirnov <anton@khirnov.net> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 06/18] fftools/ffmpeg_enc: reindent after previous commit Date: Sat, 26 Aug 2023 17:11:32 +0200 Message-ID: <20230826151144.24858-6-anton@khirnov.net> (raw) In-Reply-To: <20230826151144.24858-1-anton@khirnov.net> --- fftools/ffmpeg_enc.c | 66 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index c4874b4d78..4b5bd3d9b4 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -228,44 +228,44 @@ static int enc_choose_timebase(OutputStream *ost, AVFrame *frame) return 0; } - fr = ost->frame_rate; - if (!fr.num) - fr = fd->frame_rate_filter; - if (!fr.num && !ost->max_frame_rate.num) { - fr = (AVRational){25, 1}; - av_log(ost, AV_LOG_WARNING, - "No information " - "about the input framerate is available. Falling " - "back to a default value of 25fps. Use the -r option " - "if you want a different framerate.\n"); - } + fr = ost->frame_rate; + if (!fr.num) + fr = fd->frame_rate_filter; + if (!fr.num && !ost->max_frame_rate.num) { + fr = (AVRational){25, 1}; + av_log(ost, AV_LOG_WARNING, + "No information " + "about the input framerate is available. Falling " + "back to a default value of 25fps. Use the -r option " + "if you want a different framerate.\n"); + } - if (ost->max_frame_rate.num && - (av_q2d(fr) > av_q2d(ost->max_frame_rate) || - !fr.den)) - fr = ost->max_frame_rate; + if (ost->max_frame_rate.num && + (av_q2d(fr) > av_q2d(ost->max_frame_rate) || + !fr.den)) + fr = ost->max_frame_rate; - if (enc->codec->supported_framerates && !ost->force_fps) { - int idx = av_find_nearest_q_idx(fr, enc->codec->supported_framerates); - fr = enc->codec->supported_framerates[idx]; - } - // reduce frame rate for mpeg4 to be within the spec limits - if (enc->codec_id == AV_CODEC_ID_MPEG4) { - av_reduce(&fr.num, &fr.den, - fr.num, fr.den, 65535); - } + if (enc->codec->supported_framerates && !ost->force_fps) { + int idx = av_find_nearest_q_idx(fr, enc->codec->supported_framerates); + fr = enc->codec->supported_framerates[idx]; + } + // reduce frame rate for mpeg4 to be within the spec limits + if (enc->codec_id == AV_CODEC_ID_MPEG4) { + av_reduce(&fr.num, &fr.den, + fr.num, fr.den, 65535); + } - if (av_q2d(fr) > 1e3 && ost->vsync_method != VSYNC_PASSTHROUGH && - (ost->vsync_method == VSYNC_CFR || ost->vsync_method == VSYNC_VSCFR || - (ost->vsync_method == VSYNC_AUTO && !(of->format->flags & AVFMT_VARIABLE_FPS)))){ - av_log(ost, AV_LOG_WARNING, "Frame rate very high for a muxer not efficiently supporting it.\n" - "Please consider specifying a lower framerate, a different muxer or " - "setting vsync/fps_mode to vfr\n"); - } + if (av_q2d(fr) > 1e3 && ost->vsync_method != VSYNC_PASSTHROUGH && + (ost->vsync_method == VSYNC_CFR || ost->vsync_method == VSYNC_VSCFR || + (ost->vsync_method == VSYNC_AUTO && !(of->format->flags & AVFMT_VARIABLE_FPS)))){ + av_log(ost, AV_LOG_WARNING, "Frame rate very high for a muxer not efficiently supporting it.\n" + "Please consider specifying a lower framerate, a different muxer or " + "setting vsync/fps_mode to vfr\n"); + } - enc->framerate = fr; + enc->framerate = fr; - ost->st->avg_frame_rate = fr; + ost->st->avg_frame_rate = fr; if (!(tb.num > 0 && tb.den > 0)) tb = av_inv_q(fr); -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-08-26 15:14 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-08-26 15:11 [FFmpeg-devel] [PATCH 01/18] fftools/ffmpeg: stop explicitly closing output streams on input EOF Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 02/18] fftools/ffmpeg: simplify handling input -t for streamcopy Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 03/18] fftools/ffmpeg_mux: use correct timebases for bitstream filtering Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 04/18] fftools/ffmpeg_mux: stop rescaling timestamps in of_streamcopy() Anton Khirnov 2023-08-26 20:20 ` Michael Niedermayer 2023-08-27 10:50 ` [FFmpeg-devel] [PATCH 04/18 v2] " Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 05/18] fftools/ffmpeg_enc: factor out setting encoder timebase Anton Khirnov 2023-08-26 15:11 ` Anton Khirnov [this message] 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 07/18] fftools/ffmpeg_enc: only use fallback framerate when encoding CFR Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 08/18] fftools/ffmpeg_enc: reindent after previous commit Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 09/18] fftools/ffmpeg_filter: sanitize framerate retrieved from the filtergraph Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 10/18] fftools/ffmpeg: move derivation of frame duration from filter framerate Anton Khirnov 2023-08-29 8:07 ` Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 11/18] fftools/ffmpeg_enc: move handling video frame duration to video_sync_process() Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 12/18] fftools/ffmpeg_filter: factor processing a single frame out of reap_filters() Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 13/18] fftools/ffmpeg_filter: reindent after previous commit Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 14/18] fftools/ffmpeg_filter: shorten a variable name Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 15/18] fftools/ffmpeg_enc: move remaining vsync-related code to video_sync_process() Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 16/18] fftools/ffmpeg_enc: simplify adjust_frame_pts_to_encoder_tb() signature Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 17/18] fftools/ffmpeg_mux: rename of_close() to of_free() Anton Khirnov 2023-08-26 15:11 ` [FFmpeg-devel] [PATCH 18/18] fftools/ffmpeg: move sending filtergraph commands to a separate function Anton Khirnov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230826151144.24858-6-anton@khirnov.net \ --to=anton@khirnov.net \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git