From patchwork Sun Apr 26 09:49:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19253 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 C0BCC44844D for ; Sun, 26 Apr 2020 12:55:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 926DA68C5AF; Sun, 26 Apr 2020 12:55:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f65.google.com (mail-ot1-f65.google.com [209.85.210.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2679868C4E2 for ; Sun, 26 Apr 2020 12:54:57 +0300 (EEST) Received: by mail-ot1-f65.google.com with SMTP id j4so20876986otr.11 for ; Sun, 26 Apr 2020 02:54:57 -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=sCfLqWCUOhhhwosyvRSSs58nIOsT9CEvawJS2/CUyUs=; b=TYZwGaqlai/yKgYaVAUyR3aU+kTP6YqsSKxH6sIKBhuV1VLc16JSIF+kSHbt7qJYCQ im8ORxTpZGt0aCC6xON0KAgHKLYIoHQY/K6WxnuSdGAHWV5q4HXT2j5r0SBVcaalvFZ0 WvGHOHWZQ91r57TSKZ7uIChSjdDUjJgZwZ4SVLqVmVgkoiVrMovoOFt482f6U2R9IqDx 5/N8YrxgUAQEBH9QVLA2+l4SblXQlq5HUfmV+dh0RmhNqeC6okpQArVHaDyd2faDodhr 2JNDttKBaDwLo6yjRckoDx5A1b7EKCI7E2u4HzEYkyMYv7tr+N9fJiDcj6jTSlY7m3WC tMhw== 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=sCfLqWCUOhhhwosyvRSSs58nIOsT9CEvawJS2/CUyUs=; b=dhj47ov1A3DprJR2ItKq69TPT9HidQ/6LI9LtQWbnaabc6qiPQJYZU4l9G3Fbrkaxz F8Vt3qNuvXORoAezVcnXMX3ZOo1x7G16rRh7qGDBR28wyOAs1tfq3NMLaTnii+Oi7Kbe R2Bf16DBxdxK1AYhTwJyIuDgpahxQPwf51BYc/cK6/9/eKsihwhi3MUhJchAjbbhkmqh hddLsF7nr4PGyCfdsOhmft/vHPbukUSscQ9jCaPtBXEooldsrKpU6El4Exv8Tem9BGAg DBCwZfDovDR6tZaNISlrrTFdb9PqJP39sxlEQgMa0BJCF3D5M9qkFghXN8c85LrzM0pu n/bw== X-Gm-Message-State: AGi0Puaow+cLGuD4GnYv+fwOprVyTkfKfgzmgT797rYDgrFm2myXX+K8 e0/Mv6diqbL9XWz9HvWkIZbhPQWC X-Google-Smtp-Source: APiQypLOq6r6cIp9jBpOHxSL8dfeSivdZWZN3idxrhZwKSOqBfhdY+XJzKP67BXlxwBwaFg/IPuyow== X-Received: by 2002:a17:90a:2f64:: with SMTP id s91mr17724577pjd.30.1587894575429; Sun, 26 Apr 2020 02:49:35 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 139sm5663268pfc.170.2020.04.26.02.49.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Apr 2020 02:49:34 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Apr 2020 17:49:19 +0800 Message-Id: <1587894562-30207-3-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 3/6] avformat/dashenc: use local variable and avoid calculate duration multiple times 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 | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 5fbe4dd..96c0ea3 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1916,6 +1916,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream) OutputStream *os = &c->streams[i]; AVStream *st = s->streams[i]; int range_length, index_length = 0; + int64_t duration; if (!os->packets_written) continue; @@ -1955,23 +1956,18 @@ static int dash_flush(AVFormatContext *s, int final, int stream) } } - os->last_duration = FFMAX(os->last_duration, av_rescale_q(os->max_pts - os->start_pts, - st->time_base, - AV_TIME_BASE_Q)); + duration = av_rescale_q(os->max_pts - os->start_pts, st->time_base, AV_TIME_BASE_Q); + os->last_duration = FFMAX(os->last_duration, duration); if (!os->muxer_overhead && os->max_pts > os->start_pts) os->muxer_overhead = ((int64_t) (range_length - os->total_pkt_size) * - 8 * AV_TIME_BASE) / - av_rescale_q(os->max_pts - os->start_pts, - st->time_base, AV_TIME_BASE_Q); + 8 * AV_TIME_BASE) / duration; os->total_pkt_size = 0; os->total_pkt_duration = 0; if (!os->bit_rate) { // calculate average bitrate of first segment - int64_t bitrate = (int64_t) range_length * 8 * AV_TIME_BASE / av_rescale_q(os->max_pts - os->start_pts, - st->time_base, - AV_TIME_BASE_Q); + int64_t bitrate = (int64_t) range_length * 8 * AV_TIME_BASE / duration; if (bitrate >= 0) os->bit_rate = bitrate; }