From patchwork Sun Apr 26 09:49:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19257 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1A2C1448740 for ; Sun, 26 Apr 2020 12:57:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F2F6468C5F2; Sun, 26 Apr 2020 12:57:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f68.google.com (mail-ot1-f68.google.com [209.85.210.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF83768C5BA for ; Sun, 26 Apr 2020 12:57:10 +0300 (EEST) Received: by mail-ot1-f68.google.com with SMTP id b13so20898059oti.3 for ; Sun, 26 Apr 2020 02:57:10 -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:in-reply-to:references; bh=zzhGPYLDTA6FwV55Xc7y79+5X+WmxNxoYXT7pTTGYiQ=; b=cSa2ThvmuPam/EaZpp0S5qqC0d/H7H0uCBJzFjakgi0r7E16Ir7kOo3coX0+1ySpvF c1eSTcD0bdDoLYeS6pf9YjE227ojTyEdRBw2JEWWpb+RIvhVQS0GxFQvhli0oUo44+ew 2kH7vESVAB2OYN+pONvjjvqTZOmQxfatsPKlOUR8gCbxLla+FFnx5JX5X1N9u22LdgEh xtpzOMb67AuL6P4hyVlB/tX2eoy5e8mqW03wxnKRMkoQXjLgIe7ns3r3TeagopNWPQe5 3hmW2DuSOgfxlQk9ZZZ4hinwHKc6gLa09nylPxpwAO9Vh+vYhznBps7v4rEJB2S8L3ra VUOA== 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; bh=zzhGPYLDTA6FwV55Xc7y79+5X+WmxNxoYXT7pTTGYiQ=; b=n2VUmeGJONSztv7wvyfyAwlL2kZxJFZGCzieu6lr4qz8A+3JeegFPU1KXI7RISsIUL PEP2fCFT+TvYPNcxfP5GSom/zj6Abymnge9gBVD1PvU8Ew81EZt4LXh8aCDV9HER/iCN YLls/UZpsU+8A3HbG+Ou+qJO5aaV3j5GuEIEQJm1ly9Kd+5QOa1GprebONMyJd7jCqoE EVeWKTDkOEGnv6QUOybQK+md3LZ2LD3W7QavIbR07vrYwckS2udXEmyI9037ej2sOdE/ +Unao33GfSHwp1kYGcsUCoytpjRHgAhNj161A9r3FMLZrgM4lrOw+ZU3cgqHtjOgYdJ2 885w== X-Gm-Message-State: AGi0Puas8BSNlmG1YWN8vZ/n3IhqleoJS6nCCEa8Mrr/3IpSIdc3tgsh WmjZ/1tW0Q9SOfn4v1DF3rshBxH/ X-Google-Smtp-Source: APiQypLoH67iq1ZgGUEBrGcr2KnMdrNgqI4udiKKLYEHnFabJS0+jYlzcMiXCfSW8bN4gfTcsGRHIA== X-Received: by 2002:a17:90a:4e81:: with SMTP id o1mr16648971pjh.161.1587894573818; Sun, 26 Apr 2020 02:49:33 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 139sm5663268pfc.170.2020.04.26.02.49.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Apr 2020 02:49:33 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Apr 2020 17:49:18 +0800 Message-Id: <1587894562-30207-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1587894562-30207-1-git-send-email-lance.lmwang@gmail.com> References: <1587894562-30207-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/6] avformat/dashenc: cosmetics 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/dashenc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index b082536..5fbe4dd 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -2149,22 +2149,22 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt) av_compare_ts(elapsed_duration, st->time_base, seg_end_duration, AV_TIME_BASE_Q) >= 0) { if (!c->has_video || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { - c->last_duration = av_rescale_q(pkt->pts - os->start_pts, - st->time_base, - AV_TIME_BASE_Q); - c->total_duration = av_rescale_q(pkt->pts - os->first_pts, - st->time_base, - AV_TIME_BASE_Q); - - if ((!c->use_timeline || !c->use_template) && os->last_duration) { - if (c->last_duration < os->last_duration*9/10 || - c->last_duration > os->last_duration*11/10) { - av_log(s, AV_LOG_WARNING, - "Segment durations differ too much, enable use_timeline " - "and use_template, or keep a stricter keyframe interval\n"); + c->last_duration = av_rescale_q(pkt->pts - os->start_pts, + st->time_base, + AV_TIME_BASE_Q); + c->total_duration = av_rescale_q(pkt->pts - os->first_pts, + st->time_base, + AV_TIME_BASE_Q); + + if ((!c->use_timeline || !c->use_template) && os->last_duration) { + if (c->last_duration < os->last_duration*9/10 || + c->last_duration > os->last_duration*11/10) { + av_log(s, AV_LOG_WARNING, + "Segment durations differ too much, enable use_timeline " + "and use_template, or keep a stricter keyframe interval\n"); + } } } - } if (c->write_prft && os->producer_reference_time.wallclock && !os->producer_reference_time_str[0]) format_date(os->producer_reference_time_str,