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 30DC745948 for ; Sat, 26 Aug 2023 13:21:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61E1268C5D5; Sat, 26 Aug 2023 16:21:56 +0300 (EEST) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F6B268C493 for ; Sat, 26 Aug 2023 16:21:49 +0300 (EEST) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-3fee600dce6so16557315e9.1 for ; Sat, 26 Aug 2023 06:21:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693056108; x=1693660908; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=36h6G3puGmg89GLCFcpy8jMHpQ2z6CmL2yFDzJV/JoM=; b=K4M0NsCQsCqzrNyXzE0HqyRZ6DjqCZcfEtP0iPrae6viwcVO8aNpd59R+R1FBxTh1d J5ZjnlMUTtOL5IRRQhOt8zWOg27raWqAG5Sg2S0eZBitTxNOVXAPZ4maXubWIqz4WuIV boPmNmS+KXGicEJR6hfctZsmvo6cc426dITINkn0pEGbgQZq46hHL2Tt2+/OTpQXIXDk 0VUrFFeaYZFWIwbVZGp3RzNcCEttS8i5Qo49djjAwZ5PRQDHYJAMX6z3sZuJejrMwc1l Byes4Qj4YFFpx9k5JZQr9hlh4kkkFTbVENeiQ25OynVMddptRp4y53NUEUjvsAjTUJBC lJWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693056108; x=1693660908; 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=36h6G3puGmg89GLCFcpy8jMHpQ2z6CmL2yFDzJV/JoM=; b=BFDq3ZRTUZ8qYscqTVsJHMloAiw4S4MfLh27h7Tr/tmWFNm6nzYABkhEqEARv9vB47 3sK8Dv/aVjcWWNGSGXsHQlc2iZdkbQjEmkKKoZdy6xIaaU4Nvdxeq70QpTtOfxxiVQEF mfT7PUbGUmSQpGXWlrSOFrM2ehV9HqS+ai+LKwkaIw9h+MEEnEvG8qKlGpeRnHask8hT /7IiCp44eYI0XpOCm6PCdm2qhTbzMHvEJB5rkMMbGCjZZLVFh26VOn5YG9RN7/eAnhoe 5J6bf3zzdbhPCOqMZ9034accFzHjIrYJijYRZZ60koQCP15uNL7HtsSqHduW9ONVq+3S bG5g== X-Gm-Message-State: AOJu0Yw7j9WleNsqAgrmOhR0QaqHxKC3Qc978CIm8Jy4jfDXPONMLfAP tuAgo9lP71IGiWLAbnTUMLlkLk3fsG4= X-Google-Smtp-Source: AGHT+IFuceqenplfZM5k9NKqfpLK/5WC3V1mN7OQI7T7eqvx18xZFOuwhGrFdcFpuOK/gvXl/juuvg== X-Received: by 2002:a05:600c:2291:b0:3fe:2a98:a24c with SMTP id 17-20020a05600c229100b003fe2a98a24cmr16527638wmf.26.1693056107658; Sat, 26 Aug 2023 06:21:47 -0700 (PDT) Received: from mariano ([82.84.194.139]) by smtp.gmail.com with ESMTPSA id hn1-20020a05600ca38100b003fbe4cecc3bsm8190769wmb.16.2023.08.26.06.21.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Aug 2023 06:21:46 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id D829FBFCDA; Sat, 26 Aug 2023 15:21:45 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 26 Aug 2023 15:21:44 +0200 Message-Id: <20230826132145.159744-1-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lsws,lavfi: use sws_get_gaussian_vec 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: Stefano Sabatini Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Use in place of deprecated sws_getGaussianVec. --- libavfilter/vf_sab.c | 17 +++++++++++++---- libavfilter/vf_smartblur.c | 8 ++++---- libswscale/utils.c | 32 ++++++++++++++------------------ 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/libavfilter/vf_sab.c b/libavfilter/vf_sab.c index 5e0687c9a2..b2e42a55af 100644 --- a/libavfilter/vf_sab.c +++ b/libavfilter/vf_sab.c @@ -143,7 +143,7 @@ static int open_filter_param(FilterParam *f, int width, int height, unsigned int { SwsVector *vec; SwsFilter sws_f; - int i, x, y; + int ret, i, x, y; int linesize = FFALIGN(width, 8); f->pre_filter_buf = av_malloc(linesize * height); @@ -151,7 +151,10 @@ static int open_filter_param(FilterParam *f, int width, int height, unsigned int return AVERROR(ENOMEM); f->pre_filter_linesize = linesize; - vec = sws_getGaussianVec(f->pre_filter_radius, f->quality); + ret = sws_get_gaussian_vec(&vec, f->pre_filter_radius, f->quality); + if (ret < 0) + return ret; + sws_f.lumH = sws_f.lumV = vec; sws_f.chrH = sws_f.chrV = NULL; f->pre_filter_context = sws_getContext(width, height, AV_PIX_FMT_GRAY8, @@ -159,7 +162,10 @@ static int open_filter_param(FilterParam *f, int width, int height, unsigned int sws_flags, &sws_f, NULL, NULL); sws_freeVec(vec); - vec = sws_getGaussianVec(f->strength, 5.0); + ret = sws_get_gaussian_vec(&vec, f->strength, 5.0); + if (ret < 0) + return ret; + for (i = 0; i < COLOR_DIFF_COEFF_SIZE; i++) { double d; int index = i-COLOR_DIFF_COEFF_SIZE/2 + vec->length/2; @@ -171,7 +177,10 @@ static int open_filter_param(FilterParam *f, int width, int height, unsigned int } sws_freeVec(vec); - vec = sws_getGaussianVec(f->radius, f->quality); + ret = sws_get_gaussian_vec(&vec, f->radius, f->quality); + if (ret < 0) + return ret; + f->dist_width = vec->length; f->dist_linesize = FFALIGN(vec->length, 8); f->dist_coeff = av_malloc_array(f->dist_width, f->dist_linesize * sizeof(*f->dist_coeff)); diff --git a/libavfilter/vf_smartblur.c b/libavfilter/vf_smartblur.c index 85d8d502e1..8a4e7bf1d3 100644 --- a/libavfilter/vf_smartblur.c +++ b/libavfilter/vf_smartblur.c @@ -126,11 +126,11 @@ static int alloc_sws_context(FilterParam *f, int width, int height, unsigned int { SwsVector *vec; SwsFilter sws_filter; + int ret; - vec = sws_getGaussianVec(f->radius, f->quality); - - if (!vec) - return AVERROR(EINVAL); + ret = sws_get_gaussian_vec(&vec, f->radius, f->quality); + if (ret < 0) + return ret; sws_scaleVec(vec, f->strength); vec->coeff[vec->length / 2] += 1.0 - f->strength; diff --git a/libswscale/utils.c b/libswscale/utils.c index 96034af1e0..a315f37c6d 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -2365,24 +2365,20 @@ SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur, if (!filter) return NULL; - if (lumaGBlur != 0.0) { - filter->lumH = sws_getGaussianVec(lumaGBlur, 3.0); - filter->lumV = sws_getGaussianVec(lumaGBlur, 3.0); - } else { - filter->lumH = sws_getIdentityVec(); - filter->lumV = sws_getIdentityVec(); - } - - if (chromaGBlur != 0.0) { - filter->chrH = sws_getGaussianVec(chromaGBlur, 3.0); - filter->chrV = sws_getGaussianVec(chromaGBlur, 3.0); - } else { - filter->chrH = sws_getIdentityVec(); - filter->chrV = sws_getIdentityVec(); - } - - if (!filter->lumH || !filter->lumV || !filter->chrH || !filter->chrV) - goto fail; +#define SET_FILTER_VECTOR(name_, standard_deviation_, quality_) \ + if (standard_deviation_ != 0.0) { \ + sws_get_gaussian_vec(&filter->name_, \ + standard_deviation_, quality_); \ + } else { \ + filter->name_ = sws_getIdentityVec(); \ + } \ + if (!filter->name_) \ + goto fail; \ + + SET_FILTER_VECTOR(lumH, lumaGBlur, 3.0); + SET_FILTER_VECTOR(lumV, lumaGBlur, 3.0); + SET_FILTER_VECTOR(chrH, chromaGBlur, 3.0); + SET_FILTER_VECTOR(chrV, chromaGBlur, 3.0); if (chromaSharpen != 0.0) { SwsVector *id = sws_getIdentityVec(); -- 2.34.1 _______________________________________________ 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".