From patchwork Mon Sep 21 17:29:48 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: 22555 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 79C6544BA07 for ; Mon, 21 Sep 2020 20:30:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 60C5D68B74D; Mon, 21 Sep 2020 20:30:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f68.google.com (mail-lf1-f68.google.com [209.85.167.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8563668B678 for ; Mon, 21 Sep 2020 20:29:56 +0300 (EEST) Received: by mail-lf1-f68.google.com with SMTP id m5so14943058lfp.7 for ; Mon, 21 Sep 2020 10:29:56 -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=qmLl33Q5QRvoJdGRlXJ2eqq4aqH3AqC61oIb4VpuTkk=; b=pVWh9eqCYyrX+HktAes/UjszodQORRWZpXx36XgjXhogDBJSigAVYmgQxYKdi+7Beu Pwqvh9bMX8cxdLUiHyD2pIZBCJf6v+sD31Hq684tmfZTy29d9TZKfko/dMSnB9UofxNf 4uhqYDZaMcR8XF3K/IkWW2IT4fAiy2jS+TJ7IS3JBlih8DxhcrW3rjDqmWqfn7lEwrTm eby2DsdS0H3VokAyttpHd7G+caTTXL5sX9FhpQ2fNGy7wfaKbeIF57XlbNnkqQ0qsUXv l5QvSlLztwE4P3802Tq66JZBcmb3rr18gYWheLXqv/vqnx/EgJGEWLlpsl8X321Pbk6/ 7qrw== 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=qmLl33Q5QRvoJdGRlXJ2eqq4aqH3AqC61oIb4VpuTkk=; b=lj2JYm5HpAezC8qZXMv3FYL67iB113TibVFMa9Uj8WOhv5XOr/H2i4mVXhXmXbtoJ5 eHhxRUpuaX4XuAsKI4yPFFw6INvsWZaMTOMj0+RhicAXgU8oU2vYu5NwG+B7SOA8Pv2R JbeF2/ugGnVPLkiqi3RoFRsh2HSdH7pSpcqTPbqrUZfkyUdrrAnvy32vB3Cc0Gtxrj1c MguuhwQco4iuks6b0zRRwXo4brkmmmMSnf8zkXirJhRv5uP0P/Y+l5AVpdTmnM/G10F9 daLdOJOiy8pApZ7D7B4jspAf4uD6Xy3Q5tTJLElJwdXsh9WaOKVN0xaJSVuTbICePm6D Jipw== X-Gm-Message-State: AOAM532mKhm0XaPdnOI3NJKU22Nfy6juE1F+ggPx9/kMiAZs6IaU+31C pkYSDpcFjCJ93jfmn/9Auiu5j5QiJ1o= X-Google-Smtp-Source: ABdhPJwpKvT6DN+3oB8NfrsgHLi9Vp/vVf7XdMnc0/3fE/JXDG9CVKkILr3cKM30eRihVD13PJQngw== X-Received: by 2002:a19:494b:: with SMTP id l11mr366727lfj.462.1600709395478; Mon, 21 Sep 2020 10:29:55 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id f27sm2711928lfh.45.2020.09.21.10.29.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 10:29:54 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Sep 2020 20:29:48 +0300 Message-Id: <20200921172948.32440-6-jeebjp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200921172948.32440-1-jeebjp@gmail.com> References: <20200920170629.26504-1-jeebjp@gmail.com> <20200921172948.32440-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/5] avformat/movenc: simplify ISML manifest bit rate logic 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 860e331b19..20768cd45f 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4209,7 +4209,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, @@ -4252,15 +4251,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");