From patchwork Tue Oct 27 18:30:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 23256 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CE43644A282 for ; Tue, 27 Oct 2020 20:37:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B833068A48B; Tue, 27 Oct 2020 20:37:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58D6D68A42C for ; Tue, 27 Oct 2020 20:36:58 +0200 (EET) Received: by mail-lf1-f67.google.com with SMTP id 184so3635908lfd.6 for ; Tue, 27 Oct 2020 11:36:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=FZxd2k/jDx1dnofiPOUrZowlRmLqaY3gZyoF4+qbrCc=; b=jsDY9VnQMSxzi6ORzUqZJv8fqJb7/uGmq1Ka0Sp4FIT8gd7Xls04oNJaAUlsDEOrD+ GyydhkhACxEeWMhicxJz7upuAiLzcV2zwMVqwP0a8cGUlPPFbRPLCOXgizQa3NrOLa7U 5ALUW72qLvA5XWHTkrKSf/qzUhk+ncTNohNHas8FR9vxdhkmMd6FcA1AwnKQKBwQzhz6 KrXF2HsCBSnOBVQ2CfxWokKcRsYB4NVMH1SmDdeaitFweGnbNjSYxJsawF4UbLiIJKMi aaXQrOjapsbEqthzlgmRL3CiMnV+xCcl/qTaaQ3VorK461q85+a6lWXlpEPoVq2yZc4J y4JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FZxd2k/jDx1dnofiPOUrZowlRmLqaY3gZyoF4+qbrCc=; b=aubKkIAgsq3oyXx0WO2aDABFlUo3rMPNN4ETfw5iqLvYD5TxqSSw8HOS7P4FpDcfBV v/HaltsYQN1OPt/+8lS/SQ3BUfeqqRoKmTDbiTMvdmMkKi6FySfSD87ua/QE1COoRjeu bHzzxzZNjPb2iFhKQURTyN0nP9uHwoYO/iXq2pXm1burxfzB8ZVXs03jBcqc2VtZMQut wYwJP3siw1vVE8Fnh6y5/VCPBLPY2LsnFvc/gdTjCvjpr5dOBHMtoJxdfb4J+z7nr0wz BMdnM0NZAJyepeTaH5ItPYaqI1jOFOjNRen3A5hZS/F09vYT0S8/YBkOwtHotAD/kO17 rTbg== X-Gm-Message-State: AOAM530m4qokdWIEssi322FvnXV6ylPe3iMCYo/sP4Gy8KGnm+mMuGAZ YDI3tZJ5+Yb9CC8tLjebb2RZW1Y6TDY= X-Google-Smtp-Source: ABdhPJzJMUhq2B9wHPfkLfvdNre/7OYTwGr3oNuEpxHJHqcgmUEF045vfhjWhn9dvRQVtMy1ssjx1A== X-Received: by 2002:a2e:91c8:: with SMTP id u8mr1521535ljg.192.1603823461775; Tue, 27 Oct 2020 11:31:01 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id a1sm255101lfg.63.2020.10.27.11.31.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 11:31:00 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Oct 2020 20:30:53 +0200 Message-Id: <20201027183056.17993-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201027183056.17993-1-jeebjp@gmail.com> References: <20201027183056.17993-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 2/5] ffmpeg: move AVFrame time base adjustment into a function X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This will have to be called later for video down the line. --- fftools/ffmpeg.c | 72 +++++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 25 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 3af189e7f2..498e5f08a6 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -903,6 +903,50 @@ static int check_recording_time(OutputStream *ost) return 1; } +static double adjust_frame_pts_to_encoder_tb(OutputFile *of, OutputStream *ost, + AVFrame *frame) +{ + double float_pts = AV_NOPTS_VALUE; // this is identical to frame.pts but with higher precision + AVCodecContext *enc = ost->enc_ctx; + if (!frame || frame->pts == AV_NOPTS_VALUE || + !enc || !ost->filter || !ost->filter->graph->graph) + goto early_exit; + + { + AVFilterContext *filter = ost->filter->filter; + + int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time; + AVRational filter_tb = av_buffersink_get_time_base(filter); + AVRational tb = enc->time_base; + int extra_bits = av_clip(29 - av_log2(tb.den), 0, 16); + + tb.den <<= extra_bits; + float_pts = + av_rescale_q(frame->pts, filter_tb, tb) - + av_rescale_q(start_time, AV_TIME_BASE_Q, tb); + float_pts /= 1 << extra_bits; + // avoid exact midoints to reduce the chance of rounding differences, this can be removed in case the fps code is changed to work with integers + float_pts += FFSIGN(float_pts) * 1.0 / (1<<17); + + frame->pts = + av_rescale_q(frame->pts, filter_tb, enc->time_base) - + av_rescale_q(start_time, AV_TIME_BASE_Q, enc->time_base); + } + +early_exit: + + if (debug_ts) { + av_log(NULL, AV_LOG_INFO, "filter -> pts:%s pts_time:%s exact:%f time_base:%d/%d\n", + frame ? av_ts2str(frame->pts) : "NULL", + frame ? av_ts2timestr(frame->pts, &enc->time_base) : "NULL", + float_pts, + enc ? enc->time_base.num : -1, + enc ? enc->time_base.den : -1); + } + + return float_pts; +} + static void do_audio_out(OutputFile *of, OutputStream *ost, AVFrame *frame) { @@ -1479,37 +1523,15 @@ static int reap_filters(int flush) av_frame_unref(filtered_frame); continue; } - if (filtered_frame->pts != AV_NOPTS_VALUE) { - int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time; - AVRational filter_tb = av_buffersink_get_time_base(filter); - AVRational tb = enc->time_base; - int extra_bits = av_clip(29 - av_log2(tb.den), 0, 16); - - tb.den <<= extra_bits; - float_pts = - av_rescale_q(filtered_frame->pts, filter_tb, tb) - - av_rescale_q(start_time, AV_TIME_BASE_Q, tb); - float_pts /= 1 << extra_bits; - // avoid exact midoints to reduce the chance of rounding differences, this can be removed in case the fps code is changed to work with integers - float_pts += FFSIGN(float_pts) * 1.0 / (1<<17); - - filtered_frame->pts = - av_rescale_q(filtered_frame->pts, filter_tb, enc->time_base) - - av_rescale_q(start_time, AV_TIME_BASE_Q, enc->time_base); - } + + float_pts = adjust_frame_pts_to_encoder_tb(of, ost, + filtered_frame); switch (av_buffersink_get_type(filter)) { case AVMEDIA_TYPE_VIDEO: if (!ost->frame_aspect_ratio.num) enc->sample_aspect_ratio = filtered_frame->sample_aspect_ratio; - if (debug_ts) { - av_log(NULL, AV_LOG_INFO, "filter -> pts:%s pts_time:%s exact:%f time_base:%d/%d\n", - av_ts2str(filtered_frame->pts), av_ts2timestr(filtered_frame->pts, &enc->time_base), - float_pts, - enc->time_base.num, enc->time_base.den); - } - do_video_out(of, ost, filtered_frame, float_pts); break; case AVMEDIA_TYPE_AUDIO: