From patchwork Thu Jun 10 15:13:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 28197 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp597775iol; Thu, 10 Jun 2021 08:13:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxdc7X+NMOu2PU65mf0KNgbqnPUpvHfemRZPxtiyKOqolmgHBML34CN/DyMFieMqxWGEBf5 X-Received: by 2002:a05:6402:18c:: with SMTP id r12mr5408098edv.10.1623338033900; Thu, 10 Jun 2021 08:13:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623338033; cv=none; d=google.com; s=arc-20160816; b=01v2/Sen/cLaGs4XZkXGTy3Ys0etw8W7dfZX3rTliS85PKWw7TkwR6bPUQLY3HEsZa epq96jst1KXxLxI9+Ojw6OqiHahIq93DtGqZK+WF2GXThi0dqdejG+N+gZOaLguXbsD8 vKaHedc58O8r0lVv6q02JoeB3bDXpbQ17ZZ0TOSoPXbI1riTpTaKyXnUvhOvpws0jX9a fMApFOSOrJEjrjoTo47SYcDgp94g9fnZPTswpBeM89915yZmb3FpSAdhaRlYiUaV7x/a DrXF8Spwos99v75uzRg8k0qvqIleS5cfWYm+Q2qONn6IUiAD1f18vQ99SDJ4nynaNddj /kdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:delivered-to; bh=KrfqkGtmo7VKZjFfJIIiX/SNik92TF9d5ei8ZKaoBfw=; b=I9jU7Cl5+Yh7+5KlkvxSmaSJwge0uv3p6fh/x3lVk6EnhWKhSk3v4BDtrEClV+YThT d+UN6dK5H0sPvqZ1okdQaPNf3CmkmL1+lRqTJWzF6zw35HqSTvCgQSfWF7i3QUaS9sly gPswFUiCyz351BR/WM5YsXK+2izPGwNgAy22cPTi/F4K2UVxcXABUbhdcBJWHCjWigrF KbSLvZdfsOnDMG2o6sp5Qr+GadVPprvavn0k/aU04q/emB/u+rkUvs3jwyanLrUuDobZ JOdrH+6nf690fx5QzElGznsA5XtSz0Ad7vLvOBjw0/Ea/ee9Ok82JfUm+uorydvWsmE/ gEMQ== ARC-Authentication-Results: i=1; mx.google.com; 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 z21si2484171ejf.623.2021.06.10.08.13.53; Thu, 10 Jun 2021 08:13:53 -0700 (PDT) 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; 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 3B08A680BBE; Thu, 10 Jun 2021 18:13:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A5D4680831 for ; Thu, 10 Jun 2021 18:13:43 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 24F41240476 for ; Thu, 10 Jun 2021 17:13:43 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id n9ExQbrrDarf for ; Thu, 10 Jun 2021 17:13:42 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 1C8C124042A for ; Thu, 10 Jun 2021 17:13:42 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 0FF903A1098; Thu, 10 Jun 2021 17:13:42 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Jun 2021 17:13:23 +0200 Message-Id: <20210610151322.7786-1-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210601124148.GG4777@pb2> References: <20210601124148.GG4777@pb2> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] sws: rename SwsContext.swscale to convert_unscaled 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: v9F5u61ODR/t That function pointer is now used only for unscaled conversion. --- libswscale/aarch64/swscale_unscaled.c | 2 +- libswscale/arm/swscale_unscaled.c | 6 +-- libswscale/ppc/yuv2yuv_altivec.c | 4 +- libswscale/swscale.c | 5 +- libswscale/swscale_internal.h | 6 +-- libswscale/swscale_unscaled.c | 68 +++++++++++++-------------- libswscale/utils.c | 4 +- 7 files changed, 48 insertions(+), 47 deletions(-) diff --git a/libswscale/aarch64/swscale_unscaled.c b/libswscale/aarch64/swscale_unscaled.c index c7a2a1037d..b3093bbc9d 100644 --- a/libswscale/aarch64/swscale_unscaled.c +++ b/libswscale/aarch64/swscale_unscaled.c @@ -102,7 +102,7 @@ DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nv21) && !(c->srcH & 1) \ && !(c->srcW & 15) \ && !accurate_rnd) \ - c->swscale = ifmt##_to_##ofmt##_neon_wrapper; \ + c->convert_unscaled = ifmt##_to_##ofmt##_neon_wrapper; \ } while (0) #define SET_FF_NVX_TO_ALL_RGBX_FUNC(nvx, NVX, accurate_rnd) do { \ diff --git a/libswscale/arm/swscale_unscaled.c b/libswscale/arm/swscale_unscaled.c index e41f294eac..910610b86e 100644 --- a/libswscale/arm/swscale_unscaled.c +++ b/libswscale/arm/swscale_unscaled.c @@ -147,7 +147,7 @@ DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nv21) && !(c->srcH & 1) \ && !(c->srcW & 15) \ && !accurate_rnd) { \ - c->swscale = ifmt##_to_##ofmt##_neon_wrapper; \ + c->convert_unscaled = ifmt##_to_##ofmt##_neon_wrapper; \ } \ } while (0) @@ -163,8 +163,8 @@ static void get_unscaled_swscale_neon(SwsContext *c) { if (c->srcFormat == AV_PIX_FMT_RGBA && c->dstFormat == AV_PIX_FMT_NV12 && (c->srcW >= 16)) { - c->swscale = accurate_rnd ? rgbx_to_nv12_neon_32_wrapper - : rgbx_to_nv12_neon_16_wrapper; + c->convert_unscaled = accurate_rnd ? rgbx_to_nv12_neon_32_wrapper + : rgbx_to_nv12_neon_16_wrapper; } SET_FF_NVX_TO_ALL_RGBX_FUNC(nv12, NV12, accurate_rnd); diff --git a/libswscale/ppc/yuv2yuv_altivec.c b/libswscale/ppc/yuv2yuv_altivec.c index 2b1c5dd3b8..728e4d210c 100644 --- a/libswscale/ppc/yuv2yuv_altivec.c +++ b/libswscale/ppc/yuv2yuv_altivec.c @@ -196,9 +196,9 @@ av_cold void ff_get_unscaled_swscale_ppc(SwsContext *c) // unscaled YV12 -> packed YUV, we want speed if (dstFormat == AV_PIX_FMT_YUYV422) - c->swscale = yv12toyuy2_unscaled_altivec; + c->convert_unscaled = yv12toyuy2_unscaled_altivec; else if (dstFormat == AV_PIX_FMT_UYVY422) - c->swscale = yv12touyvy_unscaled_altivec; + c->convert_unscaled = yv12touyvy_unscaled_altivec; } #endif /* HAVE_ALTIVEC */ } diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 4b577ef263..75226a29e4 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -987,8 +987,9 @@ int attribute_align_arg sws_scale(struct SwsContext *c, if (srcSliceY_internal + srcSliceH == c->srcH) c->sliceDir = 0; - if (c->swscale) - ret = c->swscale(c, src2, srcStride2, srcSliceY_internal, srcSliceH, dst2, dstStride2); + if (c->convert_unscaled) + ret = c->convert_unscaled(c, src2, srcStride2, srcSliceY_internal, srcSliceH, + dst2, dstStride2); else ret = swscale(c, src2, srcStride2, srcSliceY_internal, srcSliceH, dst2, dstStride2); diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 02a45e7adb..a4813940d6 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -290,7 +290,7 @@ typedef struct SwsContext { * Note that src, dst, srcStride, dstStride will be copied in the * sws_scale() wrapper so they can be freely modified here. */ - SwsFunc swscale; + SwsFunc convert_unscaled; int srcW; ///< Width of source luma/alpha planes. int srcH; ///< Height of source luma/alpha planes. int dstH; ///< Height of destination luma/alpha planes. @@ -864,8 +864,8 @@ extern const int32_t ff_yuv2rgb_coeffs[11][4]; extern const AVClass ff_sws_context_class; /** - * Set c->swscale to an unscaled converter if one exists for the specific - * source and destination formats, bit depths, flags, etc. + * Set c->convert_unscaled to an unscaled converter if one exists for the + * specific source and destination formats, bit depths, flags, etc. */ void ff_get_unscaled_swscale(SwsContext *c); void ff_get_unscaled_swscale_ppc(SwsContext *c); diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index e8e297509b..1aee3565ab 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1988,28 +1988,28 @@ void ff_get_unscaled_swscale(SwsContext *c) /* yv12_to_nv12 */ if ((srcFormat == AV_PIX_FMT_YUV420P || srcFormat == AV_PIX_FMT_YUVA420P) && (dstFormat == AV_PIX_FMT_NV12 || dstFormat == AV_PIX_FMT_NV21)) { - c->swscale = planarToNv12Wrapper; + c->convert_unscaled = planarToNv12Wrapper; } /* yv24_to_nv24 */ if ((srcFormat == AV_PIX_FMT_YUV444P || srcFormat == AV_PIX_FMT_YUVA444P) && (dstFormat == AV_PIX_FMT_NV24 || dstFormat == AV_PIX_FMT_NV42)) { - c->swscale = planarToNv24Wrapper; + c->convert_unscaled = planarToNv24Wrapper; } /* nv12_to_yv12 */ if (dstFormat == AV_PIX_FMT_YUV420P && (srcFormat == AV_PIX_FMT_NV12 || srcFormat == AV_PIX_FMT_NV21)) { - c->swscale = nv12ToPlanarWrapper; + c->convert_unscaled = nv12ToPlanarWrapper; } /* nv24_to_yv24 */ if (dstFormat == AV_PIX_FMT_YUV444P && (srcFormat == AV_PIX_FMT_NV24 || srcFormat == AV_PIX_FMT_NV42)) { - c->swscale = nv24ToPlanarWrapper; + c->convert_unscaled = nv24ToPlanarWrapper; } /* yuv2bgr */ if ((srcFormat == AV_PIX_FMT_YUV420P || srcFormat == AV_PIX_FMT_YUV422P || srcFormat == AV_PIX_FMT_YUVA420P) && isAnyRGB(dstFormat) && !(flags & SWS_ACCURATE_RND) && (c->dither == SWS_DITHER_BAYER || c->dither == SWS_DITHER_AUTO) && !(dstH & 1)) { - c->swscale = ff_yuv2rgb_get_func_ptr(c); + c->convert_unscaled = ff_yuv2rgb_get_func_ptr(c); } /* yuv420p1x_to_p01x */ if ((srcFormat == AV_PIX_FMT_YUV420P10 || srcFormat == AV_PIX_FMT_YUVA420P10 || @@ -2017,35 +2017,35 @@ void ff_get_unscaled_swscale(SwsContext *c) srcFormat == AV_PIX_FMT_YUV420P14 || srcFormat == AV_PIX_FMT_YUV420P16 || srcFormat == AV_PIX_FMT_YUVA420P16) && (dstFormat == AV_PIX_FMT_P010 || dstFormat == AV_PIX_FMT_P016)) { - c->swscale = planarToP01xWrapper; + c->convert_unscaled = planarToP01xWrapper; } /* yuv420p_to_p01xle */ if ((srcFormat == AV_PIX_FMT_YUV420P || srcFormat == AV_PIX_FMT_YUVA420P) && (dstFormat == AV_PIX_FMT_P010LE || dstFormat == AV_PIX_FMT_P016LE)) { - c->swscale = planar8ToP01xleWrapper; + c->convert_unscaled = planar8ToP01xleWrapper; } if (srcFormat == AV_PIX_FMT_YUV410P && !(dstH & 3) && (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P) && !(flags & SWS_BITEXACT)) { - c->swscale = yvu9ToYv12Wrapper; + c->convert_unscaled = yvu9ToYv12Wrapper; } /* bgr24toYV12 */ if (srcFormat == AV_PIX_FMT_BGR24 && (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P) && !(flags & SWS_ACCURATE_RND) && !(dstW&1)) - c->swscale = bgr24ToYv12Wrapper; + c->convert_unscaled = bgr24ToYv12Wrapper; /* RGB/BGR -> RGB/BGR (no dither needed forms) */ if (isAnyRGB(srcFormat) && isAnyRGB(dstFormat) && findRgbConvFn(c) && (!needsDither || (c->flags&(SWS_FAST_BILINEAR|SWS_POINT)))) - c->swscale = rgbToRgbWrapper; + c->convert_unscaled = rgbToRgbWrapper; /* RGB to planar RGB */ if ((srcFormat == AV_PIX_FMT_GBRP && dstFormat == AV_PIX_FMT_GBRAP) || (srcFormat == AV_PIX_FMT_GBRAP && dstFormat == AV_PIX_FMT_GBRP)) - c->swscale = planarRgbToplanarRgbWrapper; + c->convert_unscaled = planarRgbToplanarRgbWrapper; #define isByteRGB(f) ( \ f == AV_PIX_FMT_RGB32 || \ @@ -2056,10 +2056,10 @@ void ff_get_unscaled_swscale(SwsContext *c) f == AV_PIX_FMT_BGR24) if (srcFormat == AV_PIX_FMT_GBRP && isPlanar(srcFormat) && isByteRGB(dstFormat)) - c->swscale = planarRgbToRgbWrapper; + c->convert_unscaled = planarRgbToRgbWrapper; if (srcFormat == AV_PIX_FMT_GBRAP && isByteRGB(dstFormat)) - c->swscale = planarRgbaToRgbWrapper; + c->convert_unscaled = planarRgbaToRgbWrapper; if ((srcFormat == AV_PIX_FMT_RGB48LE || srcFormat == AV_PIX_FMT_RGB48BE || srcFormat == AV_PIX_FMT_BGR48LE || srcFormat == AV_PIX_FMT_BGR48BE || @@ -2073,7 +2073,7 @@ void ff_get_unscaled_swscale(SwsContext *c) dstFormat == AV_PIX_FMT_GBRAP10LE || dstFormat == AV_PIX_FMT_GBRAP10BE || dstFormat == AV_PIX_FMT_GBRAP12LE || dstFormat == AV_PIX_FMT_GBRAP12BE || dstFormat == AV_PIX_FMT_GBRAP16LE || dstFormat == AV_PIX_FMT_GBRAP16BE )) - c->swscale = Rgb16ToPlanarRgb16Wrapper; + c->convert_unscaled = Rgb16ToPlanarRgb16Wrapper; if ((srcFormat == AV_PIX_FMT_GBRP9LE || srcFormat == AV_PIX_FMT_GBRP9BE || srcFormat == AV_PIX_FMT_GBRP16LE || srcFormat == AV_PIX_FMT_GBRP16BE || @@ -2087,19 +2087,19 @@ void ff_get_unscaled_swscale(SwsContext *c) dstFormat == AV_PIX_FMT_BGR48LE || dstFormat == AV_PIX_FMT_BGR48BE || dstFormat == AV_PIX_FMT_RGBA64LE || dstFormat == AV_PIX_FMT_RGBA64BE || dstFormat == AV_PIX_FMT_BGRA64LE || dstFormat == AV_PIX_FMT_BGRA64BE)) - c->swscale = planarRgb16ToRgb16Wrapper; + c->convert_unscaled = planarRgb16ToRgb16Wrapper; if (av_pix_fmt_desc_get(srcFormat)->comp[0].depth == 8 && isPackedRGB(srcFormat) && dstFormat == AV_PIX_FMT_GBRP) - c->swscale = rgbToPlanarRgbWrapper; + c->convert_unscaled = rgbToPlanarRgbWrapper; if (isBayer(srcFormat)) { if (dstFormat == AV_PIX_FMT_RGB24) - c->swscale = bayer_to_rgb24_wrapper; + c->convert_unscaled = bayer_to_rgb24_wrapper; else if (dstFormat == AV_PIX_FMT_RGB48) - c->swscale = bayer_to_rgb48_wrapper; + c->convert_unscaled = bayer_to_rgb48_wrapper; else if (dstFormat == AV_PIX_FMT_YUV420P) - c->swscale = bayer_to_yv12_wrapper; + c->convert_unscaled = bayer_to_yv12_wrapper; else if (!isBayer(dstFormat)) { av_log(c, AV_LOG_ERROR, "unsupported bayer conversion\n"); av_assert0(0); @@ -2154,31 +2154,31 @@ void ff_get_unscaled_swscale(SwsContext *c) IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV444P12) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV444P14) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV444P16)) - c->swscale = bswap_16bpc; + c->convert_unscaled = bswap_16bpc; /* bswap 32 bits per pixel/component formats */ if (IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRPF32) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRAPF32)) - c->swscale = bswap_32bpc; + c->convert_unscaled = bswap_32bpc; if (usePal(srcFormat) && isByteRGB(dstFormat)) - c->swscale = palToRgbWrapper; + c->convert_unscaled = palToRgbWrapper; if (srcFormat == AV_PIX_FMT_YUV422P) { if (dstFormat == AV_PIX_FMT_YUYV422) - c->swscale = yuv422pToYuy2Wrapper; + c->convert_unscaled = yuv422pToYuy2Wrapper; else if (dstFormat == AV_PIX_FMT_UYVY422) - c->swscale = yuv422pToUyvyWrapper; + c->convert_unscaled = yuv422pToUyvyWrapper; } /* uint Y to float Y */ if (srcFormat == AV_PIX_FMT_GRAY8 && dstFormat == AV_PIX_FMT_GRAYF32){ - c->swscale = uint_y_to_float_y_wrapper; + c->convert_unscaled = uint_y_to_float_y_wrapper; } /* float Y to uint Y */ if (srcFormat == AV_PIX_FMT_GRAYF32 && dstFormat == AV_PIX_FMT_GRAY8){ - c->swscale = float_y_to_uint_y_wrapper; + c->convert_unscaled = float_y_to_uint_y_wrapper; } /* LQ converters if -sws 0 or -sws 4*/ @@ -2186,21 +2186,21 @@ void ff_get_unscaled_swscale(SwsContext *c) /* yv12_to_yuy2 */ if (srcFormat == AV_PIX_FMT_YUV420P || srcFormat == AV_PIX_FMT_YUVA420P) { if (dstFormat == AV_PIX_FMT_YUYV422) - c->swscale = planarToYuy2Wrapper; + c->convert_unscaled = planarToYuy2Wrapper; else if (dstFormat == AV_PIX_FMT_UYVY422) - c->swscale = planarToUyvyWrapper; + c->convert_unscaled = planarToUyvyWrapper; } } if (srcFormat == AV_PIX_FMT_YUYV422 && (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P)) - c->swscale = yuyvToYuv420Wrapper; + c->convert_unscaled = yuyvToYuv420Wrapper; if (srcFormat == AV_PIX_FMT_UYVY422 && (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P)) - c->swscale = uyvyToYuv420Wrapper; + c->convert_unscaled = uyvyToYuv420Wrapper; if (srcFormat == AV_PIX_FMT_YUYV422 && dstFormat == AV_PIX_FMT_YUV422P) - c->swscale = yuyvToYuv422Wrapper; + c->convert_unscaled = yuyvToYuv422Wrapper; if (srcFormat == AV_PIX_FMT_UYVY422 && dstFormat == AV_PIX_FMT_YUV422P) - c->swscale = uyvyToYuv422Wrapper; + c->convert_unscaled = uyvyToYuv422Wrapper; #define isPlanarGray(x) (isGray(x) && (x) != AV_PIX_FMT_YA8 && (x) != AV_PIX_FMT_YA16LE && (x) != AV_PIX_FMT_YA16BE) /* simple copy */ @@ -2216,9 +2216,9 @@ void ff_get_unscaled_swscale(SwsContext *c) !isSemiPlanarYUV(srcFormat) && !isSemiPlanarYUV(dstFormat)))) { if (isPacked(c->srcFormat)) - c->swscale = packedCopyWrapper; + c->convert_unscaled = packedCopyWrapper; else /* Planar YUV or gray */ - c->swscale = planarCopyWrapper; + c->convert_unscaled = planarCopyWrapper; } if (ARCH_PPC) diff --git a/libswscale/utils.c b/libswscale/utils.c index 42bef3753f..1113d9099b 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1821,7 +1821,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, (c->srcRange == c->dstRange || isAnyRGB(dstFormat)) && alphaless_fmt(srcFormat) == dstFormat ) { - c->swscale = ff_sws_alphablendaway; + c->convert_unscaled = ff_sws_alphablendaway; if (flags & SWS_PRINT_INFO) av_log(c, AV_LOG_INFO, @@ -1836,7 +1836,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, isFloat(srcFormat) || isFloat(dstFormat))){ ff_get_unscaled_swscale(c); - if (c->swscale) { + if (c->convert_unscaled) { if (flags & SWS_PRINT_INFO) av_log(c, AV_LOG_INFO, "using unscaled %s -> %s special converter\n",