From patchwork Sun Sep 20 17:06:26 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: 22536 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 4898144B943 for ; Sun, 20 Sep 2020 20:06:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1FEC968B9D1; Sun, 20 Sep 2020 20:06:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D927A68B521 for ; Sun, 20 Sep 2020 20:06:33 +0300 (EEST) Received: by mail-lf1-f65.google.com with SMTP id b22so11422038lfs.13 for ; Sun, 20 Sep 2020 10:06:33 -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=tUFLHBxdWsl7Us0XbPqDstU/JuYlsHUWdWoGEva+YY4=; b=vHk6itowhHDusG1Ri9KnNUBusqIeBpcHWjRGhm4aeweBupSluH9ylFFGlmJa6WJzdO VNkxS5EJzVoZOCSEnFuPHH7rTWg+z9RLuHdQM41kYGl0WF8riSOjFE0SoQ6DTVHniosK Syv+LBK6z1jHaS4Z9UVfnDqAyVVg/xkQrKcZ1ekrh7SudA32/HFSB82UW1YzNWC2aoHZ cYrGU9b8ZLXaosTP4ed+yzVa7dmY40verGzuRnAzIsvT2O+SP98OEBojK3X3eV4HABQL NIkCPa3Tzql3M+HZ6sEGTv1V8RF51D17s9cHhXCS9yvssM7jiy33lTEnlzlmAliODGHj BSPg== 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=tUFLHBxdWsl7Us0XbPqDstU/JuYlsHUWdWoGEva+YY4=; b=Xpix949E+3SXLcJNLiIFQbXYmiNsC5DirWFPf3VHjsrqOnfwBzQ4t2htbavLY0zhmf sIkZphofuZqe4jIXC90/7oapCBBX6FCsqoDCcPWxoZqV5LSSThrm1JTiUinm6eIMmhYV n2KI6iUd/gnZ+FNANodb7nZJ4kc8PTYAQqN/3AbbY/iXb4F6P7/NzCOn4IsrImx9FvMe v3gvBj4X5mRP3JFIggr51U0no1tkUekjtezvpZ7p3DlNESIAD4aN8crfW5Po+9Bf6nB9 1Sya4erPGJXCHL1Po5c88D9bZJ5oryxHGGk1flIc0mwAo8eC+MEUveGwPre1oLu128dZ eJTQ== X-Gm-Message-State: AOAM533OdGMYZh8fHoVBcHCfWETEDYUcKG5pPHZjRk6kR3aLa4/LRckg 3ZheiaRnSD0uGU2J2AL08zkpe0ns6a8= X-Google-Smtp-Source: ABdhPJyUK0RGDQGa5T9PIh4bB/oTy0coSRbU3ct9nw//ZRTkgaTOUcN+FCkMVyqex9KgaKp6IabDxQ== X-Received: by 2002:ac2:4a81:: with SMTP id l1mr8442609lfp.388.1600621592993; Sun, 20 Sep 2020 10:06:32 -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.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Sep 2020 10:06:32 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Sep 2020 20:06:26 +0300 Message-Id: <20200920170629.26504-3-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 2/5] avformat/movenc: utilize the maximum bit rate in ISML writing 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" This way we have a single location in movenc which utilizes the CPB properties. --- libavformat/movenc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 33331962f2..31e1ac1589 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4155,7 +4155,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; - AVCPBProperties *props = NULL; static const uint8_t uuid[] = { 0xa5, 0xd4, 0x0b, 0x30, 0xe8, 0x14, 0x11, 0xdd, @@ -4181,6 +4180,8 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormat for (i = 0; i < mov->nb_streams; i++) { MOVTrack *track = &mov->tracks[i]; + struct mpeg4_bit_rate_values bit_rates = \ + calculate_mpeg4_bit_rates(track); const char *type; int track_id = track->track_id; char track_name_buf[32] = { 0 }; @@ -4196,12 +4197,10 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormat continue; } - props = (AVCPBProperties*)av_stream_get_side_data(track->st, AV_PKT_DATA_CPB_PROPERTIES, NULL); - if (track->par->bit_rate) { manifest_bit_rate = track->par->bit_rate; - } else if (props) { - manifest_bit_rate = props->max_bitrate; + } else { + manifest_bit_rate = bit_rates.max_bit_rate; } avio_printf(pb, "<%s systemBitrate=\"%"PRId64"\">\n", type,