From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B035B4709B for ; Sat, 26 Aug 2023 15:15:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B403B68C71B; Sat, 26 Aug 2023 18:13:28 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EF3B68C654 for ; Sat, 26 Aug 2023 18:13:13 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 9310C240DA7 for ; Sat, 26 Aug 2023 17:13:12 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id IWhJXHAtlwYz for ; Sat, 26 Aug 2023 17:13:11 +0200 (CEST) Received: from mail1.khirnov.net (mail1.khirnov.net [IPv6:2a00:c500:561:206::5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail1.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 9EBB1240177 for ; Sat, 26 Aug 2023 17:13:11 +0200 (CEST) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id EB02640F8 for ; Sat, 26 Aug 2023 17:15:14 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 8pd5HNPbTU_f for ; Sat, 26 Aug 2023 17:15:14 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 5BE264104 for ; Sat, 26 Aug 2023 17:15:05 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 6A1343A122D for ; Sat, 26 Aug 2023 17:11:52 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Aug 2023 17:11:31 +0200 Message-Id: <20230826151144.24858-5-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230826151144.24858-1-anton@khirnov.net> References: <20230826151144.24858-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/18] fftools/ffmpeg_enc: factor out setting encoder timebase X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Mainly this fixes handling special values of -enc_time_base ('demux' or 'filter') for audio. It also prints a warning if -enc_time_base is specified for subtitles, instead of ignoring it silently (current subtitle encoding API only works with AV_TIME_BASE_Q). --- fftools/ffmpeg_enc.c | 154 ++++++++++++++++++++++++++----------------- 1 file changed, 93 insertions(+), 61 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 3c9fdd3237..c4874b4d78 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -190,6 +190,93 @@ static int set_encoder_id(OutputFile *of, OutputStream *ost) return 0; } +static int enc_choose_timebase(OutputStream *ost, AVFrame *frame) +{ + const OutputFile *of = output_files[ost->file_index]; + AVCodecContext *enc = ost->enc_ctx; + AVRational tb = (AVRational){ 0, 0 }; + AVRational fr; + FrameData *fd; + + if (ost->type == AVMEDIA_TYPE_SUBTITLE) { + if (ost->enc_timebase.num) + av_log(ost, AV_LOG_WARNING, + "-enc_time_base not supported for subtitles, ignoring\n"); + enc->time_base = AV_TIME_BASE_Q; + return 0; + } + + fd = frame_data(frame); + + // apply -enc_time_base + if (ost->enc_timebase.num == ENC_TIME_BASE_DEMUX && + (fd->dec.tb.num <= 0 || fd->dec.tb.den <= 0)) { + av_log(ost, AV_LOG_ERROR, + "Demuxing timebase not available - cannot use it for encoding\n"); + return AVERROR(EINVAL); + } + + switch (ost->enc_timebase.num) { + case 0: break; + case ENC_TIME_BASE_DEMUX: tb = fd->dec.tb; break; + case ENC_TIME_BASE_FILTER: tb = frame->time_base; break; + default: tb = ost->enc_timebase; break; + } + + if (ost->type == AVMEDIA_TYPE_AUDIO) { + enc->time_base = tb.num ? tb : (AVRational){ 1, frame->sample_rate }; + 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"); + } + + 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 (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; + + ost->st->avg_frame_rate = fr; + + if (!(tb.num > 0 && tb.den > 0)) + tb = av_inv_q(fr); + if (!(tb.num > 0 && tb.den > 0)) + tb = frame->time_base; + + enc->time_base = tb; + + return 0; +} + int enc_open(OutputStream *ost, AVFrame *frame) { InputStream *ist = ost->ist; @@ -221,6 +308,12 @@ int enc_open(OutputStream *ost, AVFrame *frame) dec_ctx = ist->dec_ctx; } + ret = enc_choose_timebase(ost, frame); + if (ret < 0) { + av_log(ost, AV_LOG_ERROR, "Could not choose a time base for encoding\n"); + return AVERROR(EINVAL); + } + switch (enc_ctx->codec_type) { case AVMEDIA_TYPE_AUDIO: enc_ctx->sample_fmt = frame->format; @@ -234,65 +327,9 @@ int enc_open(OutputStream *ost, AVFrame *frame) else enc_ctx->bits_per_raw_sample = FFMIN(fd->bits_per_raw_sample, av_get_bytes_per_sample(enc_ctx->sample_fmt) << 3); - - enc_ctx->time_base = ost->enc_timebase.num > 0 ? ost->enc_timebase : - av_make_q(1, enc_ctx->sample_rate); break; case AVMEDIA_TYPE_VIDEO: { - AVRational 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 (enc->supported_framerates && !ost->force_fps) { - int idx = av_find_nearest_q_idx(fr, enc->supported_framerates); - fr = enc->supported_framerates[idx]; - } - // reduce frame rate for mpeg4 to be within the spec limits - if (enc_ctx->codec_id == AV_CODEC_ID_MPEG4) { - av_reduce(&fr.num, &fr.den, - fr.num, fr.den, 65535); - } - - if (ost->enc_timebase.num == ENC_TIME_BASE_DEMUX) { - if (fd->dec.tb.num <= 0 || fd->dec.tb.den <= 0) { - av_log(ost, AV_LOG_ERROR, - "Demuxing timebase not available - cannot use it for encoding\n"); - return AVERROR(EINVAL); - } - - enc_ctx->time_base = fd->dec.tb; - } else if (ost->enc_timebase.num == ENC_TIME_BASE_FILTER) { - enc_ctx->time_base = frame->time_base; - } else { - enc_ctx->time_base = ost->enc_timebase.num > 0 ? ost->enc_timebase : - av_inv_q(fr); - } - - if (!(enc_ctx->time_base.num && enc_ctx->time_base.den)) - enc_ctx->time_base = frame->time_base; - if ( av_q2d(enc_ctx->time_base) < 0.001 && 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_ctx->width = frame->width; enc_ctx->height = frame->height; enc_ctx->sample_aspect_ratio = ost->st->sample_aspect_ratio = @@ -314,10 +351,6 @@ int enc_open(OutputStream *ost, AVFrame *frame) enc_ctx->colorspace = frame->colorspace; enc_ctx->chroma_sample_location = frame->chroma_location; - enc_ctx->framerate = fr; - - ost->st->avg_frame_rate = fr; - // Field order: autodetection if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) && ost->top_field_first >= 0) @@ -344,7 +377,6 @@ int enc_open(OutputStream *ost, AVFrame *frame) break; } case AVMEDIA_TYPE_SUBTITLE: - enc_ctx->time_base = AV_TIME_BASE_Q; if (!enc_ctx->width) { enc_ctx->width = ost->ist->par->width; enc_ctx->height = ost->ist->par->height; -- 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".