From patchwork Thu Apr 19 20:35:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 8511 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1101439jad; Thu, 19 Apr 2018 13:41:08 -0700 (PDT) X-Google-Smtp-Source: AIpwx48OeZNsLYhSh21F70x4EkpjNz9grfwuh7CEVssNiYHEfnuDWZxHkEptwdVWK2xDbZKWAZs2 X-Received: by 10.28.54.139 with SMTP id y11mr163784wmh.152.1524170468605; Thu, 19 Apr 2018 13:41:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524170468; cv=none; d=google.com; s=arc-20160816; b=r18YROzCgC2msKgEiE+E3njdyL9q4vcGZ5RZ4niiiPRgjwby+RhOSd+eE4T2J32DsH ylKml/iSSnmeZNWV4M/4aRnQdY8qhMKQQiqWvOnfWdu8a44eeWPRnEABJp0JTbg+0Fkk bdl29UeBOu18OlW3uxwQxsiCX+cS1B+R6nu+Er0eRMjIs6csa/Ow56xylRazuNhRDwfj BO6DCc6wtjKlVt0L7rQutUU57HQML8GJAX2ZSe1cTdHy6yp2323Cj33Fgt/YuVQKik4y IHKk6WQtvAEY6+kSjsO02OMtdxoQ9wFmxy+1H/RF/dq9y5eYGanCImERDwcF4kdpbfPX oCZQ== 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=hb79pIZLmIn3Hx0QVHTtsEkS39nUTVllT3R9hEJItgY=; b=k1cVtLLXBHZsNO3HujYkCh8vaCNlFKrXyEk1rp9y9lhS/lHLJTnkvDmQifEAQGJf+D Dw3FclGHZTVvHEYUw+rrkZNMJKNuSP8SUKUmBL5NA7vKfQo0rKc7qLukCrWke9YuGlXi 0X8Gj6pJ2aprCjSfMqSo1+wwXSlzEnsITDBcpft9afd3p5cwKEaOhyq0S1MOnfA8N9BB Pvdq7HXzbU3NA2XvFNPnq02FZc4zqOhGoeoAH0eee2axFSdA5u+JMzLGGdb3Ny9mBb+B LM0FhzKHTj/qt7pdF0MUAcwB0jijbEfo1AG4IXvhfZuJEYGY0guaN4SZNZRLUMEY9bIL d2zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=AitDoGFI; 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 n184si360wma.65.2018.04.19.13.41.07; Thu, 19 Apr 2018 13:41:08 -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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=AitDoGFI; 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 9B9FB689E5E; Thu, 19 Apr 2018 23:40:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D0F3689A66 for ; Thu, 19 Apr 2018 23:40:31 +0300 (EEST) Received: by mail-pl0-f68.google.com with SMTP id f7-v6so3933308plr.4 for ; Thu, 19 Apr 2018 13:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=9j+iVt9pIp/ou2a5OLtKzAH9Uui7khKQbOOHqpFAsjo=; b=AitDoGFI9B7p8+jqgDojwdZBLVPlC89OeWtNCus/XZnciVnFmOiSkR8Wa4M+GV09Qc rcjiOhacXemvAc1BW7Eue59CZTP91EkRZ80DWpb6Vo2BR4Ix5+QXNvtjE8JPT4zBbfV+ 4PYtdASkfXZ2z/LfuD6AItvY0yidjYJXRqre3DttICWsGIA6AEW4BI7MB0LLQjA7BRpj KuCdXQJJfFj6soZNJxuUIjhjq2H7hBQBrj8h6/+GwTRtIO4qMfJcAJHkkgEMHag28i2k MwIXMT5oIDGKNsVGoQfRgMcXHg4/E5RdQ0vZCcG5pVvDWzpHa6vVFE2zZIfLD20QQPFC 5Pwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=9j+iVt9pIp/ou2a5OLtKzAH9Uui7khKQbOOHqpFAsjo=; b=hDz+Zn9Qmsa1ADA5H9XgiMSm7B9u/OWF8tipt/EzON8J3IK4uVzs44wTLLVSAd/4iW Crnrh/yBAwrAWFk1kdMaWpDiUKRVYxFiwFdf0ruomUqQbXGfTuxPsF6p1cpia+EuBsa3 IhuptGpfxWRNQZSKoVii74Sw3lvo62ZUhMqT4jKXMhJK5Ln3s1Bj0T2R97A6h4g9wg+G 3AR2hwbwPP3EPap0NTANj+zMnCxxAtP0eRY4uhhgt89DaY1Gb4G3/+8goD2IgQB6EiLp 1J/ylgnxfdIN53DRfgEQY8D15m2jfN7hhCqPznKTmlikbmKwslzM33eQcXuymHFNfUUN bvCQ== X-Gm-Message-State: ALQs6tBIh8xamQ5BET2kkuczq8fpV1MfKxe9LhXGqdVLsR2x47bFCgHW 1c6ibdOJ9wUtkZ/vvmdM9DupkxBw X-Received: by 2002:a17:902:784c:: with SMTP id e12-v6mr7482377pln.60.1524170125966; Thu, 19 Apr 2018 13:35:25 -0700 (PDT) Received: from localhost.localdomain (c-69-181-54-242.hsd1.ca.comcast.net. [69.181.54.242]) by smtp.gmail.com with ESMTPSA id x3sm9813678pff.87.2018.04.19.13.35.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Apr 2018 13:35:25 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Apr 2018 13:35:20 -0700 Message-Id: <20180419203520.46581-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] avformat/utils: ignore outlier durations on subtitle/data streams as well 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: michael@niedermayer.cc, Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Similar to 4c9c4fe8b21, but for durations. This fixes #7151, where the report duration and bitrate on a mpegts stream is wildly off due to the dvb_teletext stream's timings. --- libavformat/utils.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index f2f2cc4239..c685d260f7 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2618,9 +2618,8 @@ static int has_duration(AVFormatContext *ic) static void update_stream_timings(AVFormatContext *ic) { int64_t start_time, start_time1, start_time_text, end_time, end_time1, end_time_text; - int64_t duration, duration1, filesize; + int64_t duration, duration1, duration_text, filesize; int i; - AVStream *st; AVProgram *p; start_time = INT64_MAX; @@ -2628,22 +2627,25 @@ static void update_stream_timings(AVFormatContext *ic) end_time = INT64_MIN; end_time_text = INT64_MIN; duration = INT64_MIN; + duration_text = INT64_MIN; + for (i = 0; i < ic->nb_streams; i++) { - st = ic->streams[i]; + AVStream *st = ic->streams[i]; + int is_text = st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE || + st->codecpar->codec_type == AVMEDIA_TYPE_DATA; if (st->start_time != AV_NOPTS_VALUE && st->time_base.den) { start_time1 = av_rescale_q(st->start_time, st->time_base, AV_TIME_BASE_Q); - if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE || st->codecpar->codec_type == AVMEDIA_TYPE_DATA) { - if (start_time1 < start_time_text) - start_time_text = start_time1; - } else + if (is_text) + start_time_text = FFMIN(start_time_text, start_time1); + else start_time = FFMIN(start_time, start_time1); end_time1 = av_rescale_q_rnd(st->duration, st->time_base, AV_TIME_BASE_Q, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); if (end_time1 != AV_NOPTS_VALUE && (end_time1 > 0 ? start_time1 <= INT64_MAX - end_time1 : start_time1 >= INT64_MIN - end_time1)) { end_time1 += start_time1; - if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE || st->codecpar->codec_type == AVMEDIA_TYPE_DATA) + if (is_text) end_time_text = FFMAX(end_time_text, end_time1); else end_time = FFMAX(end_time, end_time1); @@ -2658,7 +2660,10 @@ static void update_stream_timings(AVFormatContext *ic) if (st->duration != AV_NOPTS_VALUE) { duration1 = av_rescale_q(st->duration, st->time_base, AV_TIME_BASE_Q); - duration = FFMAX(duration, duration1); + if (is_text) + duration_text = FFMAX(duration_text, duration1); + else + duration = FFMAX(duration, duration1); } } if (start_time == INT64_MAX || (start_time > start_time_text && start_time - start_time_text < AV_TIME_BASE)) @@ -2666,11 +2671,15 @@ static void update_stream_timings(AVFormatContext *ic) else if (start_time > start_time_text) av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream starttime %f\n", start_time_text / (float)AV_TIME_BASE); - if (end_time == INT64_MIN || (end_time < end_time_text && end_time_text - (uint64_t)end_time < AV_TIME_BASE)) { + if (end_time == INT64_MIN || (end_time < end_time_text && end_time_text - (uint64_t)end_time < AV_TIME_BASE)) end_time = end_time_text; - } else if (end_time < end_time_text) { + else if (end_time < end_time_text) av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream endtime %f\n", end_time_text / (float)AV_TIME_BASE); - } + + if (duration == INT64_MIN || (duration < duration_text && duration_text - duration < AV_TIME_BASE)) + duration = duration_text; + else if (duration < duration_text) + av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream duration %f\n", duration_text / (float)AV_TIME_BASE); if (start_time != INT64_MAX) { ic->start_time = start_time;