From patchwork Sat Nov 4 07:56:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 44506 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3aa6:b0:181:818d:5e7f with SMTP id d38csp336188pzh; Sat, 4 Nov 2023 02:22:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IECwnLpkwSNNhOs8H0Fg3yscZspDfSJ36+/V8ieRGU2fNqPXGPbWA64bCIVTUueQQM4JowK X-Received: by 2002:a50:d6cf:0:b0:544:224b:a4d2 with SMTP id l15-20020a50d6cf000000b00544224ba4d2mr2991457edj.0.1699089751204; Sat, 04 Nov 2023 02:22:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699089751; cv=none; d=google.com; s=arc-20160816; b=o2NrWvZEaw5Wl/aqfqKrO/kOATIgvSYQxElNw2lpo8Yqdt1EG+mfNMNFU6M/GK4dII OWl/3+wHbwr41O1nSLpGEC9tMJDtIh75bt/cvyQt9Sna1zXFLZFHAlOEdfyY8qlNgWfk n4PARzuMqAF9wvXL2OFu0SazZqGIdfY/L4a0ZuYjukDlKVWKUVosqCPbU+BzWW2TVfh/ 6erHPxLsEgCobUs9gS9Qdh7ObmSOicPulU4N2+xKBaUp+/uZGQj2zgEULf/ePTRZaMPW piIFSrUr1XO9GMY3G2WLBjTp0X41rzCswqvTGYemWWfhnJSrRGYSNKa3hMfXjQqaj8Mj Wg2w== 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=2ohlx1xZ8joMct5nJPlgVaP1p2UVEBcS9gAf1te0fOo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=zzV6e47s7iAn5skhJEVpyNHgrxce18RduEau20V1o+xQczVFzSHmQmhcmKv64VpoJq LqCmMbYprta/8C+U6sYC/KpB1aRTdtUIX5wt0nIS3w6tEUFQoEOfFcL8XFSysaK3BgOx C9yvNTj+wsG5S4UCWElkcbxICECUBct18TRm5w6tFmBUkB7bK5sideGKn67t8oA3ZKPc p/6oBcdRZWH/MLK5kxZv9AzmDKsU7KEj3RwRgeI+tXCV4FHorkVljGMkD16TGcYtlTVk dN4UffB2dWrW1EfwcON6UpFOZIABwfPZoPSDvkQOdlzOxW8Qu0VsqrSd2rqqRLGHogrK /XHg== 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 z2-20020a056402274200b00533fa979f75si2071236edd.81.2023.11.04.02.22.30; Sat, 04 Nov 2023 02:22:31 -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 3DBE768CE56; Sat, 4 Nov 2023 11:21:59 +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 D4B6968CE3D for ; Sat, 4 Nov 2023 11:21:49 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id ED771FE1 for ; Sat, 4 Nov 2023 10:21:48 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id o55UTdZ8DDRz for ; Sat, 4 Nov 2023 10:21:48 +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 6BFA4FD5 for ; Sat, 4 Nov 2023 10:21:47 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 1884C3A05FF for ; Sat, 4 Nov 2023 10:21:40 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Nov 2023 08:56:10 +0100 Message-ID: <20231104092125.10213-2-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231104092125.10213-1-anton@khirnov.net> References: <20231104092125.10213-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/24] lavf/mux: do not apply max_interleave_delta to subtitles 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: urhwEw+h4JaB It is common for subtitle streams to have large gaps between packets. When the caller is interleaving packets from multiple files, it can easily happen that two successive subtitle packets trigger this limit, even though no excessive buffering is happening. --- libavformat/mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index c7877c5d98..de10d2c008 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -995,7 +995,7 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *pkt, const PacketListEntry *const last = sti->last_in_packet_buffer; int64_t last_dts; - if (!last) + if (!last || st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) continue; last_dts = av_rescale_q(last->pkt.dts,