From patchwork Thu Dec 14 19:31:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45144 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp5186201pzf; Thu, 14 Dec 2023 11:34:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IFF1y44HFWGwt0DnjC8bx/O7oYbZvPDzspEWBk0jWTaAPMyadqmuBPIKac5202r4vHPftkb X-Received: by 2002:a17:907:a70f:b0:a00:211c:9a9a with SMTP id vw15-20020a170907a70f00b00a00211c9a9amr11460327ejc.5.1702582443251; Thu, 14 Dec 2023 11:34:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702582443; cv=none; d=google.com; s=arc-20160816; b=i5TY1tdNUb4p9aKc9FMbTEkuVppgJwpn/LfPB6PO3tnamymZcsGvF5MEjF/enFpG/9 WZlZlSYmzljJk1FFrrv+TCeEVTjDb0q0JCC2lzwU11LvciaftAsBL/0njBGnsFX62xJg rdlnzmrT2AdnCTTMjKJc0KnEwX9IA4NbOAEO2WIByixnUWwVMk7rjU03lvrdJlikw5Ot /OcmcjgtaEFfvTtIKJwogZ/T6naEhpUQ7ZQft5bg8oO4b0N+WP8RGGHcNTPCGHcdwtp7 kLW7rtC7aap0DHv4DH8sTRVDKv78fGSsMqZybYqrIV7Y2Oqpzxcphj6C37owQc+4kdOX teEQ== 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=TlFkn3TH9AtwGvU4GE8sUWFtEy8RjQ9TTSOlHQ60KDQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Nia8riciXpGwd4ZDBAFHb9mO7HFCsj+dSj2xffx8sxspq2q3MeP6OEvErYYtohAlIC HDLhhTr0oRJIQE1eYKrCrpsMhgoDgI/EJkaLpCiLn6wpY322vMtjWescKutrC0rWQbhY Xanxl+JHolp7BpeZua1lLMmGzQ8/uYOQqLe7hPfT5BkB/pEjgyTmMIMLQIq3Qx8z7sYK 2Cb89ej4UPZvhSSuMPYOCTe5W0qRsv1vfKU/AcnGLZXAdAM096e20ZvU6mnhemRbLJFI 8vGgAzbnmHEGPbOcEWDCvZLMjQD71GsfIy+pUmkCTq8f/HYfcMNkbwQuopmEtnlhd0bP 3LVQ== 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 s10-20020a170906284a00b00a1b31f8f717si6562548ejc.737.2023.12.14.11.34.01; Thu, 14 Dec 2023 11:34:03 -0800 (PST) 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 68C6A68D2B9; Thu, 14 Dec 2023 21:32:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F5A768D29D for ; Thu, 14 Dec 2023 21:32:45 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 07F4B1783 for ; Thu, 14 Dec 2023 20:32:45 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id erc6jFvYs0oV for ; Thu, 14 Dec 2023 20:32:39 +0100 (CET) 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 5F9621B9A for ; Thu, 14 Dec 2023 20:32:38 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 5F36E3A05D0 for ; Thu, 14 Dec 2023 20:32:31 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Dec 2023 20:31:32 +0100 Message-ID: <20231214193138.2503-3-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231214193138.2503-1-anton@khirnov.net> References: <20231214193138.2503-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/9] fftools/ffmpeg_mux: factor timestamps processing out of write_packet() 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: 0J8epvHeSLau --- fftools/ffmpeg_mux.c | 50 ++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 3ce4ef131e..88ce3cd60c 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -135,20 +135,9 @@ static void mux_log_debug_ts(OutputStream *ost, const AVPacket *pkt) pkt->size, *latency ? latency : "N/A"); } -static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) +static int mux_fixup_ts(Muxer *mux, MuxStream *ms, AVPacket *pkt) { - MuxStream *ms = ms_from_ost(ost); - AVFormatContext *s = mux->fc; - int64_t fs; - uint64_t frame_num; - int ret; - - fs = filesize(s->pb); - atomic_store(&mux->last_filesize, fs); - if (fs >= mux->limit_filesize) { - ret = AVERROR_EOF; - goto fail; - } + OutputStream *ost = &ms->ost; #if FFMPEG_OPT_VSYNC_DROP if (ost->type == AVMEDIA_TYPE_VIDEO && ost->vsync_method == VSYNC_DROP) @@ -174,7 +163,7 @@ static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) av_packet_rescale_ts(pkt, pkt->time_base, ost->st->time_base); pkt->time_base = ost->st->time_base; - if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS)) { + if (!(mux->fc->oformat->flags & AVFMT_NOTIMESTAMPS)) { if (pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->dts > pkt->pts) { @@ -188,7 +177,7 @@ static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) if ((ost->type == AVMEDIA_TYPE_AUDIO || ost->type == AVMEDIA_TYPE_VIDEO || ost->type == AVMEDIA_TYPE_SUBTITLE) && pkt->dts != AV_NOPTS_VALUE && ms->last_mux_dts != AV_NOPTS_VALUE) { - int64_t max = ms->last_mux_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT); + int64_t max = ms->last_mux_dts + !(mux->fc->oformat->flags & AVFMT_TS_NONSTRICT); if (pkt->dts < max) { int loglevel = max - pkt->dts > 2 || ost->type == AVMEDIA_TYPE_VIDEO ? AV_LOG_WARNING : AV_LOG_DEBUG; if (exit_on_error) @@ -197,8 +186,7 @@ static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) "previous: %"PRId64", current: %"PRId64"; ", ms->last_mux_dts, pkt->dts); if (exit_on_error) { - ret = AVERROR(EINVAL); - goto fail; + return AVERROR(EINVAL); } av_log(ost, loglevel, "changing to %"PRId64". This may result " @@ -212,14 +200,36 @@ static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) } ms->last_mux_dts = pkt->dts; + if (debug_ts) + mux_log_debug_ts(ost, pkt); + + return 0; +} + +static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) +{ + MuxStream *ms = ms_from_ost(ost); + AVFormatContext *s = mux->fc; + int64_t fs; + uint64_t frame_num; + int ret; + + fs = filesize(s->pb); + atomic_store(&mux->last_filesize, fs); + if (fs >= mux->limit_filesize) { + ret = AVERROR_EOF; + goto fail; + } + + ret = mux_fixup_ts(mux, ms, pkt); + if (ret < 0) + goto fail; + ms->data_size_mux += pkt->size; frame_num = atomic_fetch_add(&ost->packets_written, 1); pkt->stream_index = ost->index; - if (debug_ts) - mux_log_debug_ts(ost, pkt); - if (ms->stats.io) enc_stats_write(ost, &ms->stats, NULL, pkt, frame_num);