From patchwork Thu May 17 00:22:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8993 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp3475770jad; Wed, 16 May 2018 17:24:06 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrfIpCW/RPlM/yO0XQEZTufHEdiXYLrELpkR3Xcsrrum5GPOA1vX090XV6N6vQBT3OIRwQS X-Received: by 2002:a1c:6355:: with SMTP id x82-v6mr245327wmb.14.1526516646548; Wed, 16 May 2018 17:24:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526516646; cv=none; d=google.com; s=arc-20160816; b=DIoxGQtgf/iqv0DoFjHP9yTAoKWwAgUGGQefRpLOG9yGMvuWXKsNuyyRYL+0I294Ci lxJ7SOv5fO6HlPF4nZfBRuMQzJoNjepe3uCS0dTZcEoxb9CzgsNDEgFYTw1exbk863eH lEtMPh5oTxDUcNqIhYVB084HHA0mj7ecJ6sPqP/GTLs19E7QM49wXBlqkw9OIhT1pt3U +5qa/t/GrIgZRxXE7MpG7ScIKa4rkzLXd+eosYpz4/7Oh66YWmjkP7BnpXM59HiKAezv CcbSkl3wM9iNJVPWit8mYW0tnkp6oZzMM1QT78EUIxKxdP45W5FEzEwGeS+ZF42W0BZC kRmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=DEHjaixCbtSBgpCJPx/FS0GM9XEQeytbn6RbAMOYY+Q=; b=pSv2sGcPGwBO6E+Mr+U6Xnjnlsv7Cxzv56E0D65NYLJ9i7b+M6d4IYpyaVIzNFder7 gpLSMw3dA/cNIAHmjUlQTpoboX23T3U/h1eVgPW3k9HH6xcUhIvQG6Gu0BzELfxPyxEN alu/NYVPDfd2aiI+BGZX4/Lan+3zREY4W5lsrmxi8RnadFTW/pZhWOem9XkRmSoCo8LV TUYHO+ajT6ccBgYyKfR/Y65ayFn9eP56n6zFyjocXua91Q/oSuCnigOKfBTNIOEMW4ZA lXPRqM5Wzn28H0+ghtTxZbjZVflm5eExbGjHCnJ0EnqDhk4Z+XXDeA/HGaS7hbo0HNjz yNpg== 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 k12-v6si3312052wrl.87.2018.05.16.17.24.06; Wed, 16 May 2018 17:24:06 -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 CF73068A1FE; Thu, 17 May 2018 03:23:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe08-1.mx.upcmail.net (vie01a-dmta-pe08-1.mx.upcmail.net [84.116.36.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 823E468A056 for ; Thu, 17 May 2018 03:23:19 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fJ6i6-00073v-5R for ffmpeg-devel@ffmpeg.org; Thu, 17 May 2018 02:23:58 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id nCPp1x01G0S5wYM01CPqJd; Thu, 17 May 2018 02:23:51 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 17 May 2018 02:22:19 +0200 Message-Id: <20180517002219.2037-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg: Check AVPacket->duration for being positive not just non zero 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Some demuxers (mov, microdvd at least) set duration negative. Signed-off-by: Michael Niedermayer --- fftools/ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 5a19a09d9a..3aa2175b5d 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2619,7 +2619,7 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo ret = decode_video (ist, repeating ? NULL : &avpkt, &got_output, &duration_pts, !pkt, &decode_failed); if (!repeating || !pkt || got_output) { - if (pkt && pkt->duration) { + if (pkt && pkt->duration > 0) { duration_dts = av_rescale_q(pkt->duration, ist->st->time_base, AV_TIME_BASE_Q); } else if(ist->dec_ctx->framerate.num != 0 && ist->dec_ctx->framerate.den != 0) { int ticks= av_stream_get_parser(ist->st) ? av_stream_get_parser(ist->st)->repeat_pict+1 : ist->dec_ctx->ticks_per_frame; @@ -2715,7 +2715,7 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo AVRational time_base_q = AV_TIME_BASE_Q; int64_t next_dts = av_rescale_q(ist->next_dts, time_base_q, av_inv_q(ist->framerate)); ist->next_dts = av_rescale_q(next_dts + 1, av_inv_q(ist->framerate), time_base_q); - } else if (pkt->duration) { + } else if (pkt->duration > 0) { ist->next_dts += av_rescale_q(pkt->duration, ist->st->time_base, AV_TIME_BASE_Q); } else if(ist->dec_ctx->framerate.num != 0) { int ticks= av_stream_get_parser(ist->st) ? av_stream_get_parser(ist->st)->repeat_pict + 1 : ist->dec_ctx->ticks_per_frame;