From patchwork Sat Sep 23 10:04:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Felix de Souza via ffmpeg-devel X-Patchwork-Id: 43877 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp133455pzh; Sat, 23 Sep 2023 03:04:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGbiCYVsX88Y4qvhAmayhUZ0PyUSl2QRk2t8VGat9K3nLZtZrzJ+hZBDgyuxTl/IZIcbKIo X-Received: by 2002:aa7:dd41:0:b0:531:a63:cf25 with SMTP id o1-20020aa7dd41000000b005310a63cf25mr1409030edw.33.1695463491089; Sat, 23 Sep 2023 03:04:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695463491; cv=none; d=google.com; s=arc-20160816; b=W3/s0B7zowLI8skOEe8IzyivdwlD/gFcjc5yVMohR43pSL3s86V0zC8K0xA39ZY8Ll u5Rc+6iTDAKYhKqX3DIhpMR8a2hiBYKQDJ0UlVhJFzBcU4LoeC96BdDPOcjYYHgjpywl wqS8iYEbitqFtSSSfMoVBrndfUorYUtkldn9JK1P11rRc8N1lbNQjjrYY68dkJKaYbYa JhOzpQcOj7kRksu8tDn6LI16WN+r6BrOVmUOrjB7Gin539RGPtNJ1PRHBCK1uyUloxI8 +MhSFhtULzRNvElqTgPuNUMcAaGfyyzftT4g41YXiIB2oycWAt3XIclSanmUVzadlz5K sxWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:to:delivered-to; bh=hujtYDEma+izxZfqwEW7fVxTEhgZSUCmJyMW1ntGMgc=; fh=3Q5onYDXoVdmig8NPL/hwZRwtGqCpCneUdtZ1I/8zak=; b=yS70akTmjatX3tj65D9dwQDGiXA8ID8DsJpPpmvQp+SarAJlZeMayi6RbwWqRqOfHk GHF0HTbzIL33pGFBCyDJXmCrc+6dCpwTvy0SX9xY0KJhSvEbvXwB5YLidXZTQK0HPujm qSBCjkSLnlEODLoCVG728IHWvknLXQhPDq8+cCAIuoj6Ah68UCcMgT3rZVBcMkjEAmsw xSR1WYVUm6dpm3ytDVln2W8BUkianzIyfjH2NFqAwzj52IKBRFJ/SsTeV3zfwe03bGZS F2E40I/phrAiIsPbWsmFKK4+igvnk6G2oKQS1HsOvYRz2NykshmfxY8YgiDSqC+FBJ00 2ucg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s18-20020a056402521200b00533ac400be7si1701412edd.492.2023.09.23.03.04.50; Sat, 23 Sep 2023 03:04:51 -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; 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 7086E68C9B8; Sat, 23 Sep 2023 13:04:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp-fw-9105.amazon.com (unknown [207.171.188.204]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9964A68C711 for ; Sat, 23 Sep 2023 13:04:39 +0300 (EEST) X-Amazon-filename: 0001-Add-the-SSE-calculation-for-libx264.patch X-IronPort-AV: E=Sophos;i="6.03,171,1694736000"; d="scan'208,223";a="674080854" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO email-inbound-relay-pdx-2c-m6i4x-5eae960a.us-west-2.amazon.com) ([10.25.36.210]) by smtp-border-fw-9105.sea19.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2023 10:04:30 +0000 Received: from EX19D014EUA003.ant.amazon.com (pdx1-ws-svc-p6-lb9-vlan3.pdx.amazon.com [10.236.137.198]) by email-inbound-relay-pdx-2c-m6i4x-5eae960a.us-west-2.amazon.com (Postfix) with ESMTPS id 1265440D5D for ; Sat, 23 Sep 2023 10:04:30 +0000 (UTC) Received: from EX19D025EUC004.ant.amazon.com (10.252.61.200) by EX19D014EUA003.ant.amazon.com (10.252.50.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Sat, 23 Sep 2023 10:04:28 +0000 Received: from EX19D025EUC002.ant.amazon.com (10.252.61.247) by EX19D025EUC004.ant.amazon.com (10.252.61.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Sat, 23 Sep 2023 10:04:28 +0000 Received: from EX19D025EUC002.ant.amazon.com ([fe80::c9fe:e3a8:dd4f:e087]) by EX19D025EUC002.ant.amazon.com ([fe80::c9fe:e3a8:dd4f:e087%3]) with mapi id 15.02.1118.037; Sat, 23 Sep 2023 10:04:28 +0000 To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: libavc/libx264: add support to propagate SSE values through encoder stats Thread-Index: AQHZ7gVWeZgr9yv0QEqkANBqjQmzOw== Date: Sat, 23 Sep 2023 10:04:28 +0000 Message-ID: <235b296cd67fed2c79862d4403dbe268d2f7e25b.camel@amazon.it> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.1.213.14] MIME-Version: 1.0 Subject: [FFmpeg-devel] libavc/libx264: add support to propagate SSE values through encoder stats 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: "Carotti, Elias via ffmpeg-devel" From: Diego Felix de Souza via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: "Carotti, Elias" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qSuOKFddAsPy Hi, please find attached a patch to propagate the SSE for a frame into the encoder stats. Since libx264 already provides PSNR values, this is done by basically inverting the formula to recover the SSE values. Would it be possible to also append other values to the errors vector? E.g., libx264 also computes SSIM but other values could be provided. Best, Elias NICE SRL, viale Monte Grappa 3/5, 20124 Milano, Italia, Registro delle Imprese di Milano Monza Brianza Lodi REA n. 2096882, Capitale Sociale: 10.329,14 EUR i.v., Cod. Fisc. e P.IVA 01133050052, Societa con Socio Unico From dfd47efb7f7cb264fef62d0d8fb70ff8168bdfd7 Mon Sep 17 00:00:00 2001 From: Elias Carotti Date: Fri, 15 Sep 2023 20:05:43 +0200 Subject: [PATCH] Add the SSE calculation for libx264. Since libx264 only provides a per-frame per-channel PSNR, this is inverted to get back the SSE. --- libavcodec/libx264.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 77a9f173b4..0fae155ff2 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -129,6 +129,8 @@ typedef struct X264Context { int roi_warned; int mb_info; + + int64_t sse[3]; } X264Context; static void X264_log(void *p, int level, const char *fmt, va_list args) @@ -726,7 +728,40 @@ FF_ENABLE_DEPRECATION_WARNINGS pkt->flags |= AV_PKT_FLAG_KEY*pic_out.b_keyframe; if (ret) { - ff_side_data_set_encoder_stats(pkt, (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA, NULL, 0, pict_type); + const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(csp_to_pixfmt(pic_out.img.i_csp)); + int error_count = 0; + int64_t *errors = NULL; + + if (ctx->flags & AV_CODEC_FLAG_PSNR) { + double scale[3] = { 1, + (1 << pix_desc->log2_chroma_h) * (double)(1 << pix_desc->log2_chroma_w), + (1 << pix_desc->log2_chroma_h) * (double)(1 << pix_desc->log2_chroma_w), + }; + double mse; + int i; + + error_count = pix_desc->nb_components; + + av_log(ctx, AV_LOG_DEBUG, "PSNR values from libx264: %.3f %.3f %.3f.\n", + pic_out.prop.f_psnr[0], pic_out.prop.f_psnr[1], pic_out.prop.f_psnr[2]); + + for (i = 0; i < pix_desc->nb_components; ++i) { + double max_value = (double)(1 << pix_desc->comp[i].depth) - 1.0; + double plane_size = ctx->width * ctx->height / scale[i]; + + /* psnr = -10 * log10(max_value * max_value / mse) */ + mse = (max_value * max_value) / pow(10, -pic_out.prop.f_psnr[i] / 10.0); + + /* SSE = MSE * width * height / scale -> because of possible chroma downsampling */ + x4->sse[i] = (int64_t)floor(mse * plane_size); + }; + + errors = x4->sse; + } + + ff_side_data_set_encoder_stats(pkt, (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA, + errors, error_count, pict_type); + if (wallclock) ff_side_data_set_prft(pkt, wallclock); } -- 2.34.1