From patchwork Fri Jul 17 08:21:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongwon Kim X-Patchwork-Id: 21139 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 78F904490F6 for ; Fri, 17 Jul 2020 11:22:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 518AE68B549; Fri, 17 Jul 2020 11:22:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3AED968AEB0 for ; Fri, 17 Jul 2020 11:21:57 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id s26so5047328pfm.4 for ; Fri, 17 Jul 2020 01:21: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:mime-version :content-transfer-encoding; bh=vSQ7ECw0TWERqaTOkm70kLNoXuvUKoLjQvWQbDxiwOs=; b=pruJXPDOSyidOYeWCNjdgyLWhec/yXKnL9hXoNyRYpvN7Ir3t6O8UZfpDKMtQTO1mh ASTRZ5KOGxEgm0GrlcIzXFUJIFq8huwkrBr7ZdzwSm1JAzKUbbKE7B65I3tbtrXeBcaV Adi5wQ4risdb9aYE4g0IxeDsiaXCRom0R3x0FVHoq1v8AWpcUBu2d0G8NcyQeth+BKNG iRwYGgn5aQBbBp9oxPTKQoL1UfKX1J4/qeNychu4A9BDNhdxg1TlQxOkhPkZsfLs8Djr 1R3aqb9qt6BaM1zDCTulZUDfq6d9b2I0uMqUGZrjAmFluvQALC0sgZuHNV99lUoLhZ8T +abw== 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:mime-version :content-transfer-encoding; bh=vSQ7ECw0TWERqaTOkm70kLNoXuvUKoLjQvWQbDxiwOs=; b=kVYS66J3Krl5V70AYtTV5aZOqSjAMj3KRgt30DbDYCAXGpmn4LtN0VPeTRJqDlKcdL pyb+TjBHr3QoPJ9nMF8EMFuXsm1eiC9RVGOLXXKyOaiNkfH6Tn7YM5Y9l1/2KRnqzaYO 7wK2DLclg8FlCtOW2y2bikdZ3qx7d5VASRY/8hGlUAn+bgxkrzjOZ1gfkpCxGln+tYKD NHLT8//w47hFTYzspJCeLxd7MwPH065c9YECpUaD+sQewk9kWZKyFnTGib+oWucAaa4M wy4b6wxfRCpKNQxskKieUK0OYpAqPvYujUqx3ovXAmxP5tkVemANV3yb5irEGs61qrH5 QRLg== X-Gm-Message-State: AOAM5302SYTtF1oUXp7ikXFwp40xYzNroDECjI/Ehl/+q35QQ/iy5L2p Y1Sn6qGOwrqju/VFc9ZXFWl6+FkoBWfd X-Google-Smtp-Source: ABdhPJw1J3+cvcuFuVsKV5vJ5fCn0kev/2nx5mky9yT0jw56XmSGb+FchENMgm+Bh8/LIGZzh6i9Yw== X-Received: by 2002:a65:6411:: with SMTP id a17mr7799606pgv.450.1594974114986; Fri, 17 Jul 2020 01:21:54 -0700 (PDT) Received: from localhost.localdomain ([211.179.16.75]) by smtp.googlemail.com with ESMTPSA id nh14sm1976602pjb.4.2020.07.17.01.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 01:21:54 -0700 (PDT) From: Dongwon Kim To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Jul 2020 17:21:42 +0900 Message-Id: <20200717082142.678533-1-dongwon00.kim@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/utils fix calculating wrong bitrate on HLS, DASH stream 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: Dongwon Kim , Dongwon Kim Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Dongwon Kim Signed-off-by: Dongwon Kim --- libavformat/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 807d9f10cb..e90467e2e0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2715,7 +2715,8 @@ static void update_stream_timings(AVFormatContext *ic) if (duration != INT64_MIN && duration > 0 && ic->duration == AV_NOPTS_VALUE) { ic->duration = duration; } - if (ic->pb && (filesize = avio_size(ic->pb)) > 0 && ic->duration > 0) { + if (ic->pb && (filesize = avio_size(ic->pb)) > 0 && ic->duration > 0 + && strcmp(ic->iformat->name, "hls") && strcmp(ic->iformat->name, "dash")) { /* compute the bitrate */ double bitrate = (double) filesize * 8.0 * AV_TIME_BASE / (double) ic->duration;