From patchwork Sat Jul 17 02:38:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zheng qian X-Patchwork-Id: 28952 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp2360906ios; Fri, 16 Jul 2021 20:02:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxshVeUU2kmVGT8rr7JLe1uWnSRXg8lUmA1LDnDUNB7UoykVkkfPYR7wSLlMXmDR3BarN/ X-Received: by 2002:a17:906:63ca:: with SMTP id u10mr5656533ejk.411.1626490962093; Fri, 16 Jul 2021 20:02:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626490962; cv=none; d=google.com; s=arc-20160816; b=pyckzaUWv/GxjZYMIAf/lg30T5E5x2P0nrtmV/HI8wyNnsEg6A7MlOjiYk8qEUKLBC KPiw2pz9QkyTJjSadHEgSVu063cyfN+wFarI8r57zw6iQR1oMu34fWLY3M6p0EPQcpe1 LHeTE0UIo6Dxh5xw2gaDYb8xxgL4dNvB3agxRc4T8EJa0t4hPwie3qikFGTT2SWFeJn2 8Tiu/W9pJCl0/UhiaVXPEqoXB3AGSJgQiF1Pd/y+MjW0gFqLAHh7N4gURiSzRKnBz7qx kBiO6NuYH/Ciea0eeZsVhNVLyKjAfXYWMm/KeNl4tGfOL25cRnE4sJaqsg3kmtqYy2Nk 5+4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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:dkim-signature:delivered-to; bh=99IYxwHRGiPtFX9/92L4nda8qjObryip+47kFhteuKs=; b=kf7g7+PJMMWsPkIIFP54F3gxzRIMS3ud97On/4IpeXL2POYs8efyIsckUt5EaKn2xY cVEvixJojp7gmYVYFxVXK3hlomiDO/oQZVQSbevBugaWr7oRq+IoEFDUhQotRzO3Co6l w97LB70TtxICvMkm/E9Ty79RTF2pG0TrvryLX5c31wNKG4OfzHrG35a2xCgi6LGnoScr uyUpA0cW4Q8Vja/LjenS4uCp7DZ4MgdoYBH0k+Y/gm72Ua8of1HkK0CFBWxjwaQXTpPK PklHsWSp4wApO3lmxMlMxC9kNTBNYGzZWPTA7vSdWSR5hc1PLqgrZ/SOkTqvLWWI+Mng 47IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=y1gpLp31; 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 w5si12650596edc.581.2021.07.16.20.02.41; Fri, 16 Jul 2021 20:02:42 -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; dkim=neutral (body hash did not verify) header.i=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=y1gpLp31; 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 0D9F368A834; Sat, 17 Jul 2021 06:02:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1FCF68A544 for ; Sat, 17 Jul 2021 06:02:31 +0300 (EEST) Received: by mail-oi1-f176.google.com with SMTP id u15so13339585oiw.3 for ; Fri, 16 Jul 2021 20:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xqq-im.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XE/qCrtSq0DUzLo3/MNQ7aCAz3ZxwRmMFpkU7/YPGUU=; b=y1gpLp31EKuUNev/P/gkeVKwaifQVfC08T189u1tCzDwPE1DdhQLFYxf7re1fLWewS xIriIxzgzrqzKwVKAWxuSI3PysIgMzepPvA36TN6VwO5etHE9ib4Om59XrPPmQJpz/yM iKpDm+wVaV0puM2MmDGLnyHlu4fn7lCB+62Z81pEzydyiUWsJqgaM9uQ9E9VpqThHZZO zexu0sdKRhhBjsw1CE19MXh4arpkPYRt9HsV4ud0kAJEVt2jrJJQTlaZ9P+0okPz4WLt B65nkieSZrBLb8sr5WxPfOiYQ6snGij3VdUlcpJ0qhVPhYapYejGa/178l5EN33SWQ1o yftw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XE/qCrtSq0DUzLo3/MNQ7aCAz3ZxwRmMFpkU7/YPGUU=; b=fUKFo6LA1A/amV95NNoO1Cpfl3p90X8HQDCrMsf63QZ64g/oXFKApZGG7SDMMYumqZ SIpOQ4NHRvQUeBcUXVu+twZcjThcvBQAgHpqDQxPXLMGWRxKk1PSRnFwlQ+Kn5e9MUKe rVTXzW4JilWqGdU1C7ZNCuIy5wnePMBa9xE+Rg6QUd/eIbPoftmSfxR1QQeSeRxsmUlo TZY73bqQUN1+PyYCaDTM8+vxYWdEEftNVBagkOgsq5KIk8HJI8PwHc7C2zFcMVl5vImi 7uzWTAteqm0XwUIxelZlfHrcF7kfgOoEq0bClhpS3ktRFo6FDyfO7xl76akt3Cu/54Wx 7Uyw== X-Gm-Message-State: AOAM5339SZYudz9hTtuEHAQGo6QzsdVFHxSh3QV7S6NOmf+I2ZuSo8q1 mANJgomjNpaW8mV81AXuBV5Py1yoPPs1eg== X-Received: by 2002:a17:90a:c89:: with SMTP id v9mr12932293pja.175.1626489539467; Fri, 16 Jul 2021 19:38:59 -0700 (PDT) Received: from zhengqian-xps.lan (ngn-nat1.v4.open.ad.jp. [202.222.12.138]) by smtp.gmail.com with ESMTPSA id q18sm12909263pgj.8.2021.07.16.19.38.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jul 2021 19:38:59 -0700 (PDT) From: zheng qian To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Jul 2021 11:38:29 +0900 Message-Id: <20210717023829.84846-4-xqq@xqq.im> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210717023829.84846-1-xqq@xqq.im> References: <20210717023829.84846-1-xqq@xqq.im> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 4/4] fftools/ffmpeg: Ignore dts checking for AV_DISPOSITION_URGENT 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 Cc: zheng qian Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QtXb/plATEP/ Stream with AV_DISPOSITION_URGENT disposition flag could be NOPTS. Signed-off-by: zheng qian --- fftools/ffmpeg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 1ac2e48600..a3b720748b 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -824,7 +824,8 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u if ((st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO || st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) && pkt->dts != AV_NOPTS_VALUE && !(st->codecpar->codec_id == AV_CODEC_ID_VP9 && ost->stream_copy) && - ost->last_mux_dts != AV_NOPTS_VALUE) { + ost->last_mux_dts != AV_NOPTS_VALUE && + !(st->disposition & AV_DISPOSITION_URGENT)) { int64_t max = ost->last_mux_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT); if (pkt->dts < max) { int loglevel = max - pkt->dts > 2 || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO ? AV_LOG_WARNING : AV_LOG_DEBUG;