diff mbox series

[FFmpeg-devel] sws/utils.c: Do not uselessly call initFilter() when unscaling

Message ID 3785f434aebbb28f188e6b40e1454403054129b4.camel@haerdin.se
State New
Headers show
Series [FFmpeg-devel] sws/utils.c: Do not uselessly call initFilter() when unscaling | expand

Checks

Context Check Description
yinshiyou/configure_loongarch64 warning Failed to apply patch
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Tomas Härdin Jan. 31, 2023, 3:54 p.m. UTC 
Passes FATE

/Tomas

Comments

Michael Niedermayer Feb. 1, 2023, 12:25 p.m. UTC | #1 
On Tue, Jan 31, 2023 at 04:54:46PM +0100, Tomas Härdin wrote:
> Passes FATE
> 
> /Tomas

>  utils.c |   62 +++++++++++++++++++++++++++++++-------------------------------
>  1 file changed, 31 insertions(+), 31 deletions(-)
> 4d695be7739560358464400f1c7839b3646ff717  0001-sws-utils.c-Do-not-uselessly-call-initFilter-when-un.patch
> From 485b779b06085ca0b51eaf33a56f6ddade05b3c1 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <git@haerdin.se>
> Date: Tue, 31 Jan 2023 16:33:21 +0100
> Subject: [PATCH] sws/utils.c: Do not uselessly call initFilter() when
>  unscaling

LGTM

thx

[...]
Tomas Härdin Feb. 3, 2023, 9:51 a.m. UTC | #2 
ons 2023-02-01 klockan 13:25 +0100 skrev Michael Niedermayer:
> On Tue, Jan 31, 2023 at 04:54:46PM +0100, Tomas Härdin wrote:
> > Passes FATE
> > 
> > /Tomas
> 
> >  utils.c |   62 +++++++++++++++++++++++++++++++--------------------
> > -----------
> >  1 file changed, 31 insertions(+), 31 deletions(-)
> > 4d695be7739560358464400f1c7839b3646ff717  0001-sws-utils.c-Do-not-
> > uselessly-call-initFilter-when-un.patch
> > From 485b779b06085ca0b51eaf33a56f6ddade05b3c1 Mon Sep 17 00:00:00
> > 2001
> > From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <git@haerdin.se>
> > Date: Tue, 31 Jan 2023 16:33:21 +0100
> > Subject: [PATCH] sws/utils.c: Do not uselessly call initFilter()
> > when
> >  unscaling
> 
> LGTM
> 
> thx

I'll push it later today

/Tomas
Tomas Härdin Feb. 8, 2023, 2:54 p.m. UTC | #3 
fre 2023-02-03 klockan 10:51 +0100 skrev Tomas Härdin:
> ons 2023-02-01 klockan 13:25 +0100 skrev Michael Niedermayer:
> > On Tue, Jan 31, 2023 at 04:54:46PM +0100, Tomas Härdin wrote:
> > > Passes FATE
> > > 
> > > /Tomas
> > 
> > >  utils.c |   62 +++++++++++++++++++++++++++++++------------------
> > > --
> > > -----------
> > >  1 file changed, 31 insertions(+), 31 deletions(-)
> > > 4d695be7739560358464400f1c7839b3646ff717  0001-sws-utils.c-Do-
> > > not-
> > > uselessly-call-initFilter-when-un.patch
> > > From 485b779b06085ca0b51eaf33a56f6ddade05b3c1 Mon Sep 17 00:00:00
> > > 2001
> > > From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <git@haerdin.se>
> > > Date: Tue, 31 Jan 2023 16:33:21 +0100
> > > Subject: [PATCH] sws/utils.c: Do not uselessly call initFilter()
> > > when
> > >  unscaling
> > 
> > LGTM
> > 
> > thx
> 
> I'll push it later today

Pushed, somewhat late

/Tomas
diff mbox series

Patch

From 485b779b06085ca0b51eaf33a56f6ddade05b3c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <git@haerdin.se>
Date: Tue, 31 Jan 2023 16:33:21 +0100
Subject: [PATCH] sws/utils.c: Do not uselessly call initFilter() when
 unscaling

---
 libswscale/utils.c | 62 +++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 90734f66ef..925c536bf1 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1701,6 +1701,37 @@  static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter,
         }
     }
 
+    /* alpha blend special case, note this has been split via cascaded contexts if its scaled */
+    if (unscaled && !usesHFilter && !usesVFilter &&
+        c->alphablend != SWS_ALPHA_BLEND_NONE &&
+        isALPHA(srcFormat) &&
+        (c->srcRange == c->dstRange || isAnyRGB(dstFormat)) &&
+        alphaless_fmt(srcFormat) == dstFormat
+    ) {
+        c->convert_unscaled = ff_sws_alphablendaway;
+
+        if (flags & SWS_PRINT_INFO)
+            av_log(c, AV_LOG_INFO,
+                    "using alpha blendaway %s -> %s special converter\n",
+                    av_get_pix_fmt_name(srcFormat), av_get_pix_fmt_name(dstFormat));
+        return 0;
+    }
+
+    /* unscaled special cases */
+    if (unscaled && !usesHFilter && !usesVFilter &&
+        (c->srcRange == c->dstRange || isAnyRGB(dstFormat) ||
+         isFloat(srcFormat) || isFloat(dstFormat))){
+        ff_get_unscaled_swscale(c);
+
+        if (c->convert_unscaled) {
+            if (flags & SWS_PRINT_INFO)
+                av_log(c, AV_LOG_INFO,
+                       "using unscaled %s -> %s special converter\n",
+                       av_get_pix_fmt_name(srcFormat), av_get_pix_fmt_name(dstFormat));
+            return 0;
+        }
+    }
+
 #if HAVE_MMAP && HAVE_MPROTECT && defined(MAP_ANONYMOUS)
 #define USE_MMAP 1
 #else
@@ -1905,37 +1936,6 @@  static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter,
                c->chrXInc, c->chrYInc);
     }
 
-    /* alpha blend special case, note this has been split via cascaded contexts if its scaled */
-    if (unscaled && !usesHFilter && !usesVFilter &&
-        c->alphablend != SWS_ALPHA_BLEND_NONE &&
-        isALPHA(srcFormat) &&
-        (c->srcRange == c->dstRange || isAnyRGB(dstFormat)) &&
-        alphaless_fmt(srcFormat) == dstFormat
-    ) {
-        c->convert_unscaled = ff_sws_alphablendaway;
-
-        if (flags & SWS_PRINT_INFO)
-            av_log(c, AV_LOG_INFO,
-                    "using alpha blendaway %s -> %s special converter\n",
-                    av_get_pix_fmt_name(srcFormat), av_get_pix_fmt_name(dstFormat));
-        return 0;
-    }
-
-    /* unscaled special cases */
-    if (unscaled && !usesHFilter && !usesVFilter &&
-        (c->srcRange == c->dstRange || isAnyRGB(dstFormat) ||
-         isFloat(srcFormat) || isFloat(dstFormat))){
-        ff_get_unscaled_swscale(c);
-
-        if (c->convert_unscaled) {
-            if (flags & SWS_PRINT_INFO)
-                av_log(c, AV_LOG_INFO,
-                       "using unscaled %s -> %s special converter\n",
-                       av_get_pix_fmt_name(srcFormat), av_get_pix_fmt_name(dstFormat));
-            return 0;
-        }
-    }
-
     ff_sws_init_scale(c);
 
     return ff_init_filters(c);
-- 
2.30.2