From patchwork Fri Oct 8 02:30:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 30982 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp416657ioa; Thu, 7 Oct 2021 19:31:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeEOrCgj3KIQUs6TbY1r1ielYpCZ/lPdjQuT0mbv8xjNz5jiyTmfhgDdpcQ9AdELNtnKFJ X-Received: by 2002:a50:d98a:: with SMTP id w10mr11311409edj.120.1633660278754; Thu, 07 Oct 2021 19:31:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633660278; cv=none; d=google.com; s=arc-20160816; b=sTqYxYkd2oAg7fsOou0fsG04J+OkfRE6BipxgdeLD3v9qKxEKKt9szWr0opn7vXKhG BsWFIv8I5cGOjwkP81+dB+ZTWCqAu+wQuirYUVDjdqtREaeigvpkuyu54OJ45ccUqEht 3EWrF9yLU1oiZuMe7N4CMcWE6T23HKKGigJ1sSSJGMKVDwobZr5q3vIqQUvu2XsDpePT ANO+f6BCFcUZFINMnEvHpcJ1HQ0TMIRze1xvZB139w3teIPyQKeRVgfCAi7TT3YDrTto ecpSfL9nacGVaRea0/346u1W2oDLY2sEsjTzxFMc4BGvdngFzhx/F9Y6xqlTIw9JgG0H O7GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=LqF0uR0pgBMMT5b+q87BnShpmsBmLfJXnW81avPAs+w=; b=kxSQfxAc0xadkKoOFVt5/QTI3YM1/CfRLlSsTdfrRZcSRPxXsf44T+2UocY6pYnLg8 2KZCktVscp1m0RKPPgBDKZvJFQyJEDnrs3EG1BaxBCEta4jK/qmrRRiU03o8ybaJtz3g AQvv2flLTJx1MJbBUDWDsN9CwYS/A6ZBmKmI+5mfgE14ZQPk1MWX7unTHHNpNK6ZSJx7 PkqYL7RRp67+g80rlG9mMMjXORZKA35H8MOj0nxqjXLtdbWcFowDwaR4aGXWBm0Y05uf Xb5mtsvPii8F5PHs6gzhJwts09ZqXGsVW60Igys4EojT+ShZpHU6uxQkLyHy5m3W4HKq JXYg== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v2si1425777eji.679.2021.10.07.19.31.17; Thu, 07 Oct 2021 19:31:18 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8F10D689F94; Fri, 8 Oct 2021 05:31:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0EB7680B9A for ; Fri, 8 Oct 2021 05:31:06 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10130"; a="225195015" X-IronPort-AV: E=Sophos;i="5.85,356,1624345200"; d="scan'208";a="225195015" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Oct 2021 19:31:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,356,1624345200"; d="scan'208";a="489274203" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by orsmga008.jf.intel.com with ESMTP; 07 Oct 2021 19:31:03 -0700 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Oct 2021 10:30:59 +0800 Message-Id: <20211008023101.4100-1-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2 1/3] libavfilter/x86/vf_hflip: add ff_flip_byte/short_avx512() 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: Wu Jianhua MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2WZnuTa4is8f Performance(Less is better): 8bit: ff_hflip_byte_ssse3 0.61 ff_hflip_byte_avx2 0.37 ff_hflip_byte_avx512 0.19 16bit: ff_hflip_short_ssse3 1.27 ff_hflip_short_avx2 0.76 ff_hflip_short_avx512 0.40 Signed-off-by: Wu Jianhua --- libavfilter/x86/vf_hflip.asm | 23 ++++++++++++++++++----- libavfilter/x86/vf_hflip_init.c | 8 ++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/libavfilter/x86/vf_hflip.asm b/libavfilter/x86/vf_hflip.asm index 285618954f..c2237217f7 100644 --- a/libavfilter/x86/vf_hflip.asm +++ b/libavfilter/x86/vf_hflip.asm @@ -26,12 +26,16 @@ SECTION_RODATA pb_flip_byte: db 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 pb_flip_short: db 14,15,12,13,10,11,8,9,6,7,4,5,2,3,0,1 +pd_flip_indicies: dd 12,13,14,15,8,9,10,11,4,5,6,7,0,1,2,3 SECTION .text ;%1 byte or short, %2 b or w, %3 size in byte (1 for byte, 2 for short) %macro HFLIP 3 cglobal hflip_%1, 3, 5, 3, src, dst, w, r, x +%if mmsize == 64 + movu m3, [pd_flip_indicies] +%endif VBROADCASTI128 m0, [pb_flip_%1] xor xq, xq %if %3 == 1 @@ -47,12 +51,15 @@ cglobal hflip_%1, 3, 5, 3, src, dst, w, r, x .loop0: neg xq -%if mmsize == 32 - vpermq m1, [srcq + xq - mmsize + %3], 0x4e; flip each lane at load - vpermq m2, [srcq + xq - 2 * mmsize + %3], 0x4e; flip each lane at load +%if mmsize == 64 + vpermd m1, m3, [srcq + xq - mmsize + %3] + vpermd m2, m3, [srcq + xq - 2 * mmsize + %3] +%elif mmsize == 32 + vpermq m1, [srcq + xq - mmsize + %3], 0x4e; flip each lane at load + vpermq m2, [srcq + xq - 2 * mmsize + %3], 0x4e; flip each lane at load %else - movu m1, [srcq + xq - mmsize + %3] - movu m2, [srcq + xq - 2 * mmsize + %3] + movu m1, [srcq + xq - mmsize + %3] + movu m2, [srcq + xq - 2 * mmsize + %3] %endif pshufb m1, m0 pshufb m2, m0 @@ -88,3 +95,9 @@ INIT_YMM avx2 HFLIP byte, b, 1 HFLIP short, w, 2 %endif + +%if HAVE_AVX512_EXTERNAL +INIT_ZMM avx512 +HFLIP byte, b, 1 +HFLIP short, w, 2 +%endif diff --git a/libavfilter/x86/vf_hflip_init.c b/libavfilter/x86/vf_hflip_init.c index 0ac399b0d4..25fc40f7b0 100644 --- a/libavfilter/x86/vf_hflip_init.c +++ b/libavfilter/x86/vf_hflip_init.c @@ -25,8 +25,10 @@ void ff_hflip_byte_ssse3(const uint8_t *src, uint8_t *dst, int w); void ff_hflip_byte_avx2(const uint8_t *src, uint8_t *dst, int w); +void ff_hflip_byte_avx512(const uint8_t *src, uint8_t *dst, int w); void ff_hflip_short_ssse3(const uint8_t *src, uint8_t *dst, int w); void ff_hflip_short_avx2(const uint8_t *src, uint8_t *dst, int w); +void ff_hflip_short_avx512(const uint8_t *src, uint8_t *dst, int w); av_cold void ff_hflip_init_x86(FlipContext *s, int step[4], int nb_planes) { @@ -41,6 +43,9 @@ av_cold void ff_hflip_init_x86(FlipContext *s, int step[4], int nb_planes) if (EXTERNAL_AVX2_FAST(cpu_flags)) { s->flip_line[i] = ff_hflip_byte_avx2; } + if (EXTERNAL_AVX512(cpu_flags)) { + s->flip_line[i] = ff_hflip_byte_avx512; + } } else if (step[i] == 2) { if (EXTERNAL_SSSE3(cpu_flags)) { s->flip_line[i] = ff_hflip_short_ssse3; @@ -48,6 +53,9 @@ av_cold void ff_hflip_init_x86(FlipContext *s, int step[4], int nb_planes) if (EXTERNAL_AVX2_FAST(cpu_flags)) { s->flip_line[i] = ff_hflip_short_avx2; } + if (EXTERNAL_AVX512(cpu_flags)) { + s->flip_line[i] = ff_hflip_short_avx512; + } } } } From patchwork Fri Oct 8 02:31:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 30983 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp416818ioa; Thu, 7 Oct 2021 19:31:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBeG3djEJ0MRhuQPVGBifCHaBM2zVRnPj9VMwcaVDu4yAVbQB18uu/AfNtegnqdRJ/XK8W X-Received: by 2002:a17:906:7847:: with SMTP id p7mr713982ejm.335.1633660289798; Thu, 07 Oct 2021 19:31:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633660289; cv=none; d=google.com; s=arc-20160816; b=0FJjHcSjR7tnStVgJMNSMkWCh0+K4CekGBwP5xk+Lmp1j9sEvYGA0vd2Bil7/zIub4 6A96i4wG/4tSUUicnS6Gt+dGGd/GfXkEWpiMvg2kbKVfWdjaxBkRD9YqAw4mlnzsG4DA Da9/jm4yMkVlKuD3C3aSH21+6Tj6sJBTJLEbhZCSg128Y8vYN6EbcEwej/ulVUzqKS2q BUT/h9aUtC6nutxoTXU1tShQVDvaz+QYgty4jU1qfweDBJ6B2oYGXry8mJJaAcEKcW4+ uIO3q9z1hoZaOVFp2NvxR1dBLXElqWMQRnkc+du+sWd+XUS6tbOvJqWXoVPFyZspURus jxvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=g6ixFo/5eUOSK103gJFDG2UxqtGDH2ZONkxYrWjNf84=; b=RiimqB6D1cEf3f4ETZal0DhutBjFEPJ4faxnFHNy1xN1qZ/kHC0I+B5JLWLLfTcgfB ur4Uf3/iQXS/v6ek6ZMg7+LnaS0xsUqetTVp6QuKUw3Iz+i7attN1pk3e2a2WBcJe6dt W2PZcJDS6OkJxX2E/Y/N8f5gKvEiEEVC59ALv5stJTGFOXzgN+MUc4OoMTSI/hlllb5C NBxxrUtbVmsGQsCBotciErST2GIqcDKp6/J+7HcEXNOD6rjE4CVAOkolcVo5l1i/dYmb 1V8PYiRo5qN0dZ1YvpPAcX+kRGvCEaXQpLUiGyx0rnL5mhfHrtQEdOZ6LGiFNODQ7dP4 jPmA== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c11si1568695ejm.510.2021.10.07.19.31.29; Thu, 07 Oct 2021 19:31:29 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F9D6680679; Fri, 8 Oct 2021 05:31:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5139F689F08 for ; Fri, 8 Oct 2021 05:31:08 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10130"; a="225195018" X-IronPort-AV: E=Sophos;i="5.85,356,1624345200"; d="scan'208";a="225195018" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Oct 2021 19:31:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,356,1624345200"; d="scan'208";a="489274211" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by orsmga008.jf.intel.com with ESMTP; 07 Oct 2021 19:31:04 -0700 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Oct 2021 10:31:00 +0800 Message-Id: <20211008023101.4100-2-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211008023101.4100-1-jianhua.wu@intel.com> References: <20211008023101.4100-1-jianhua.wu@intel.com> Subject: [FFmpeg-devel] [PATCH v2 2/3] libavfilter/x86/vf_threshold: add ff_threshold8/16_avx512 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: Wu Jianhua MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: AMgjWQdvhljw Performance(Less is better) 8bit: ff_threshold8_sse4 32.7555351 ff_threshold8_avx2 32.1713562 ff_threshold8_avx512 32.0103531 16bit: ff_threshold16_sse4 37.7713432 ff_threshold16_avx2 35.3348312 ff_threshold16_avx512 32.6976166 Signed-off-by: Wu Jianhua --- libavfilter/x86/vf_threshold.asm | 44 +++++++++++++++++++++-------- libavfilter/x86/vf_threshold_init.c | 8 ++++++ 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/libavfilter/x86/vf_threshold.asm b/libavfilter/x86/vf_threshold.asm index 098069b083..dc4126c7af 100644 --- a/libavfilter/x86/vf_threshold.asm +++ b/libavfilter/x86/vf_threshold.asm @@ -29,6 +29,15 @@ pb_128_0 : times 8 db 0, 128 SECTION .text +%macro DECL_MASK 2 +%if mmsize < 64 + %xdefine %1 m%2 +%else + %assign %%i %2 + 1 + %xdefine %1 k %+ %%i +%endif +%endmacro + ;%1 depth (8 or 16) ; %2 b or w ; %3 constant %macro THRESHOLD 3 %if ARCH_X86_64 @@ -58,17 +67,24 @@ cglobal threshold%1, 5, 7, 5, in, threshold, min, max, out, w, x .nextrow: mov xq, wq - .loop: - movu m1, [inq + xq] - movu m0, [thresholdq + xq] - movu m2, [minq + xq] - movu m3, [maxq + xq] - pxor m0, m4 - pxor m1, m4 - pcmpgt%2 m0, m1 - PBLENDVB m3, m2, m0 - movu [outq + xq], m3 - add xq, mmsize +.loop: + movu m1, [inq + xq] + movu m0, [thresholdq + xq] + movu m2, [minq + xq] + movu m3, [maxq + xq] + pxor m0, m4 + pxor m1, m4 + DECL_MASK mask, 0 + pcmpgt%2 mask, m0, m1 + +%if mmsize == 64 + vpblendm%2 m3{mask}, m3, m2 +%else + PBLENDVB m3, m2, mask +%endif + + movu [outq + xq], m3 + add xq, mmsize jl .loop add inq, ilinesizeq @@ -90,3 +106,9 @@ INIT_YMM avx2 THRESHOLD 8, b, pb_128 THRESHOLD 16, w, pb_128_0 %endif + +%if HAVE_AVX512_EXTERNAL +INIT_ZMM avx512 +THRESHOLD 8, b, pb_128 +THRESHOLD 16, w, pb_128_0 +%endif diff --git a/libavfilter/x86/vf_threshold_init.c b/libavfilter/x86/vf_threshold_init.c index 8e42296791..0c75ea2870 100644 --- a/libavfilter/x86/vf_threshold_init.c +++ b/libavfilter/x86/vf_threshold_init.c @@ -34,8 +34,10 @@ void ff_threshold##depth##_##opt(const uint8_t *in, const uint8_t *threshold,\ THRESHOLD_FUNC(8, sse4) THRESHOLD_FUNC(8, avx2) +THRESHOLD_FUNC(8, avx512) THRESHOLD_FUNC(16, sse4) THRESHOLD_FUNC(16, avx2) +THRESHOLD_FUNC(16, avx512) av_cold void ff_threshold_init_x86(ThresholdContext *s) { @@ -48,6 +50,9 @@ av_cold void ff_threshold_init_x86(ThresholdContext *s) if (EXTERNAL_AVX2_FAST(cpu_flags)) { s->threshold = ff_threshold8_avx2; } + if (EXTERNAL_AVX512(cpu_flags)) { + s->threshold = ff_threshold8_avx512; + } } else if (s->depth == 16) { if (EXTERNAL_SSE4(cpu_flags)) { s->threshold = ff_threshold16_sse4; @@ -55,5 +60,8 @@ av_cold void ff_threshold_init_x86(ThresholdContext *s) if (EXTERNAL_AVX2_FAST(cpu_flags)) { s->threshold = ff_threshold16_avx2; } + if (EXTERNAL_AVX512(cpu_flags)) { + s->threshold = ff_threshold16_avx512; + } } } From patchwork Fri Oct 8 02:31:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 30981 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp416987ioa; Thu, 7 Oct 2021 19:31:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0GiP67STYRPLlLdMSC32O4TApWmPO0/8Jbc6ajGCgSMXtekDPbkdwlBGoFSwlsEWtVgyc X-Received: by 2002:a05:6402:4245:: with SMTP id g5mr11354161edb.158.1633660302372; Thu, 07 Oct 2021 19:31:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633660302; cv=none; d=google.com; s=arc-20160816; b=VhvkLWzERXr5K5R+Mc6NR6qCCTpDf4e6CYz7hMGyOy4F4FuvcQ9FlhAUTaUP/aSqP0 sZVPATWzmnD0qLIrZ+WH5mjir0/ZpcBDE3OtbShf3ZEQ00t6FOyR2cw2fd10DjEts1NE viASVN26CpODFSLUSVyO1/bt+Yj1tIFmDaVpM/x8Tss7TCyDkcqLog6x/Bum9YKOEkPY YySyq2NIFSAk8X8GH4xBlkDfjArPh58moHnpdLyP1UeQ/vVH/v0xOnLolczhNTGrll4Y 8JAMFZbaJIckQqQ1KajHRjZ/5raG6SyYLwHZsf14ffxRMY29lBG36qZjKsgOdW9HDe/J uuEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=a3K/Sb9an/hTorrdF801JrbQAvKt0unT3kxDZUgL340=; b=inqf38dQ4HATdYJ2SkrDJTGCYM/c8CLE1XDeyegwOfebLWDc1Pdt0zy7NPQZO/5Ewa HKA1Zcf4BmidFpvyOvY5FPMMxAj3x4zOY31AOikf0X10hLV58s1rX2D8EZqHGvgUk9rl VPsYS05ICznCku/fwRQpeT0CfUuudz1nIMWbL46pYfkKhkQrQ5DUU6KgCHhlJsoPkkw6 rMWNYtZJZAJMjmk35q8TsRD0f7DDcB+aom545J1Awr60c6i/KXgcngR2qo7BIvXauElN oWa3ZtB5iXf7XDoSPYxq/Y1xRFrv/R46aX+a4Hatm3wYq7HlgJ0FOsAot5ZpAJI/nuwY H+MA== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z20si1469119edi.541.2021.10.07.19.31.42; Thu, 07 Oct 2021 19:31:42 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6AFC668A3E8; Fri, 8 Oct 2021 05:31:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA5556803C0 for ; Fri, 8 Oct 2021 05:31:12 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10130"; a="225195021" X-IronPort-AV: E=Sophos;i="5.85,356,1624345200"; d="scan'208";a="225195021" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Oct 2021 19:31:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,356,1624345200"; d="scan'208";a="489274220" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by orsmga008.jf.intel.com with ESMTP; 07 Oct 2021 19:31:05 -0700 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Oct 2021 10:31:01 +0800 Message-Id: <20211008023101.4100-3-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211008023101.4100-1-jianhua.wu@intel.com> References: <20211008023101.4100-1-jianhua.wu@intel.com> Subject: [FFmpeg-devel] [PATCH v2 3/3] libavfilter/vf_avgblur_vulkan: fix incorrect conditional judgement 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: Wu Jianhua MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7GINMNsu3snB Signed-off-by: Wu Jianhua --- libavfilter/vf_avgblur_vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_avgblur_vulkan.c b/libavfilter/vf_avgblur_vulkan.c index 5e38a80822..93a7f0d62a 100644 --- a/libavfilter/vf_avgblur_vulkan.c +++ b/libavfilter/vf_avgblur_vulkan.c @@ -333,7 +333,7 @@ static int avgblur_vulkan_filter_frame(AVFilterLink *link, AVFrame *in) } tmp = ff_get_video_buffer(outlink, outlink->w, outlink->h); - if (!out) { + if (!tmp) { err = AVERROR(ENOMEM); goto fail; }