From patchwork Thu May 16 13:55:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fredrik Lundkvist X-Patchwork-Id: 48929 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp2248482pzb; Thu, 16 May 2024 06:55:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXCIgWIErPwKBCxSdpuOaAT4X5/Wp3kqoIaLkceISqEO6Dxv1ocJt0TfGnH1ht1vtDGCJXErQMS+oOdo+RJbK0uOAf6YyDJzz8J/w== X-Google-Smtp-Source: AGHT+IG4VbcQQ5DcMKssI9bcmAFNw8BfuNiRIsGwpHphhldJEr1CIeI920juguO8UdU4/JDOIqgI X-Received: by 2002:a17:906:da8d:b0:a59:a112:add2 with SMTP id a640c23a62f3a-a5a2d673908mr1650174366b.69.1715867731380; Thu, 16 May 2024 06:55:31 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a17c2c899si945525366b.1033.2024.05.16.06.55.30; Thu, 16 May 2024 06:55:31 -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; arc=fail (body hash mismatch); 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E56B168D47A; Thu, 16 May 2024 16:55:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from MM0P280CU005.outbound.protection.outlook.com (mail-swedensouthazon11020003.outbound.protection.outlook.com [52.101.74.3]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2389668A604 for ; Thu, 16 May 2024 16:55:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ILzG7q1Q6YgTV1EhtvUL5TQYTExNqfnv3UJGgKtfKSd2Exz5U2FfahQPdvz62vA6MOYN2fP3GOD4O6NxnG+wRjR0QWLjuDcsoWsgtXJgPhWw2PzVhFvIaLRK6UWMtwjc8csEkSkLRoP09eS7ohGjqXAENr6BGiHaGvcd3JFlYjh98pt8BNkbGQUfjOrWN4GqNtERv6NCNJfZziDXWuA4Z2MYR4Qq5aINQxqiasFgJ6s39rxyv7mlCKh8p+sjS4nw0cg7biAVA4GEeVVhd3fFOojgJhKeJF0K1Q5mLf/Ek/VXfHpfOLKdrys6JZas983zCtL4ht/yvVSEaN8eazCsMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mH6iwv3oRvXWPX0EkH5XShSQM7bdRIuoHyJTFx4Gwuw=; b=hDk+zqIETAGNCORoKy5iCs9QdTuFRuMXUmvpr6yE159Lc6WF8skI/noNac9CJYuD1kpmBmn32PWZ3UL+MV2C83RCYjMaEF1S64Ba1cWJLGjMpT9nuJjLDfssWdZfbdgQHwLjE5nekLDpWdU7paSUqUnBOgb+ZvsN+2Xw+kE9i78h3jUXy2MxCp5SQOAiA9l+/p/ol+u96PfN310kHUaeE2qub7yclYXIgWfvUJiKRk9UEZry76r33PejAIKy3XUI4wXG2xfYGQoBFxT+mFQxUGoa/BaCyOnPjd/OYh6bBsGiwqXhTnkOaocp3Z76vwkDmoTRQa4uHXIooILXow6E8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=svt.se; dmarc=pass action=none header.from=svt.se; dkim=pass header.d=svt.se; arc=none Received: from MM0P280MB1023.SWEP280.PROD.OUTLOOK.COM (2603:10a6:190:3::6) by GV3P280MB0886.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:ef::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Thu, 16 May 2024 13:55:16 +0000 Received: from MM0P280MB1023.SWEP280.PROD.OUTLOOK.COM ([fe80::2a62:4773:ab07:b58]) by MM0P280MB1023.SWEP280.PROD.OUTLOOK.COM ([fe80::2a62:4773:ab07:b58%4]) with mapi id 15.20.7544.041; Thu, 16 May 2024 13:55:16 +0000 To: FFmpeg development discussions and patches Thread-Topic: [PATCH v2] libsvtav1: Enable 2-pass encoding Thread-Index: AQHap5iuQwg9XaO4z0ikasN0+M5YCw== Date: Thu, 16 May 2024 13:55:16 +0000 Message-ID: Accept-Language: sv-SE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MM0P280MB1023:EE_|GV3P280MB0886:EE_ x-ms-office365-filtering-correlation-id: d1e9b991-f3c1-4950-177d-08dc75afd0f2 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230031|376005|1800799015|366007|38070700009; x-microsoft-antispam-message-info: GL6K3bIAXmkST5cnJEX7ACawRd3z2ckOpl3Klm2VtHwIdlIEMqnQ9xck9cX4vpyZ171caOiPVhly76aBZbDcmPuctL74A6vPCStuSVQfb/Ifm4jHZFirOJ1vmJFlzRNYuI9gR1vN6YGG+eMAW7clIttw9+atWOzu3VUUYYrBd9S0DHa8lRlMUg8p+nqgz91vAfl/2eC6/F+j6bfLEF4mjz11EBXVOE3yKZuH9wTKPe/ECxo9ESyxMxY20M1aKs0V2C3TRwt2x26QDCgBcCzzqk6Fim3a+jnVGGp8VYWYMXO9RQkZUwv5mICAvj5nopXdTh5hADZz6jZWyJJNcNEqPtzLpCGPHxDbnYhbbLi0DDr3x5Y1C1IWnjd8k+lKE1BH5B8s6Tns2YKM9r0R3PiGrnBnQpWBKXSj9PUvIrMTEGLnhXKIe6bSlbSMM+jWuA45B8/yRlUTTcZzg5q4JwM8AzK5xPSCCqgMiIaisLNghXXcR0eNkxfI5COqi9Dk6iWR0xX8oVjDUnYqoQeeLiTEkzcklA2iKh4UI0+xakRcLcg2fwwZycJg0nWp461wagWtGJnht0yzdmlgA7r7UcKrASvuEk7+HG8l+cSVEFuZ2vDi4hvZItGLWRE11DXjnIMKF8XZMiAeAdLl9gPF5zvZwUa/JduyE0Og9Alp5augZfFjQyJTB9u0wSu4Os3V8rv/515aYTGQUGeepOZGI2Pj6nKqv4/h9oGqZTnMYc3h0zLigbUJ1nfIVBNkH0WqMj6vQBoFR/XfOUkKjGHP7yh+ESkPsGO6g5pBTWbKg1/CFAVZD97HaruRglsRVKU3ACGQXwb4VgrnUdIjYsKDEDLO27UikGd3FPwzUS+jdVgNQYu+0jrcRNZyzgpwwKum08axn1QoOv3fwv722FdYsebhnbu8E0YW3lqU8OYiKryeaDaMtkMW+Tmk/tjKLfyDWgINn2VEReQ4ti/L5KO4mqO8qnYl9ByiFsxdj+jQc+dYME1DJXeopHcPx7L9Zy7hWHZEcl+4HfHSwWILk/XR0A6C64gpdw7+SUZuDNOdtwFXaLe7q40YMN3lgYlszlGRPsBOv4rhdessiTADAx9AFi/C/1qVPVbsiUYR6TLBpxDJbfcGFpRcrQcY0p7Dvu2IAIo+FHfzqKpEo6IvHeJygUaHistU08N8TVTuPUTzXZs5KEm9BPp3A09Ho4dhmWIy8DQ278MZ5r2nt5bjg/X8cse3ZJIB+N3YYKXX43kDY7lBYtiqfFrqiLOebLW6ps7DSOcvmJipl+7LNMpAk0FJT8Bhs71sQp1IpDWEsk1Amnqxlr5hsJOkdbeAemu2yzQAFXldBWn0OqD1Hm0oP3/sIZvQmA== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MM0P280MB1023.SWEP280.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(376005)(1800799015)(366007)(38070700009); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: t+SbgzCLul6bGp7jBIFwVOVabSh/2cjBpKHADdv6RafDEQDL1aiUHl0nEnf+o+QBaAqDOZbtP5oImz5NDVqvGMi0LbLI/UDZvS/jFkqzHnRetesIHE8VMblcfKOLQyUujS0PmmnR31iZydieHiasHi1NLFAacd8LVbFaw75sG5NQgW3Mtia4vdXn8jydPcuY1J3UTODOq/pZkVBWQmhJliBI9Lk7aWhDDXVkkhzXERwq2zo/XE6DT2B6kOLUDe+pFcLbuDyH7oQgHJz/e0IMRDQkZOG7/kCM0DonRy32JTrjBF/xUAc2IzQoqMuGwIJIWeIu+I+TAzgQ3H/c2F1qhEVLXwpKODD53hA4xZQ4q6AOg6DPpvHOG0m2SCH4d09fNj2UGGMDzSlKe6IcjzEcRUjP/pcZ/mioWuBsCO95ZBb48kA49bR3VQEluVP6BJjMpaLuMpfcUVquynyfoagqg73xOdbBblSDiW2AP/fDhSLoxOQYM2WKRcGvS1VF1Z1Vv7w8kyf8rJBteVL9H7yli7IJGG7Sn3l5bz1+9OQ5/175bpV4wvf9+5b9Iaf1WWdFL0vskiD0HMcFm3l3NPvBDJ/lOnglcFqkLCsm6T1nwNAAzxZr1Ao0erlLcX3QPAlB1i7WXuusA61nuGbPiKx4o/ecg1Ayb+Nggkl25DuoOjG/GDncTQpZ/mtDDwN6CZ599l4OqKU4oPpkOYLnDPz4UcNNFW+vaz3tRQPMRWfNpjDln70cA1yUQZLPpK2Aj8ynfIqSahCIYGvsPaCuvCITSzXb9+/RzRbSMwf1k9bS8zhFmhbsMWsUMU2tkZfix+hMjMSMiiak+WM+YmW9+Q+EKmwgfUThxIryfTspdF+hxOBVLUYwXrpLUmYQRxbiRZknATfhaNT/PiHQTVvJi6rasAbwN47ZvhwDc59mi38jdCVz/Ok4yS4PvQvaAjOt0CAmiHGuTbj1aliMyRwn3ib0LyN0baH7fOmAyUn7CvoWLS51Q3RZ6fNOAQpV0MVpff4dHaYz+kfpusMigBFIF86FtfgbfFpvEK70FSI2sfNBqc3NdvM9sLIvw/r1FgNuTQVse5q9SAAgU+KPPmBeVCon5GOldqVOsn0vsrD6MUaleDPQXjJ/HdKhTHi42oOmt1RwRZFZVi9udDA8OJFE5hAD3EbLBAgyWZhagtgjNDy5UJsJq2qhPl0snLeGGkHDzdFwtCHWrm7YHFS9j5Qa06giO7MlmQn7nOk0gYteQ7AWoGPoRoyQAWmZWZsP6HED+DcA01JKK0nv0MKwhzdyAI2RNE0/dKxBengn4TReWiaQl00v28LOr3jpqorT9OhwPliJYlA3D5WSf5/DkBIyN8ZKTNKa+8GRvTslWBAmc79xVNsu9WhvH6jM9rX1s96xHQ2RV75GNWwgKes78fkC8Qo6tQCGGLrH1jeq1P01NWu21ysb4u8Pt/mgEH+kLY+0MHzwQzjg35iMF9mI3tB2+/AbjwPe61j78jhcDOU1CKW2GVt71zn9KHra7LiMh1UvsGPCQA1UD2Q2pdIlOipGGRU/D3ptAJguWOlNdZ4iaEDDjCZSWN8HFI1lJ06JxVSkAtV3Wd4v3+FDlx1/H9SVJYmhIg== MIME-Version: 1.0 X-OriginatorOrg: svt.se X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MM0P280MB1023.SWEP280.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: d1e9b991-f3c1-4950-177d-08dc75afd0f2 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 May 2024 13:55:16.4936 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f5d227e4-4de5-4600-9015-df5f33e77f2f X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 05+lo1ITKa2DacSgp85MGSRtNOzBOhC1Frh/OF1xRzHbVwGiGueyb8fOAzgopVvJdocgwfEhmytXGnmXRg1SMPbOsBgCmfVUJysCLkl426Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV3P280MB0886 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH v2] libsvtav1: Enable 2-pass encoding 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: , X-Patchwork-Original-From: Fredrik Lundkvist via ffmpeg-devel From: Fredrik Lundkvist Reply-To: FFmpeg development discussions and patches Cc: Fredrik Lundkvist Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BfXhFVnTQxnV Currently, libsvtav1 does not send pass number or stat buffer to SVT-AV1, which means that 2-pass encoding is not possible using FFMPEG; if a user wants to do 2-pass encoding using SVT-AV1, they have to use SvtAv1EncApp. This patch adds 2-pass encoding support to libsvtav1 using the stats buffers provided by the AVCodecContext. When encoding the first pass using SVT-AV1, the following should be logged: Svt[info]: SVT [config]: preset : Pass 1 Indicating that the encoder knows that it is performing the first pass, activating a special preset. With the patch applied: ffmpeg -i input.mp4 -c:v libsvtav1 -an -pass 1 -b:v 1M -f null /dev/null [...] Svt[info]: ------------------------------------------- Svt[info]: SVT [config]: preset : Pass 1 Svt[info]: ------------------------------------------- [...] Signed-off-by: Fredrik Lundkvist > --- libavcodec/libsvtav1.c | 57 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) -- 2.39.3 (Apple Git-145) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 9bc165f0cf..89c932e509 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -25,6 +25,7 @@ #include #include +#include "libavutil/base64.h" #include "libavutil/common.h" #include "libavutil/frame.h" #include "libavutil/imgutils.h" @@ -226,6 +227,37 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, param->max_qp_allowed = avctx->qmax; param->min_qp_allowed = avctx->qmin; } + + if (avctx->flags & AV_CODEC_FLAG_PASS2) { + int decode_size; + if (!avctx->stats_in) { + av_log(avctx, AV_LOG_ERROR, "No stats file for second pass\n"); + return AVERROR_INVALIDDATA; + } + param->rc_stats_buffer.sz = strlen(avctx->stats_in) * 3 / 4; + param->rc_stats_buffer.buf = av_malloc(param->rc_stats_buffer.sz); + if (!param->rc_stats_buffer.buf) { + av_log(avctx, AV_LOG_ERROR, + "Stat buffer alloc (%"SIZE_SPECIFIER" bytes) failed \n", + param->rc_stats_buffer.sz + ); + param->rc_stats_buffer.sz = 0; + av_freep(¶m->rc_stats_buffer); + return AVERROR(ENOMEM); + } + decode_size = av_base64_decode(param->rc_stats_buffer.buf, avctx->stats_in, param->rc_stats_buffer.sz); + if (decode_size < 0) { + av_log(avctx, AV_LOG_ERROR, "Stat buffer decode failed\n"); + param->rc_stats_buffer.sz = 0; + av_freep(¶m->rc_stats_buffer); + return AVERROR_INVALIDDATA; + } + param->rc_stats_buffer.sz = decode_size; + param->pass = 2; + } else if (avctx->flags & AV_CODEC_FLAG_PASS1) + param->pass = 1; + + param->max_bit_rate = avctx->rc_max_rate; if ((avctx->bit_rate > 0 || avctx->rc_max_rate > 0) && avctx->rc_buffer_size) param->maximum_buffer_size_ms = @@ -618,6 +650,25 @@ static int eb_receive_packet(AVCodecContext *avctx, AVPacket *pkt) if (headerPtr->flags & EB_BUFFERFLAG_EOS) { svt_enc->eos_flag = EOS_RECEIVED; svt_av1_enc_release_out_buffer(&headerPtr); + if (avctx->flags & AV_CODEC_FLAG_PASS1) { + SvtAv1FixedBuf first_pass_stats; + EbErrorType svt_ret = svt_av1_enc_get_stream_info(svt_enc->svt_handle, + SVT_AV1_STREAM_INFO_FIRST_PASS_STATS_OUT, + &first_pass_stats); + if (svt_ret == EB_ErrorNone) { + size_t b64_size = AV_BASE64_SIZE(first_pass_stats.sz); + + avctx->stats_out = av_malloc(b64_size); + if (!avctx->stats_out) { + av_log(avctx, AV_LOG_ERROR, "Stat buffer alloc (%"SIZE_SPECIFIER" bytes) failed\n", + b64_size); + return AVERROR(ENOMEM); + } + av_base64_encode(avctx->stats_out, b64_size, first_pass_stats.buf, first_pass_stats.sz); + } else + av_log(avctx, AV_LOG_ERROR, "Failed to get stream info"); + + } return AVERROR_EOF; } #endif @@ -671,7 +722,7 @@ static int eb_receive_packet(AVCodecContext *avctx, AVPacket *pkt) static av_cold int eb_enc_close(AVCodecContext *avctx) { SvtContext *svt_enc = avctx->priv_data; - + EbSvtAv1EncConfiguration *param = &svt_enc->enc_params; if (svt_enc->svt_handle) { svt_av1_enc_deinit(svt_enc->svt_handle); svt_av1_enc_deinit_handle(svt_enc->svt_handle); @@ -682,6 +733,10 @@ static av_cold int eb_enc_close(AVCodecContext *avctx) av_freep(&svt_enc->in_buf); } + if (param->rc_stats_buffer.buf) { + av_freep(¶m->rc_stats_buffer); + } + av_buffer_pool_uninit(&svt_enc->pool); av_frame_free(&svt_enc->frame); ff_dovi_ctx_unref(&svt_enc->dovi);