From patchwork Sat Jun 12 09:30:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zheng qian X-Patchwork-Id: 28246 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp1174218iol; Sat, 12 Jun 2021 02:31:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBgjzVGjoxKT11JLKDO6cOgd2NoPl29SITFRRIEruFgVWTpXIog1gFNHVdC3lCD1q32lRI X-Received: by 2002:a17:906:988a:: with SMTP id zc10mr7028441ejb.62.1623490308313; Sat, 12 Jun 2021 02:31:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623490308; cv=none; d=google.com; s=arc-20160816; b=Y4hkigUZ5paSjMj+ZZFcTsr5T0fkjKJXkQQxGTnNFkQudiq4UON8KayQLM7jE85OP9 cNlsqSY6UV7oID5mMsfSxXXA+kiM5C2X6TeqFIpQIAVYJfvKGr40kIjw2kxAQyPLI9U/ EMsxZwWy6+zzArJ6azYNSssl9iFmYGcQgSXuD2MN+fep4ztWGLENSJrRLOuTYjHQv0zr dnFMYMPn3cWZyywiDCgFjvEGCI8+LynOOGLRq/n6b3rzS6Ve8ztbxfT00elwpvaSn3WX C/avWRt3EOQ6c5S4ERaGiF6x14yQABwiAZJFrxkuuwnP4DRwUpP7oi0g355byZYJwQDA esZw== 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=k7EHtyiXVciuGxtzc9xqjgTcWiq3EmI0Cv2cJi25vdg=; b=r5o0Dym45gQivFHAoeDvGMWdptK8QdpLjt1D8D1YWLhscc0ZLWVtPXF+cESiHnoS4H lFnStoI5CKSgzKSJ1EZXhc/ruG5Wuv6Dl/x2rsPnbyPnufsSqraQ2tTmYKK6ox50Hqhg XOoCnLQ0eg08GpN5cYgeSunKb3iesuY1JdA39xvrvJHWoCNQNU0mF08H91YiFIkTtypH xG26I1SYNZQMUFwognFTXHNMsiIgP7H+V4r4Ng8K1hagRC1LgaW0ikmoiTiFmbDfZ1vk qABaTwSdzGKLi3jTX1fpN6cPIHQLIutBzmqqMuVwAtDmmHUEgi3FJT5RkCKbRXB6rtZJ yYLw== 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=lHf82+Ca; 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 r2si6799549edp.606.2021.06.12.02.31.47; Sat, 12 Jun 2021 02:31:48 -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=lHf82+Ca; 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 8898A689905; Sat, 12 Jun 2021 12:31:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38404688133 for ; Sat, 12 Jun 2021 12:31:37 +0300 (EEST) Received: by mail-pl1-f172.google.com with SMTP id h1so4051804plt.1 for ; Sat, 12 Jun 2021 02:31:37 -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=3T1rwOMItf3bAf9ts2P/rBCt/QGUXMSVQmaLVdg5DGc=; b=lHf82+CaV1RMB3Hwju2+jQjKQ+Me/HEbt6wRwBG9XecO2Bg8fsXY5R2N5rxjWzecgJ An2fXKez39/OdR/SP9UCD691cwE+Lt/GiLH+VvTJ2oN2SGaGsysfWb/wtj2mrAQyYFxo 5M9+wM8ltQZtY3LjgtK/vJrMLiqpp4ZB2FqTyjD6v5xifjxisQgPZcjTZTv0t4X2xKvQ IdRLGfLMBAr3MnU2+lYXFwEqO89PXbVgLPhLquJ2sYJwhkDIxUSg5BwsMSsVg0dSxLKA 2zLYg4A1G6EMNO7bpgJksy+Zvgh3PIqkIbe1QbUeVs+lICB5osE4DCSfdjUETk/B1Wjl RqiQ== 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=3T1rwOMItf3bAf9ts2P/rBCt/QGUXMSVQmaLVdg5DGc=; b=XMmlI1uFXMwEATRmy8RQTjSCkodffi6aXFX6eJIPKo0m3qySqwgvOlKaBiz+DQ8qBP jPO22gspCZB/oEGRUe7JszcuWO0738mWW8dRQgmmc475qLEpPKeOi5MLPjzZ2k71gn8r P8FzV9t3iRQtfWMt35lJjHS+jVjek9/ckGda3gmKbFwCzRwYXcut667aTRts1ThHljFC PWlLoDMbqkhc6TaeRHpCXnUyurL9e9V6xzkf3mig7OEKNCJraltRmbJgX2MkfEar2r2M R0rK8QvgSN/wLPFxFiZ0pQEwf9OZFVVS7+yphHXBslcGis74K7VvZbHm1A64FYs08J4n rWqQ== X-Gm-Message-State: AOAM5311Mx88ATsOBuoArJI7csXC1RV1f3JNFpbJtez3f7+/GKqDnuXD OZCvftn+bKY1boQwPyQsTrvhGo97df0fuA== X-Received: by 2002:a17:90a:ad85:: with SMTP id s5mr8906763pjq.230.1623490295032; Sat, 12 Jun 2021 02:31:35 -0700 (PDT) Received: from zhengqian-xps.lan (ngn-nat1.v4.open.ad.jp. [202.222.12.138]) by smtp.gmail.com with ESMTPSA id z3sm487719pfb.127.2021.06.12.02.31.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jun 2021 02:31:34 -0700 (PDT) From: zheng qian To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Jun 2021 18:30:31 +0900 Message-Id: <20210612093032.64034-4-xqq@xqq.im> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210612093032.64034-1-xqq@xqq.im> References: <20210612093032.64034-1-xqq@xqq.im> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] fftools/ffmpeg: Ignore PTS checking for arib_superimpose 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: qvWvsuFnTBSR arib_superimpose codec doesn't has PTS (AV_NOPTS_VALUE) 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 e97d879cb3..d60ab49533 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->codecpar->codec_id != AV_CODEC_ID_ARIB_SUPERIMPOSE) { 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;