From patchwork Thu Jun 21 12:27:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 9461 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1953732jad; Thu, 21 Jun 2018 05:27:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJE8s46QGiY/8gD3it0gaNkbnfCrdzgT4etXbSzIimftb3qYAMFDZo2ahl904tSCJQWtaIr X-Received: by 2002:adf:979c:: with SMTP id s28-v6mr22978859wrb.28.1529584061517; Thu, 21 Jun 2018 05:27:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529584061; cv=none; d=google.com; s=arc-20160816; b=bET6tkAmg1NlICxuDARTh6fs8JP7wqMJicFkHof9n+d7dVl2dA+3bj4p0pG6HJIiIM zEfX/3uLFCXIs5BKsJd3bVcKo2e5RITVmqHbKNxTyDhLB7xknZKohmpQH9ENT4NNBKis 955edEI/wUV+ClymqyF5XfL4oAurOD/JXqWYmLcxM+LAQrKPwySnlf+Mr1AhTEjPXR9q OKq5MwbLQ/tqlhS8okRhekl6jj00onhwEPsjAHL+aewgyknbKB4OLO/X2UU50q3cRZFC 4lczpLiywSHFGhSpu1zKCK9TZIVDTCWpVV0+d+XH3KmdXnEJvS4wmKcXjHPmcwBKj9kG Qn9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:references:in-reply-to:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=s6J/0ltKg4Twez70aLcJLMyIG4NkBhEXbTcC+Au+byI=; b=cwB8RDtcU++5QzAh89rL6CBjWJe/sxmSYoyGBwXlLQyN77RkhD7FPVvGDwO7y/rt5O 47koG7cOYc9kKazXTWlEWq3U4mpUEsODMx92WuF9xqZZJa4MT/u8/2xSTd/NCq0h1Hp+ XdvMHetiKFpAe0i6Uvvz17WoEBTOfWtXtEitehp2oysgMsPKasC5xPoZ1bWCgleBuZYY Ii23mXT7dmslyI3u6XrbDpTBWvzSmOfgX+NvPHFfEg1cFFpagqE+P6Kj2TWGJdOrxzC8 xhIJHiVPfPkPhZwT6xcAON9WXK7HGuu78gVlIpnY2CS9+U6daGc31jmFP4sEm5IAfBhT Q2Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cK91r8tH; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u99-v6si3232853wrb.136.2018.06.21.05.27.40; Thu, 21 Jun 2018 05:27:41 -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=@gmail.com header.s=20161025 header.b=cK91r8tH; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 11E9368A600; Thu, 21 Jun 2018 15:26:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f170.google.com (mail-io0-f170.google.com [209.85.223.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D33A68A4D0 for ; Thu, 21 Jun 2018 15:26:38 +0300 (EEST) Received: by mail-io0-f170.google.com with SMTP id g7-v6so2777041ioh.11 for ; Thu, 21 Jun 2018 05:27:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=6vrCu9uTsi3lwix+NX6oFZo7VoQeIJeQJUa3aFQ/tqU=; b=cK91r8tHOb8lnnvov/8gbIMnX+zkiyEG4QyZJ8I2qgEl+DB5EVYCI2NN65z7se+8Dl hkF4opP0owo1etq5s9lWtnfYfKymF00kJZBCTvGwh+ee+vKXs7iKYI8ZY2uKRO+ZGPTp hUQSl7YXwCOeymdIlDfPNkm/h8O9+IZNPiP7d84c2ZFqMpiFa72htcMuNa84U1vt6msI I88xRClhLWQBaCPyE0QUvyQE4l+YNmjSvlP3tEQZPYsuaiUCIy1uPV07yIB17iaV43UV pDta7KRuk7SjGT+gnMsH6btj1EA8/dL1SfuyhMJgtUhRvNjJ/ow6ZrupzARtu3ATCUMS f8ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=6vrCu9uTsi3lwix+NX6oFZo7VoQeIJeQJUa3aFQ/tqU=; b=doU53MzqN2kpiEMkYPVZF9b1XFyeSOID3HK9o+Sqk8gHENekQTU59ZnLN4W6kfxmRA w+gQlOGKWlLduEyXUfU+/xRE2TxTFwE2qd9Jcq7awZMj+EqQdRUkVGMkwpD4weId+36W jsiEnYMtCjBlZ0wSAKy/Oi32RK8sx+xskVV/fW126NeuBJz6cnRxCPwKnXva01qz6Ydu E+J6v83fsWcRZ0yW+RXlvErsLWSXUQDg869uFZfZTNHJGzEgAyL5AZS4VvKGS7366gvx KESwiX4JRu46zyfgfX4Q9JowXSS/urQrnvl0LG1vUZkBau84dYsvT/D7sATe9yQEOqDn viuA== X-Gm-Message-State: APt69E0z4s2UESiPsb+PgWaYo8BivNwD+lSV/Adi/gNs9wG3mRw3Zqxf O+o44HQ4CRk8tNWhHU+EhaZlsJFlxUhvFmNOLA4= X-Received: by 2002:a6b:520d:: with SMTP id g13-v6mr21581493iob.60.1529584050367; Thu, 21 Jun 2018 05:27:30 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:b09b:0:0:0:0:0 with HTTP; Thu, 21 Jun 2018 05:27:29 -0700 (PDT) In-Reply-To: <20180621115501.GA25479@sunshine.barsnick.net> References: <22848661.ktHMkvvdCD@komascript.de> <20180620205434.GM4859@michaelspb> <3139027.gUWHTmZQCl@komascript.de> <20180621115501.GA25479@sunshine.barsnick.net> From: Carl Eugen Hoyos Date: Thu, 21 Jun 2018 14:27:29 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] ffmpeg patch for nonmonolithic increase dts error in subtitle X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" 2018-06-21 13:55 GMT+02:00, Moritz Barsnick : > On Thu, Jun 21, 2018 at 10:51:33 +0200, Carl Eugen Hoyos wrote: >> Who wrote the patch / where did you find it? > > The ticket he mentioned was #4450, the patch is here: > https://trac.ffmpeg.org/ticket/4450#comment:6 Patch attached (untested). Thank you, Carl Eugen From 6ff1a1c662211548ae3c8c01ddfc2775e03b2497 Mon Sep 17 00:00:00 2001 From: Hans Carlson Date: Thu, 21 Jun 2018 14:24:36 +0200 Subject: [PATCH] ffmpeg: Treat subtitles like audio and video for non-monotonic dts. Fixes ticket #4450. Fixes ticket #6248. --- fftools/ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 6dfab64..8d311a9 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -772,7 +772,7 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u - FFMIN3(pkt->pts, pkt->dts, ost->last_mux_dts + 1) - FFMAX3(pkt->pts, pkt->dts, ost->last_mux_dts + 1); } - if ((st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && + 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) { -- 1.7.10.4