From patchwork Mon Sep 21 17:29:47 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: 22554 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 AA7DB44B844 for ; Mon, 21 Sep 2020 20:30:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E7F468B6CB; Mon, 21 Sep 2020 20:30:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E0B768B678 for ; Mon, 21 Sep 2020 20:29:56 +0300 (EEST) Received: by mail-lj1-f194.google.com with SMTP id k25so11820999ljk.0 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=/qU3kCa9r3awczLoT+kojtbCg8QJ2pRZY4kABNzYfp4=; b=SN7jbyTAMo3FhBA4fM8wOGtptVuzfhpwK6lMw8iAKDQE5TantANJLtGq+mRdBOObwg G4YPmAga/TF5mnNi9cZpR5zD+H/cszErco6Pk2n2hb4JpFax9W6VkhJkm1A7JnYAAKAl bggyGTboYdZg57A5G/+qv2WqORisSOVF1d91qS3hqXBIQWuo+uI3vpC6CJ0gvOwXfN35 LWqZuaWMBVKecYsrxtmMBJ1sVw2s7huXFvEFQajYEB+KYCPDlTSMCy6l8gouJNKbB5Ud JsvYTGPEYo34fb22j71iS1iNmIVnvD5UlbFtqfTMTD8EqhfTrp/lMRBE8YC4sXckKoJx M6KQ== 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=/qU3kCa9r3awczLoT+kojtbCg8QJ2pRZY4kABNzYfp4=; b=BmXx5ny3lWpyhPb5SL+bHr41ny2KFtpa5Y2DBwAXD33sJyhz8HzRDQxncx+4gYwsZz 7Ntm3n9zuoHYblsLzluFRrOQpy5qMAhzwErMO9lhJXhBobOiHyt/b2oXc74+R7mW+akQ DvWyLI7EDl6/nHBqHXb9r9RGnzR/8yTjZupPTsu7MXn/aPxB6wWIOiHx8n9TdbWDUXho i1iDeN9ckmjT9JXZd1j5NTRLJDCJO2Na7pUWfaeAU0g9lzANuLoSjzcLuZurtNyn/yGJ HhhyUROmF1a5cmmD8G12IYq6Qs/dkpufgd16z1ooX4M9+48X1duBnX1fCrPCi0ZX7WdH PU7w== X-Gm-Message-State: AOAM531PElfzDa7gWzIEXqjpCNO1pbHJGg8k4rVmG4xhPjlMvNUGLl1J AitgJv/i7/srugzwqb+azCNwFO2RGxY= X-Google-Smtp-Source: ABdhPJyT7PintVZtYeXoodgqS4pzdVZ8dy2elPOhwX0GIRFOcthqJtS97LcqUmHDsLSzwFhIIOPv/A== X-Received: by 2002:a05:651c:1128:: with SMTP id e8mr244226ljo.436.1600709394531; Mon, 21 Sep 2020 10:29:54 -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.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 10:29:53 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Sep 2020 20:29:47 +0300 Message-Id: <20200921172948.32440-5-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 4/5] avformat/movenc: use more fall-back values for average bit rate fields 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" If the average bit rate cannot be calculated, such as in the case of streamed fragmented mp4, utilize various available parameters in priority order. Tests are updated where the esds or btrt or ISML manifest boxes' output changes. --- libavformat/movenc.c | 17 +++++++++++++++++ tests/ref/lavf/ismv | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 76fb251fa8..860e331b19 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -648,6 +648,23 @@ static struct mpeg4_bit_rate_values calculate_mpeg4_bit_rates(MOVTrack *track) struct mpeg4_bit_rate_values bit_rates = { 0 }; bit_rates.avg_bit_rate = compute_avg_bitrate(track); + if (!bit_rates.avg_bit_rate) { + // if the average bit rate cannot be calculated at this point, such as + // in the case of fragmented MP4, utilize the following values as + // fall-back in priority order: + // + // 1. average bit rate property + // 2. bit rate (usually average over the whole clip) + // 3. maximum bit rate property + + if (props && props->avg_bitrate) { + bit_rates.avg_bit_rate = props->avg_bitrate; + } else if (track->par->bit_rate) { + bit_rates.avg_bit_rate = track->par->bit_rate; + } else if (props && props->max_bitrate) { + bit_rates.avg_bit_rate = props->max_bitrate; + } + } // (FIXME should be max rate in any 1 sec window) bit_rates.max_bit_rate = FFMAX(track->par->bit_rate, diff --git a/tests/ref/lavf/ismv b/tests/ref/lavf/ismv index e7361705fa..ac7f72ba33 100644 --- a/tests/ref/lavf/ismv +++ b/tests/ref/lavf/ismv @@ -1,9 +1,9 @@ -4c6bc5ac805a76bbbd886a69d2e61554 *tests/data/lavf/lavf.ismv +48fb8d7a5d19bd60f3a49ccf4b7d6593 *tests/data/lavf/lavf.ismv 313169 tests/data/lavf/lavf.ismv tests/data/lavf/lavf.ismv CRC=0x9d9a638a -18678627921460328ea3fed238d0d57d *tests/data/lavf/lavf.ismv +d19cd8e310a2e94fe0a0d11c5dc29217 *tests/data/lavf/lavf.ismv 322075 tests/data/lavf/lavf.ismv tests/data/lavf/lavf.ismv CRC=0xe8130120 -b9a858caf55b1eff2273e746e9f72dc4 *tests/data/lavf/lavf.ismv +3b6023766845b51b075aed474c00f73c *tests/data/lavf/lavf.ismv 312546 tests/data/lavf/lavf.ismv tests/data/lavf/lavf.ismv CRC=0x9d9a638a