From patchwork Sun Sep 20 17:06:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 22539 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 5562444B943 for ; Sun, 20 Sep 2020 20:06:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E1E868B9FB; Sun, 20 Sep 2020 20:06:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1487868B45C for ; Sun, 20 Sep 2020 20:06:37 +0300 (EEST) Received: by mail-lj1-f195.google.com with SMTP id k25so9128347ljg.9 for ; Sun, 20 Sep 2020 10:06:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=HG9z+9qvmBy6NbPey8TfAtrorW7Y71yCB8RniQki8h0=; b=JS4MApflwuePC6qwa2zNL+ojQMBUNDdTZ8iPsSiP7mOnDilNrWPE+IrpyBE5YBEmhO QDWfMgVtvgnz5tfEGBwpSTr0eJqQG/zq+ihRoAvlqr+iHuPssWKUib5lghSOtbT3bTUH FZOLch9FHwTpLixpw4hEEYT/QAI3yvbMJhhe+8sri4ya5x6neS0tD9nWRgbI4tLaDI9B p45oejmF3nggx/d+0wXifDCWF+qH/t+rE/lN+M41fIh8u5sT7ZimZJHBH30537fC4/4i q73bayVZVr1+7bmaTfMoZDs9QhQSNaHXAAokZjyaPd2CWwDOxHGq4va63b/udCj799DH mXCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HG9z+9qvmBy6NbPey8TfAtrorW7Y71yCB8RniQki8h0=; b=udM4BHa2/HacvpOKUepirJSJAFUCi6vn2u5sNeVpfvxYLnviN0qhDn9uyPV5VI8i+i f3bzH6INOkmbas8yf3lqYVQSNs71yRLAZAk64wvU67lhl1Xev+bKtH9uEOjvTGHTqixZ p7qr2yrcDadEJVsn86t8JDotRNeHSi+gzcv17hh2ApkdOcesYu+Dpk+HEUvBxPVzuQ1G ccqpRHtdiTs0qmP1OpuBxbH4MC0aYHna4oOL65po5Eeiq4zOPmhsenGwt/iGJH+ZlpfR 4XEvKCOnUjAIQZDYyZexofC/oA5GjGwanpcIltZhJsuN0aV5+D7OvKjYXUwNBsQwy0Il FD1A== X-Gm-Message-State: AOAM532XYyemOKLFz9tA4bneb7AG2zMxl8Qtzk09E+zP815+iOC6EuZa vsr4fb8wQTvbDNZmFBbWoKv1d+at8VE= X-Google-Smtp-Source: ABdhPJxtigQsgxeFAieMbpPxrrLdIS0r0QNQxwDJTrcOwDShnHVpYiOtoZrxpz3LqMCdpZYA3raATQ== X-Received: by 2002:a2e:8956:: with SMTP id b22mr14564883ljk.85.1600621596000; Sun, 20 Sep 2020 10:06:36 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id x14sm1909108lfc.93.2020.09.20.10.06.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Sep 2020 10:06:35 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Sep 2020 20:06:29 +0300 Message-Id: <20200920170629.26504-6-jeebjp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200920170629.26504-1-jeebjp@gmail.com> References: <20200920170629.26504-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/movenc: simplify ISML manifest bit rate setting 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The newly calculated average bit rate value is pretty much what is being done here. --- libavformat/movenc.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 0f14e255e9..35d028e6de 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4200,7 +4200,6 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormat { int64_t pos = avio_tell(pb); int i; - int64_t manifest_bit_rate = 0; static const uint8_t uuid[] = { 0xa5, 0xd4, 0x0b, 0x30, 0xe8, 0x14, 0x11, 0xdd, @@ -4243,15 +4242,9 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormat continue; } - if (track->par->bit_rate) { - manifest_bit_rate = track->par->bit_rate; - } else { - manifest_bit_rate = bit_rates.max_bit_rate; - } - - avio_printf(pb, "<%s systemBitrate=\"%"PRId64"\">\n", type, - manifest_bit_rate); - param_write_int(pb, "systemBitrate", manifest_bit_rate); + avio_printf(pb, "<%s systemBitrate=\"%"PRIu32"\">\n", type, + bit_rates.avg_bit_rate); + param_write_int(pb, "systemBitrate", bit_rates.avg_bit_rate); param_write_int(pb, "trackID", track_id); param_write_string(pb, "systemLanguage", lang ? lang->value : "und");