From patchwork Sun Sep 13 21:31:13 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: 22342 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 3DD1844BD34 for ; Mon, 14 Sep 2020 00:31:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DBA368BBDF; Mon, 14 Sep 2020 00:31:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B72668BB5C for ; Mon, 14 Sep 2020 00:31:17 +0300 (EEST) Received: by mail-lf1-f65.google.com with SMTP id d15so11250784lfq.11 for ; Sun, 13 Sep 2020 14:31:17 -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=W4ijZkw5t0ucuk3kqVHoU6vpi1K3LBBF5afBNdlsdRI=; b=lI10dRe5Tzw8MBs9CBd5pLVdPeSfFwPPlxP7Mqq95C12HtzvmymEK5C0i0O7W8jHe9 N0ZL4cg/bbRUcjQqcVnvbMLM+2Hneo+vod2mYSJTnpXI3CV+qY020MqMH6+XzN1KDdby u5j7A9UQBmQW84VLNxXSqgnxPxvQLK0C0YoIZHfQGGaI6PXnAU0gh+B9jhk4AJbNPLI5 nN2DtXH4oXgVcutdFMVl1SmlW82wBrq90gPV60xKJAbgtDLDSQ+RCvvuZPKshtXqMOWV /mvxs0iMFdBil//L7xPNljwr+ZZBvngfVTjZMcJrRvlsA0cxvfuOvzp6drBeBYmHh36l sEZA== 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=W4ijZkw5t0ucuk3kqVHoU6vpi1K3LBBF5afBNdlsdRI=; b=H/y53St30EO0IxpCGc3/xYE+LybYbn04ti1mrwv18HFHM6I71z2HzDmepeoVFC2yDJ rBCpWNMa5K3Ksngqt40+CcF0sQScdDt2+9FRf/skZL9GFGw2s6oBfCsSaXysUT33hjtG b06xaKN17UPzDSbHLz4Obab+vHEn68fYyHX5KMcd0umKtVr+Wx7B1YLy372Fj6IwGp94 hCZ7X5TxVB0uS+fVeA9YbLw0EJajGn11j62uHS1C8jmcdz4fylmPZFoGn9ORCEtfUuDU zGGLqK7DSJWNlVCVHLWcji0BKYtEcyzskTz9CbpclDnaCYu8j9I8kLNoFISzeWvVqAlM JJsw== X-Gm-Message-State: AOAM530fbXYb5TwWgfjKXYTUE99CLPN5C7key2kxa6rh1mqtDMU86jxR BMrLzKYlRtmZJb0NO3ZLPGn9KgDo7HA= X-Google-Smtp-Source: ABdhPJwbxmzEgCQT7E5U6ysIg2iTamsaCuiELsr7Rl0MAMDxjrUWAAYZ6FA6ViECflye2o720uEEiA== X-Received: by 2002:ac2:5e2b:: with SMTP id o11mr4028500lfg.24.1600032675868; Sun, 13 Sep 2020 14:31:15 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id k10sm3476656lja.112.2020.09.13.14.31.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Sep 2020 14:31:14 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Sep 2020 00:31:13 +0300 Message-Id: <20200913213113.247047-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200913102622.168011-3-jeebjp@gmail.com> References: <20200913102622.168011-3-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4 v2] 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 | 69 ++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 25 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index cb7644de6a..54802a8ec3 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -897,6 +897,47 @@ 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 + if (!frame || frame->pts == AV_NOPTS_VALUE || + !ost->filter || !ost->filter->graph->graph) + goto early_exit; + + AVFilterContext *filter = ost->filter->filter; + AVCodecContext *enc = ost->enc_ctx; + + 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->time_base.num, enc->time_base.den); + } + + return float_pts; +} + static void do_audio_out(OutputFile *of, OutputStream *ost, AVFrame *frame) { @@ -1473,37 +1514,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: