From patchwork Tue Jun 16 12:32:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Przemys=C5=82aw_Sobala?= X-Patchwork-Id: 20424 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 AB73E449574 for ; Tue, 16 Jun 2020 16:04:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7BC6468B48D; Tue, 16 Jun 2020 16:04:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75AC868AF17 for ; Tue, 16 Jun 2020 16:04:48 +0300 (EEST) Received: by mail-ed1-f46.google.com with SMTP id p18so14187093eds.7 for ; Tue, 16 Jun 2020 06:04:48 -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=0mv4fZMT0gCz3rvRX1pmcA5zwiNiLFEjrQkb518qVIE=; b=sXS3mL9EpHIPWUIjbE27gzilk4iafIWFW/HcvF0nVjzYMr9IpLAwcKz+BigirxopU7 mmBq+2Vb0vza7TgdN21kUv1m7kdxgTmeDGZZOI/NHhgZgnLoKmKw6agzZJ6GDAUjmkt2 Ws53O6qIBqDhuAvvAMIJf6k0GePWhEeTsvevX9yB0j5exaC9kB/Yr/BX8o6v83W1pcHN EKRztN5IsirBjaNY0/+OoaSdg24coo1mM6mf/iikfnjXfadgySIhM7L2urMlOAeHAxl5 PRmD3xXTET9ggrhSUo2fHgmHUOlMmUPIlnXCoFllZgDS0blnjcgXyQTru7Gc0psu9mLQ br8g== 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=0mv4fZMT0gCz3rvRX1pmcA5zwiNiLFEjrQkb518qVIE=; b=BDdcXTJvYxvaMRiAIzW2eH/pgXhvpERkV0WK9XRaC7LgVq08EDulMxEGtHShDGQN04 sSfvbaMD1ndZg1ODx0j5yJXZno6vGmmh0c9iPAMLB/Zst7pnyLYwSgGPGOXCtHSdXWMC Q8DZ8l8hjWVEDriiT1SIvfRPWPXVQDPzcSMlHxWPMj2+qc/M+1eyb3BjGTopz9btwhzA hMgxLDy7stVzAZXrhZv+BEt5Q3lE5P5ZiU7hV0aK3Pl3+h4eql3RHXyBp4pjzmjxzyWl fWtFOeR7XeuD2wnyj6nLpKmjWVhHYyh9pf8H//KHGob45KQj2LQ+giKWhv9FXXdndVov Lwmw== X-Gm-Message-State: AOAM530H1OMFaY1RNRb4JV3woSplFIu1PWUAuSYQ4cT5rw5UmN0kRPDL bwDzaW4jlnLODbl/vBFDYHVMTXzz+r0= X-Google-Smtp-Source: ABdhPJxt+935Js8oLY/0zCmmRd2poJyARF3XbEqfGIsiPpiFeOlfh9bm89AD1wSUEDrluYkwzCyhng== X-Received: by 2002:a5d:68c2:: with SMTP id p2mr2830821wrw.253.1592310736315; Tue, 16 Jun 2020 05:32:16 -0700 (PDT) Received: from pszemus-legion.localdomain (83.8.242.137.ipv4.supernova.orange.pl. [83.8.242.137]) by smtp.gmail.com with ESMTPSA id w1sm3720307wmi.13.2020.06.16.05.32.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 05:32:15 -0700 (PDT) From: =?utf-8?q?Przemys=C5=82aw_Sobala?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Jun 2020 14:32:03 +0200 Message-Id: <20200616123204.23105-1-przemyslaw.sobala@gmail.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] Revert "avformat/dashenc: use AVStream timebase when computing missing bitrate" 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: =?utf-8?q?Przemys=C5=82aw_Sobala?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This reverts commit 2a9ffd89fcb09bd69b2130da039ad2caba79cf33 as duration is always in AV_TIME_BASE units --- libavformat/dashenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 3e587acdff..05deb5c1b5 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1960,7 +1960,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream) if (!os->bit_rate) { // calculate average bitrate of first segment - int64_t bitrate = (int64_t) range_length * 8 * (c->use_timeline ? os->ctx->streams[0]->time_base.den : AV_TIME_BASE) / duration; + int64_t bitrate = (int64_t) range_length * 8 * AV_TIME_BASE / duration; if (bitrate >= 0) os->bit_rate = bitrate; }