From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6016345817 for ; Mon, 24 Apr 2023 08:36:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C6D0868BCBC; Mon, 24 Apr 2023 11:36:52 +0300 (EEST) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF9D968BCBC for ; Mon, 24 Apr 2023 11:36:45 +0300 (EEST) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-63b73203e0aso25951254b3a.1 for ; Mon, 24 Apr 2023 01:36:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1682325403; x=1684917403; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=36ekMF4v4ZPO1l//8HDyWYV3Mv+86Q9qWojPSwDkpVw=; b=bLubOvgV4EqHa6fGj9MAmIMraynfaapXb7Pr7wkTwCFmgBmetpJSEHHSLrkfLpmDWW 5LUat+GHwjTftrApPP6KsWkWdftyo01Ryvj3+k4Q5UQHxDp343L5VZklNFwuwdPc/54v 0HEVBJnxZSU4O0h5P3e2XH9WfPpDTU/aSvpK0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682325403; x=1684917403; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=36ekMF4v4ZPO1l//8HDyWYV3Mv+86Q9qWojPSwDkpVw=; b=LyRwrZ9IZxS8hqE1RIRPC378MdZN3YaLXmStlk5+gNQmp3JWiPCgj4HgaOY2Qm8c6y hRcJaQIV4ieozmJ8whPk7lLLrR1QHI6cTXncLpcX77SkPXTdloHWBvYLHL3+PN1xLyHC ZSDC2qawWJA+tr3V59bTwqr1Nz0Su2cZUEgaT34TdmxsSCYcVv9nuAjJj0GfrARJdny7 npUJl+AxMWg0kUyLozTlO5wzAiTLwfct/Aa7J+MRdDZUtznkEZ/8sd/k9qzEPZtndP2M neZPAhDpXoKcz7fUYvTkTV5s54VOgV1Lt9DA6c6bHYcrx/zfKcgA7GeDmXRWE6PfzUJh y26A== X-Gm-Message-State: AAQBX9f2zOzHXTvnDU5mwoUb9hgYz+P6pnjSKPltLm17WN09nIM/4zDy iIl+tXlasso3k83/X5+mwGIM22J4J9qK6sVyRa3QeA== X-Google-Smtp-Source: AKy350b+0JETw74G50SLx2wGvf5pG36gnMcf2tiJwHnrJ+uR3cDkuNaJo+lCbjFU98aZ/4BsHIylIA== X-Received: by 2002:a05:6a20:428c:b0:f4:ec49:b83b with SMTP id o12-20020a056a20428c00b000f4ec49b83bmr4130600pzj.15.1682325403161; Mon, 24 Apr 2023 01:36:43 -0700 (PDT) Received: from ?IPV6:2401:fa00:1:17:78d1:9784:d4b0:2aec? ([2401:fa00:1:17:78d1:9784:d4b0:2aec]) by smtp.gmail.com with ESMTPSA id k128-20020a632486000000b00502ecc282e2sm6152904pgk.5.2023.04.24.01.36.42 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Apr 2023 01:36:42 -0700 (PDT) Message-ID: Date: Mon, 24 Apr 2023 16:36:41 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 From: Jeremy Wu To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] avcodec/aacenc: add strict bit rate control mode X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: In certain use cases, controlling the maximum frame size is critical. An example is when transmitting AAC packets over Bluetooth A2DP. While the spec allows the packets be fragmented (though UNRECOMMENDED), in practice most headsets do not recognize nor reassemble such packets. In this patch, we add a new mode to specify that the configured bit rate should be followed strictly up to frame level. Signed-off-by: Jeremy Wu --- doc/APIchanges | 3 +++ libavcodec/aacenc.c | 11 +++++++++++ libavcodec/avcodec.h | 4 ++++ libavcodec/version.h | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 0b609e3d3b..e730a7e126 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-0x-xx - xxxxxxxxxx - lavc 60.11.100 - avcodec.h + Add AV_CODEC_FLAG_STRICT_BITRATE. + 2023-04-10 - xxxxxxxxxx - lavu 58.6.100 - frame.h av_frame_get_plane_buffer() now accepts const AVFrame*. diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index ed036209e9..daf5538056 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -1106,6 +1106,17 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, too_many_bits = FFMIN(too_many_bits, 6144 * s->channels - 3); too_few_bits = FFMIN(FFMAX(rate_bits - rate_bits/4, target_bits), too_many_bits); + if (avctx->flags & AV_CODEC_FLAG_STRICT_BITRATE) { + if (rate_bits < frame_bits) { + /* temporarily degrade quality and repeat until frame fits */ + s->lambda *= 0.75f; + continue; + } + /* reset lambda when solution is found */ + s->lambda = avctx->global_quality > 0 ? avctx->global_quality : 120; + break; + } + /* When using ABR, be strict (but only for increasing) */ too_few_bits = too_few_bits - too_few_bits/8; too_many_bits = too_many_bits + too_many_bits/2; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1e91b9cb53..bc9ecdff23 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -333,6 +333,10 @@ typedef struct RcOverride{ * H.263 advanced intra coding / MPEG-4 AC prediction */ #define AV_CODEC_FLAG_AC_PRED (1 << 24) +/** + * Treat specified bit rate as upper bound up to frame level. + */ +#define AV_CODEC_FLAG_STRICT_BITRATE (1 << 25) /** * interlaced motion estimation */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 80e2ae630d..8b53586be1 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 10 +#define LIBAVCODEC_VERSION_MINOR 11 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ -- 2.40.0.634.g4ca3ef3211-goog _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".