From patchwork Sat Mar 5 16:58:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 34619 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp49626nkx; Sat, 5 Mar 2022 08:58:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJzI9pj/ZZJEukqwOldu0kzAsj2vpr4FZbnWWGLm4yoBZlXeT+yQSYKrgKANPuEpBfg75RPt X-Received: by 2002:a17:906:5641:b0:6da:8691:3fcc with SMTP id v1-20020a170906564100b006da86913fccmr3235851ejr.50.1646499535841; Sat, 05 Mar 2022 08:58:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646499535; cv=none; d=google.com; s=arc-20160816; b=dKNAYsx9SuFHRIOHqBAFuBNFGFRF0rYa5rxrUKG7qdRPBNgytW+0DDSNR1SuBTrwok Bu/CXDoZ1GiLtNcNW3f1CNKY4FFQ0/q+dDutSp07VHokpS+4RTZEAYMMemas2gRQt1Kz j5221jwf6GdhD/CMVeVOLyJrUT6wkND93UY2NrTlr6SMSEVSXfAVcZjD3rJyw3p5ZGja lAX84jhUtnZRTjAJ2wo5HqH9qAYhLyMTOR9TlZL03n7OsaVbfObiXQYfuGC6Y7JeLUKw phMFvHEVEiFX0ZmYK6vFV5RC5nAnVrff+3WUJQlYmN8952mhtoFlF+lNvbQHY0Pfc9D0 amPA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=SIitmT9rGzLitCc26CmpZ2XtItNvmH90OGf58ZqD4xk=; b=Suag/uT+94zyr1R56HMAobqX5SDGa8NT3igY8zK4WxdonZ9FxVl7cr4umZPAOg3Iia T2OIyLRztFsCuiEebcDp3YSQLrF5jMdvjlmsbPtx7rNCAfy7vNm/9dfAIv60sBcK2xql oGzUpiW2zTl7QDFNgQvfiihp6tqiwgLdvAguJjqGfjSOgpnRn5/yjy0jR+nILWlAEf1f hN6vmpnh2MT3YCI/ABjaW5oh0pFHr6AwBcNg1gza7LF0ZmHtzNM6MV5262xodOo+amBW Odc0l9oiluKXFakiCf20reesQyGHt22yMcitwy3uJvni5lt+cW0jEULvaAsuPnUpcQRe DDVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=HNwR6zPl; 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 r23-20020a17090638d700b006d0c22e67a3si4828743ejd.798.2022.03.05.08.58.54; Sat, 05 Mar 2022 08:58:55 -0800 (PST) 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=@haasn.xyz header.s=mail header.b=HNwR6zPl; 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 9C29F68B0F2; Sat, 5 Mar 2022 18:58:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ACEB368A7DD for ; Sat, 5 Mar 2022 18:58:43 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 272374702E; Sat, 5 Mar 2022 17:58:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1646499523; bh=IIMMUyNq8Id6JQaDR6zchCKQ71RECpFtSZp1VdKc7wg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HNwR6zPl/sq4mwtJcvgZjbJkD2ksVN6p+1P5xXodfbxFgVEL8SruDIUcItq9zrFas x/5ZcL+SC6loWSdgY7BJ9dIWG0mww9lupXTSrp+INVMUT/aw06S4DQzmGZ0WcIT8Zf xKRmbOEpDUhFkT3O7xZ8EIg7sWHTmdqtwvU9RJrQ= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Mar 2022 17:58:32 +0100 Message-Id: <20220305165833.18668-2-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220305165833.18668-1-ffmpeg@haasn.xyz> References: <20220305165833.18668-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] h274: avoid copying AVFilmGrainH274Params into the stack frame 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /AG9z79alFtk From: Niklas Haas There's very little reason to make a local copy of this entire ~10 kB struct, only to precompute three minor arithmetic operations. Just move the logic to the per-block function call instead. Signed-off-by: Niklas Haas --- libavcodec/h274.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/libavcodec/h274.c b/libavcodec/h274.c index 170086543f..265bd49ea1 100644 --- a/libavcodec/h274.c +++ b/libavcodec/h274.c @@ -192,14 +192,18 @@ static av_always_inline void generate(int8_t *out, int out_stride, return; } - h = num_values > 1 ? av_clip(h274->comp_model_value[c][s][1], 2, 14) - 2 : 6; - v = num_values > 2 ? av_clip(h274->comp_model_value[c][s][2], 2, 14) - 2 : h; - init_slice(database, h, v); - scale = h274->comp_model_value[c][s][0]; if (invert) scale = -scale; + if (c > 0) + scale >>= 1; // reduce intensity for chroma (as per SMPTE RDD 5-2006) + h = num_values > 1 ? h274->comp_model_value[c][s][1] : 8; + v = num_values > 2 ? h274->comp_model_value[c][s][2] : h; + h = av_clip(h << (c > 0 ? 1 : 0), 2, 14) - 2; + v = av_clip(v << (c > 0 ? 1 : 0), 2, 14) - 2; + + init_slice(database, h, v); synth_grain_8x8_c(out, out_stride, scale, shift, &database->db[h][v][y_offset][x_offset]); @@ -219,9 +223,9 @@ int ff_h274_apply_film_grain(AVFrame *out_frame, const AVFrame *in_frame, H274FilmGrainDatabase *database, const AVFilmGrainParams *params) { - AVFilmGrainH274Params h274 = params->codec.h274; + const AVFilmGrainH274Params *h274 = ¶ms->codec.h274; av_assert1(params->type == AV_FILM_GRAIN_PARAMS_H274); - if (h274.model_id != 0) + if (h274->model_id != 0) return AVERROR_PATCHWELCOME; av_assert1(out_frame->format == in_frame->format); @@ -241,21 +245,12 @@ int ff_h274_apply_film_grain(AVFrame *out_frame, const AVFrame *in_frame, const uint8_t * const in = in_frame->data[c]; const int in_stride = in_frame->linesize[c]; - if (!h274.component_model_present[c]) { + if (!h274->component_model_present[c]) { av_image_copy_plane(out, out_stride, in, in_stride, width * sizeof(uint8_t), height); continue; } - if (c > 0) { - // Adaptation for 4:2:0 chroma subsampling - for (int i = 0; i < h274.num_intensity_intervals[c]; i++) { - h274.comp_model_value[c][i][0] >>= 1; - h274.comp_model_value[c][i][1] *= 2; - h274.comp_model_value[c][i][2] *= 2; - } - } - // Film grain synthesis is done in 8x8 blocks, but the PRNG state is // only advanced in 16x16 blocks, so use a nested loop for (int y = 0; y < height; y += 16) { @@ -271,7 +266,7 @@ int ff_h274_apply_film_grain(AVFrame *out_frame, const AVFrame *in_frame, for (int xx = 0; xx < 16 && x+xx < width; xx += 8) { generate(grain + (y+yy) * grain_stride + (x+xx), grain_stride, in + (y+yy) * in_stride + (x+xx), in_stride, - database, &h274, c, invert, (x+xx) > 0, + database, h274, c, invert, (x+xx) > 0, y_offset + yy, x_offset + xx); } }