From patchwork Thu Jun 23 15:32:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 36404 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp3544778pzb; Thu, 23 Jun 2022 08:33:00 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v2FSxzjZFL6jlNTtg+mJeNMH1Yh2O+iYi43l1QKzQVNNkPUqlbAlSav3kY5CJDeT261wts X-Received: by 2002:a17:907:16a4:b0:711:c9a7:dc75 with SMTP id hc36-20020a17090716a400b00711c9a7dc75mr8491718ejc.542.1655998380122; Thu, 23 Jun 2022 08:33:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655998380; cv=none; d=google.com; s=arc-20160816; b=u+Eg3vgbM3Hp561lBgD6xWwNcBCL5T2moxKY2bTXC+mefLbKQqE4Zw+2pl3W6/LZm7 DEEc3Cn8u+4Q9LmQyGxe785ycUDKiFwdvXVy4c/6bV+XgYTpUfEQ/vCsXeodqpbAknLr LyGnvuM6tVlPQL96EIAhfuNBC94eiPerwYJurhS5jlRtKrPpm53L23w5HYoC0Mppanwh yapqA2fpxLfufg5XUvCZMwn3H2rT+DofuCJqffJeTN2rM8pnsCQzptVBsuHervSokWsI Wn3nC+DgkvxTmU0UBof9ZIOxNkmdg3V1rdY4zXf046PlvpPu6iZh0TQ82i8t8pLYpGXc zN/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=l6CfkmuhmKEASF7Um/Dh8LIFvSEjckkasEb48aJMSpk=; b=xnoOGVek6ELVijVCSHGjKQOAUCjgw0BhQQrJ2G+meQa18ELvF6gRVIhm1PHWiu38ga XUKSglKIBj7O8XhBahQ68OgfhHlkp1636647FVKIMK0VCyOzPyuFkrwTG18/zoDv66Tz mfDPdodOV0B8usTX9PakHNrqdkvQMqe4j/H6kkdz+D0iYpS/QYfXIVFKtUa8vfiCJkfF moap0oipW5ix9C+YdwoORL+bBicEy2cJPdWB30tY/DjhbP3nP1Xod/3RKy2ge7FJN1C8 V+PEp9PFOG+ixP8q4sdHWSScJq19Zysy+ZXqXok7T366cxygcpdyi7SgMNsYx8eX/zf3 nbNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z16-20020a05640235d000b004359f333398si9809372edc.321.2022.06.23.08.32.57; Thu, 23 Jun 2022 08:33:00 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D908168B6BB; Thu, 23 Jun 2022 18:32:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2FDAC68B1AE for ; Thu, 23 Jun 2022 18:32:47 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 445D3240179 for ; Thu, 23 Jun 2022 17:32:46 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id pjvk72j-PEmn for ; Thu, 23 Jun 2022 17:32:45 +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 mail0.khirnov.net (Postfix) with ESMTPS id 278DB2400F5 for ; Thu, 23 Jun 2022 17:32:45 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 58DB03A074C; Thu, 23 Jun 2022 17:32:45 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Jun 2022 17:32:40 +0200 Message-Id: <20220623153240.29169-1-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220617184542.GX396728@pb2> References: <20220617184542.GX396728@pb2> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg: use last filter output pts to choose next output stream 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qeSTFnUZ+PnX This will be needed in following commits that will add new buffering stages after encoding and bitstream filtering. --- also updated my branch ffmpeg_mt/mux --- fftools/ffmpeg.c | 22 +++++++++++++++++----- fftools/ffmpeg.h | 2 ++ fftools/ffmpeg_opt.c | 1 + 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 53ca8c7f7b..bdbc66fd41 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1343,6 +1343,12 @@ static int reap_filters(int flush) continue; } + if (filtered_frame->pts != AV_NOPTS_VALUE) { + AVRational tb = av_buffersink_get_time_base(filter); + ost->last_filter_pts = av_rescale_q(filtered_frame->pts, tb, + AV_TIME_BASE_Q); + } + switch (av_buffersink_get_type(filter)) { case AVMEDIA_TYPE_VIDEO: if (!ost->frame_aspect_ratio.num) @@ -3440,13 +3446,19 @@ static OutputStream *choose_output(void) for (i = 0; i < nb_output_streams; i++) { OutputStream *ost = output_streams[i]; - int64_t opts = ost->last_mux_dts == AV_NOPTS_VALUE ? INT64_MIN : + int64_t opts; + + if (ost->filter && ost->last_filter_pts != AV_NOPTS_VALUE) { + opts = ost->last_filter_pts; + } else { + opts = ost->last_mux_dts == AV_NOPTS_VALUE ? INT64_MIN : av_rescale_q(ost->last_mux_dts, ost->st->time_base, AV_TIME_BASE_Q); - if (ost->last_mux_dts == AV_NOPTS_VALUE) - av_log(NULL, AV_LOG_DEBUG, - "cur_dts is invalid st:%d (%d) [init:%d i_done:%d finish:%d] (this is harmless if it occurs once at the start per stream)\n", - ost->st->index, ost->st->id, ost->initialized, ost->inputs_done, ost->finished); + if (ost->last_mux_dts == AV_NOPTS_VALUE) + av_log(NULL, AV_LOG_DEBUG, + "cur_dts is invalid st:%d (%d) [init:%d i_done:%d finish:%d] (this is harmless if it occurs once at the start per stream)\n", + ost->st->index, ost->st->id, ost->initialized, ost->inputs_done, ost->finished); + } if (!ost->initialized && !ost->inputs_done) return ost->unavailable ? NULL : ost; diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 2aa220da29..861f8140cf 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -468,6 +468,8 @@ typedef struct OutputStream { int64_t first_pts; /* dts of the last packet sent to the muxer */ int64_t last_mux_dts; + /* pts of the last frame received from the filters, in AV_TIME_BASE_Q */ + int64_t last_filter_pts; // the timebase of the packets sent to the muxer AVRational mux_timebase; AVRational enc_timebase; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 004db7ac7b..d1e9c0505b 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1667,6 +1667,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e input_streams[source_index]->st->discard = input_streams[source_index]->user_set_discard; } ost->last_mux_dts = AV_NOPTS_VALUE; + ost->last_filter_pts = AV_NOPTS_VALUE; return ost; }