From patchwork Mon Jul 3 12:02:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 4200 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp9307383vsb; Mon, 3 Jul 2017 05:02:50 -0700 (PDT) X-Received: by 10.28.203.137 with SMTP id b131mr15503671wmg.50.1499083370240; Mon, 03 Jul 2017 05:02:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499083370; cv=none; d=google.com; s=arc-20160816; b=rkYO11nflWK7UqA33iheCv+32LbBPGGvP51cSqOLt7DOPqv1f85fn9HJH2FtUUemzK KZ5ZD+xfS+5hh2e/fGcEsvf+SnXXMnSCiuWR7lee7ThnAoYb5t4SaSf1StQ/Nn0PNqN2 fqTCsYqHSDoaS1E86IFr1nNiPeyvgDA2KWIS8np01oXvH59EuokIo/rx2dLFma4ne+9F hFNV/nANRx8iri3Q5wacvdRudXvuQPhzSOIJRFYbW8mg2JB5VAiISTJepe0ryU0NG4xI BfOzLeejDLs2hvk2IUkdRLGLtKBoJssTdvZRxMl6ZCZGH0Xh215+8txPU9wM3K0yMt6V ESyQ== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=86uRlD+URIHSuU2tylO+ZwFdddkLQ2pkpSPeyDrjw3A=; b=PxsxcjJ/ZieUAQ2cvucOhtNn7ccyfukuPr4rHB+2gKVQVsOenU6baAALTFoqLOyIXk tR+VLtk6aaXDCjviE6ed2yW6gz+9XguaOzONEGK6UN9+h7vVBtygozBbIlT84EXIewqD xblrVclnoGfPgoekedf5/nO0D4kEcS1Fy1n2XrgYbrt/amJIkD+Rjn6T07kF4E4R2RuO Cu4UWHsmWTta6b9RHLkUloOK7N63gfRFvNvj5MUmsLMwmaWYPWCz6shH1t0xGh3GwVPg cU/pJ09LIKOx6I+Gi9DKtdTrTIZ4kEm/ODUejbsuUSfickJUlJSiaXnh//xS0mE2LC55 cb8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=ZCdxqUfc; 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=NONE 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 t187si17312223wmf.184.2017.07.03.05.02.49; Mon, 03 Jul 2017 05:02:50 -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.b=ZCdxqUfc; 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=NONE 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 7D6776882C5; Mon, 3 Jul 2017 15:02:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f171.google.com (mail-pf0-f171.google.com [209.85.192.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6577D68066B for ; Mon, 3 Jul 2017 15:02:40 +0300 (EEST) Received: by mail-pf0-f171.google.com with SMTP id s66so99294423pfs.1 for ; Mon, 03 Jul 2017 05:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=fq8Pe+hgxFH7ik27paqxHGkUoKtyY69OySmA1zeK4ss=; b=ZCdxqUfclNXNJTK3ips/r+jQSp6bzk23ufPouO5j/ifUvYvv4UEytKyYPOBUitfrlq 0ggugvaX+WqvomKaq5ctZWDQ9jHctc7T5LZR7Wi2gXXCJQMBdAOZ3JjuaS05lyxrgHTx 8NNhnsX1CknF2xE9dBpUPcvrm/hpGYsaSFAaDtkIz8LS9ijptmseJxp5ZAj01lj2B7OI uHMmXfK9Zr1A7IiNq33xbrznsvep3QcQnUbNv+bKfuRjVC0j1C2bmo7TZcvhWHut8fxJ XKXVcvb65ACjtdRFI3mQZJ5h3Dl0s2YKBvY4V9yosF259lIm//b2tZXxn4MwoIxcCvBT Xx6g== 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; bh=fq8Pe+hgxFH7ik27paqxHGkUoKtyY69OySmA1zeK4ss=; b=QwN23jqOIDQAQCoPqPVTWdByFLRtzv2iLxwBsph3xowd4S9kx9bUSgk+LZ00fDBJo8 91zqNCVdhzaVKzKvofiiT1qXKQDH3jT8D11uiwf2hxy9W6vu8onyn3gIAmQ0Pp3DdDdC OeJImRvNxeum3x7GRdlQ6+0U3OdMbEXL5jCA1pBVu7Ldx8h6+eh69gVeqeGgRXrLwTqu jWlQasTnLXVNj5cFJnlrFAxQzAPXz8lcVSuieW2I90evJcI7pF5R01chY3TzDhM+2Ora edIU7+8IZ65tagyWROuE5lgHpoLWWRWcUtfmD77oAzQUIRH4AI5k+ZOGY1r90AimxHys kBXQ== X-Gm-Message-State: AIVw11121OeRYXMd2ol4YDf/aIFuB9OSDUhg5N+nDt4jXowqPPSLqinI R9WCilg7WFS21nom X-Received: by 10.98.42.207 with SMTP id q198mr9823814pfq.143.1499083360075; Mon, 03 Jul 2017 05:02:40 -0700 (PDT) Received: from katana.guest.lcl (LPuteaux-656-1-74-135.w80-12.abo.wanadoo.fr. [80.12.80.135]) by smtp.gmail.com with ESMTPSA id h123sm27924601pgc.36.2017.07.03.05.02.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jul 2017 05:02:39 -0700 (PDT) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Jul 2017 14:02:24 +0200 Message-Id: <20170703120224.25003-1-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.13.2 Subject: [FFmpeg-devel] [PATCH] lavf/utils: update stream duration only if it is not set or 0 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 Cc: Matthieu Bouron MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- The following patch makes lavf/utils only update stream duration only if it is not set or 0 in fill_all_stream_timings (which is called by avformat_find_stream_info). In the context of mov demuxing, the patch makes the last packet duration the same as the one declared in the stts table for example (ie: we trust what the demuxer reports). The patch passes fate, however it might not be valid but I would like to understand what is the purpose / use-case of the update_stream_timing / fill_all_stream_timings functions which are not too well documented. Thanks. --- libavformat/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 38d247c6cd..00adf026e6 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2654,7 +2654,8 @@ static void fill_all_stream_timings(AVFormatContext *ic) if (ic->start_time != AV_NOPTS_VALUE) st->start_time = av_rescale_q(ic->start_time, AV_TIME_BASE_Q, st->time_base); - if (ic->duration != AV_NOPTS_VALUE) + if (ic->duration != AV_NOPTS_VALUE && + (st->duration == 0 || st->duration == AV_NOPTS_VALUE)) st->duration = av_rescale_q(ic->duration, AV_TIME_BASE_Q, st->time_base); }