From patchwork Mon Apr 24 09:26:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Wu X-Patchwork-Id: 41311 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp1299175pzb; Mon, 24 Apr 2023 02:27:14 -0700 (PDT) X-Google-Smtp-Source: AKy350a0W/bIr5EsOHUBOFND9qjS4cNDZr3cCmIpaJQPg/nu9wmC6UPmSnzgPlPWCE+6AkvjHDOd X-Received: by 2002:a17:907:874a:b0:931:df8d:113 with SMTP id qo10-20020a170907874a00b00931df8d0113mr8924181ejc.26.1682328433785; Mon, 24 Apr 2023 02:27:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682328433; cv=none; d=google.com; s=arc-20160816; b=kLDkkcBusqJprWLHHusYF2kqhaQ9S3ZN2rirRHk62ta4VRBbSA/yjPHu0uquTZ4wYY 0PfIbdST959Dfu8dR49RBDV95ogm+nUgidLN+PzhshfPT2C2793RKAkCm07VGg0fQMKX LjeYDp6bCmpASG3HLAuwZsZswp9fdGlDxZ+bBrcjPilWq2k7oq7zE7hohSRP2oswfWU5 WshpKbNjRvYFXdUctGOKypXT8YSLhW4v5GGFHCcZTWJQ5AvGEYsyETk98csHOmTPkSm0 ZR7fIUSABNj/IotVtiVlPS8iSXxZWi7xNoWRM7Pg6jI9BBuuYNkh2OveHsEkp6QXzfP1 FW2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Oxy/0MynCorLMPc+smkDhAyjPnlyXW12/+S1nzQWy0Q=; b=KU2o8YtDcVGm02G2oYkUW8KRyf21J2UqphW0RPeV1l9D9482ukuMhCNV1uIt/pznvH a/4tWfYoy63e2rj97qQEieipJpez7NAGNWh+r42KYn2+qlX3RISlst1fhoRRMsF7Abmv EQlJxSyUyK4ZfxNyVGz/J+tIH/HUlXzSMW++WUAVxpe4yXBeNtKK52MUDyH08DYkn3G6 iOXCmzPfsSjPJppFj4y9E8NAXRlc4/shUuYg3YcrMuN5BbgRgR6fD6dkzR6ydhr+S4gG 4595C2qeKt0BkL7zt61hzeovRkvlGPKDyUJW6M3Rj+yMwlPvxwOVQr/a6m+YhF1dD86Q ui1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=KXKgMdgp; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l17-20020a1709060e1100b0094fa87813b6si7682337eji.256.2023.04.24.02.27.13; Mon, 24 Apr 2023 02:27:13 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=KXKgMdgp; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7997068BF69; Mon, 24 Apr 2023 12:27:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CB6A68BE18 for ; Mon, 24 Apr 2023 12:27:04 +0300 (EEST) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1a66e7a52d3so33285795ad.0 for ; Mon, 24 Apr 2023 02:27:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1682328422; x=1684920422; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=u9vHCp9Nhgmmtsfse7LRPUc17Y4YTVysNO/p5vFj3YY=; b=KXKgMdgpJhpx/IBAHQvu7hCe3zlOQPdnynTh+gP0TIDnz5limhI0izujT5G2fuTYEp YkLxLwLG4+U+2RVmQLrPzW3X256HPeWLcwE0gJX0qbhUWzfwxp6gx9eLOfXfCT1McpRC NuThhh+V5t53nkjotpg90d/7M7l87CnqT8xwU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682328422; x=1684920422; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=u9vHCp9Nhgmmtsfse7LRPUc17Y4YTVysNO/p5vFj3YY=; b=AYq1/K2MfWxUwWM8HQMd5R/HNGpjicuEVrKjjQSEt+e5yEJwMqIy02a6bN5SmQ44Wo 3Dt+/Ck+H/i8EEzNuqjL70sKpryJEFLT43SyJr3locHg/0UO78YOPxsv6Qdjj/2Qxlfd wPfrPpa9LDMj726Sf6z3a+BEnm1ZMfIwV4j1m2nTryadksIcItdzJ0oca8u+QYFPlYO7 p6sXihZcZjpTOtOf6Qj6yFU72GhZDk7sE4NLFvaXnvIFhbFfr066Uq3Tm/UMUcb4/Kga mJGaT7kWzxOjRa3kIY2vrcNa0sp2wdg4g04zxD2zZ84zK1jS5RMQJHeo8x7mV4qm12NC 8VRQ== X-Gm-Message-State: AAQBX9dAAwu1WfbOYX9eZs+H/K2FF8DRjTy26ED2oGT2RZ2bIA/a9+Wa LCQqVmDWFq57K103sF4+lBDbbj0DHNWA8Wk8hEg= X-Received: by 2002:a17:902:d4c4:b0:1a1:b656:2149 with SMTP id o4-20020a170902d4c400b001a1b6562149mr17045890plg.50.1682328422344; Mon, 24 Apr 2023 02:27:02 -0700 (PDT) Received: from jrwu.c.googlers.com.com (21.160.199.104.bc.googleusercontent.com. [104.199.160.21]) by smtp.gmail.com with ESMTPSA id m8-20020a170902768800b001a80ad9c599sm6184051pll.294.2023.04.24.02.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 02:27:01 -0700 (PDT) From: Jeremy Wu To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Apr 2023 09:26:34 +0000 Message-ID: <20230424092634.1012785-1-jrwu@chromium.org> X-Mailer: git-send-email 2.40.0.634.g4ca3ef3211-goog MIME-Version: 1.0 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 Cc: Jeremy Wu , Jeremy Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IoQN8BrG7GSu From: Jeremy Wu 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, \