diff mbox series

[FFmpeg-devel,1/2] lsws,lavfi: use sws_get_gaussian_vec

Message ID 20230826132145.159744-1-stefasab@gmail.com
State New
Headers show
Series [FFmpeg-devel,1/2] lsws,lavfi: use sws_get_gaussian_vec | expand

Checks

Context Check Description
andriy/make_x86 fail Make failed
yinshiyou/make_loongarch64 fail Make failed

Commit Message

Stefano Sabatini Aug. 26, 2023, 1:21 p.m. UTC 
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(-)

Comments

Andreas Rheinhardt Aug. 26, 2023, 3:13 p.m. UTC | #1 
Stefano Sabatini:
> Use in place of deprecated sws_getGaussianVec.

This patchset should have been sent as a reply to the patch actually
adding sws_get_gaussian_vec.

> ---
>  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);

This will check lumaGBlur/chromaGBlur twice.

>  
>      if (chromaSharpen != 0.0) {
>          SwsVector *id = sws_getIdentityVec();
Michael Niedermayer Aug. 26, 2023, 6:02 p.m. UTC | #2 
Hi Stefano

On Sat, Aug 26, 2023 at 03:21:44PM +0200, Stefano Sabatini wrote:
> 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(-)
> 

[...]
> @@ -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);

Doesnt the old code look cleaner/simpler ?

The macro makes this a bit harder to read

thx

[...]
Stefano Sabatini Aug. 31, 2023, 3:34 p.m. UTC | #3 
On date Saturday 2023-08-26 17:13:19 +0200, Andreas Rheinhardt wrote:
> Stefano Sabatini:
> > Use in place of deprecated sws_getGaussianVec.
> 

> This patchset should have been sent as a reply to the patch actually
> adding sws_get_gaussian_vec.

Noted.

> > ---
> >  libavfilter/vf_sab.c       | 17 +++++++++++++----
> >  libavfilter/vf_smartblur.c |  8 ++++----
> >  libswscale/utils.c         | 32 ++++++++++++++------------------
> >  3 files changed, 31 insertions(+), 26 deletions(-)
> > 
[...]
> > -    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);
> 
> This will check lumaGBlur/chromaGBlur twice.

Dropped the macro and updated.
diff mbox series

Patch

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();