diff mbox series

[FFmpeg-devel,v2,3/4] libswscale/utils: simplify the default scaler logic

Message ID 20210802164904.70998-3-fulinjie@zju.edu.cn
State New
Headers show
Series [FFmpeg-devel,v2,1/4] FATE: Update test refs for scale used in filter complex | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Linjie Fu Aug. 2, 2021, 4:49 p.m. UTC 
From: Linjie Fu <linjie.justin.fu@gmail.com>

Signed-off-by: Linjie Fu <linjie.justin.fu@gmail.com>
---
 libswscale/utils.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Nicolas George Aug. 2, 2021, 5:02 p.m. UTC | #1 
Linjie Fu (12021-08-03):
> From: Linjie Fu <linjie.justin.fu@gmail.com>
> 
> Signed-off-by: Linjie Fu <linjie.justin.fu@gmail.com>
> ---
>  libswscale/utils.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)

Nack. The original logic needs to be evaluated to see if the others
scalers are better.

Regards,
Linjie Fu Aug. 3, 2021, 4:18 p.m. UTC | #2 
On Tue, Aug 3, 2021 at 1:02 AM Nicolas George <george@nsup.org> wrote:

> Linjie Fu (12021-08-03):
> > From: Linjie Fu <linjie.justin.fu@gmail.com>
> >
> > Signed-off-by: Linjie Fu <linjie.justin.fu@gmail.com>
> > ---
> >  libswscale/utils.c | 7 +------
> >  1 file changed, 1 insertion(+), 6 deletions(-)
>
> Nack. The original logic needs to be evaluated to see if the others
> scalers are better.
>

Okay, I'll leave it as is for now until we get enough evaluations.

- linjie
diff mbox series

Patch

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 176fc6fd63..dea3b76eb3 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1250,12 +1250,7 @@  av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
 
     /* provide a default scaler if not set by caller */
     if (!i) {
-        if (dstW < srcW && dstH < srcH)
-            flags |= SWS_BICUBIC;
-        else if (dstW > srcW && dstH > srcH)
-            flags |= SWS_BICUBIC;
-        else
-            flags |= SWS_BICUBIC;
+        flags |= SWS_BICUBIC;
         c->flags = flags;
     } else if (i & (i - 1)) {
         av_log(c, AV_LOG_ERROR,