From patchwork Sun Nov 6 16:27:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39207 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1636012pzb; Sun, 6 Nov 2022 08:28:07 -0800 (PST) X-Google-Smtp-Source: AMsMyM5a09nJbLl/jdxD0JU7G+rGxFcljh0WH8Otl+tM83j55OIRv62mBrXY/iHIxUmDU0vriGiG X-Received: by 2002:a17:907:3e87:b0:7ae:46a8:af0a with SMTP id hs7-20020a1709073e8700b007ae46a8af0amr8471445ejc.554.1667752087005; Sun, 06 Nov 2022 08:28:07 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id du10-20020a17090772ca00b007ae17fd2f2dsi7029455ejc.996.2022.11.06.08.28.06; Sun, 06 Nov 2022 08:28:06 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=utdfQxLR; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE52068B743; Sun, 6 Nov 2022 18:28:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2072.outbound.protection.outlook.com [40.92.91.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C61B668B4EF for ; Sun, 6 Nov 2022 18:27:54 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MfIxjqoD3l6XTmSRLDVRJtIqZynRtxT5iOZgLHSMXrMPdqJCUAtHUIJ+EZRzIr6u4SBPS4WHGjvI9tAcaXVD1F9fdOLyCFK16BGu7kAc+wdwTq/ykzBqUoF9xxwq/XHKg7t9EIjasLVWC5f96zM3p3L6gJefKnS1THKq8hWjQlStrPr8k7I1hXXPxgOd4izDTPvcuBe8zwJvAQieMcAb+mg7MdHMdEMzD/AeQTms7/HdKacdRpBbCqhGvPl91H3NeCsRNpTGbtx4Mljll5Lb0mUpr8y5GftX+3w9/248OL5iL67naxS4lrVuT9CkCVuXer29gF4zYHQru9UD8TDxHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=safPHWT9tI6uwD2YAfdPlr0JfG+1RfA8WJe0ocuT6ps=; b=fdkgMXUV9cblRshX97/z6VLsw7y7ZZpxNeYJKG2XU2KefNseAsih8hkIR91Bfr9UYUaSRRdUretkl4RrNhdJO4Td+AN9aA3Soc02NUkxBCCW9D/ALGsArjc87jjsuodkeRF2Bcpd8E07Pquoy1w2zsdn6H3W2KLwAKFmukStL1RxOgOPjEJ4B9T2xJpN+RYmIHc1otopAw2EF531qYnU5He9NNb1C3d8Hn9ypaozbXThw2ZMDIQoMeLpnRhQvdBBN3yVrImKpVwstNaAiAK35afWYCC4/pkxLmsNHULWt8j9+v0z8+p/NACZgAiFCdB86BIq7uEi7wCapkbv768zPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=safPHWT9tI6uwD2YAfdPlr0JfG+1RfA8WJe0ocuT6ps=; b=utdfQxLRVTJhUurYy/uFVh00AndL+FdjBF+JSdIsezfeTnBdYZmPLx2lN6RmVTyypTA7IC0sDrt/o/d2zOCtdy2xOmoPR8YT6Wa4QhHnSPoSnZK5rrNqtY9zSFGUj14HwR4llEGQ3n05vje7w+xpMYBaRnvQkmKbE0/XJf/nDQ2Gyq6yBNXIapxAkCIbwNmTEt+NP+103NrBwr+aWd2qkqk5LrAM6uDp4wpVY1JnNGjFuBmQRkw2jqMmwCqZJgWL92FXdEmmv03aA+pzJqmXV137AwwHWYl/kdreN2VUFOoMtXve+HuMsmiGpM6a1Ick8nEAQzerZBAoh80crY6hQA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0458.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:346::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.25; Sun, 6 Nov 2022 16:27:52 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe%4]) with mapi id 15.20.5791.026; Sun, 6 Nov 2022 16:27:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Nov 2022 17:27:51 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [f6+FAHsYD+QVk74c+JGlzm9ytHoYUa73K1yP898kUHc=] X-ClientProxiedBy: AM6PR08CA0003.eurprd08.prod.outlook.com (2603:10a6:20b:b2::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221106162757.1130672-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0458:EE_ X-MS-Office365-Filtering-Correlation-Id: 03696443-d046-450b-24ec-08dac013d9ff X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqxUC2t/XAH2JXAVSoE8CDQ9btVJgLVHZKyThm+MB8ktpUjnaYPIOHErtKgk/2qitelelkXF8hvf44IRp4Mt2k1Opo8NZI5OGrkuoQezf3nu9CiSgSEvStDIHFMpjl8WgFi2cdZapSPArVGGAyQKKv935ddLPyuc26xl4B5XwcFnxZVTYIfCF5nEuuvWXhVovnrpEC0cyGPSaLQfpRaHohvgTWRCDxIXUnm2A3JlKkOVLKpJw8KV2sTXmv+aixmkAy4bQz7WpLfUbCFBojUmZ/DQdvrAoJlAk069oPT32f6MekbvySTCdWoKlMIKXUNhm2FM7sUj7tdRd6Ydq6XI14/n56mKHvjQkxwfR/8Z5fmMffmILJ2mhVZuDkoOTTuGb4rlIbxFURaZ8Rd5ZXhhazs6OzGJLDtSnPOkzACxsxaO6j7uI1288mUPMIWAEfslbFwAfcQzA4iILtidkD9cqxrjo0+rwvUlWmVG9rXEIM5si8+WqZO7jN7swO0YVvkBoZx8bMdwCymq/RYRq/rOgpCPix+D/HauD+5Cv/5QUBpCfJxxI7OAY2DZ34DW80d0wwki7PMHM2/5ykpZh0PSUWN7VnQ6lK5WqfdD6+DqMaEnDdLLXpx34b6se9gi3NmoFEW6rxRbmjDS5r5l/zCoDvq31XrxsyCoHlpVpwV1bJwsH4/RtYOsl+qvxGdb1fM844iiMpyvtLD9h1lcCw13Q8a8XmzEGUJoRR4JvI0Jb1WMxbdvhHcwxsz+yRToblbu7A= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E67XT14TG80O2YHSbL2as4hvNe1UgZd2tjFwZuYZy4yX5YyUKgw+kPoOdwAzCio7cs38xhTJPupWSZ9aqwaJBwDm2rnakwDRubJ3/OsxUb9RilKNC6ez9DEh+MY0nhTyrlGA6eq8AbPzZm0Mzm+VlslgOpCBrktUpLfPchByJaEPI0x7oJrK8hz+9nD73zSoKaIsqpJpl5okpz3wtSpAKK8mx1q2/dWYR4l8ZWhU91kBy/LfpunvxBGqGwwx7Zf+Rj1MHOddk24hLtHlUQogEAHRU/6T9+w+X8vuIY5q/f8fYCpUpmBPc74MMqTXSdQEBo0LVNcxMwI/q8Whi3UEMUJvGb3KRspNpOdHF6gfkvJLt5K0BEeTRpLbt0msELwIWfvwFzsk4LpcbKAVVf8tBlzZfUwFB0R21WZmohEP7vViMj4YHovYWuqBkxArq3B07T1SbMcMydsYd3VVS8tbs8r1umz03GpeKSJZ3f9OKLCdSoDN/eHuUDZCUHqEOSEOdz/dnUvWFHmXs8N9EZRbd/tbQ2Y9AAn7HNyLbqEHUGbQGvpHSaNOxx8jl32fQqvFF5BoIgxbkksNUkJn1VDqeVV6UCKxDHjoCfE7SJ0qxuzATs9GjiVPGP/Uj4UsnsUp9iCAXTKn397eYOcI1XcfVgQtXOQsP2hO2M+Av7o/1rtVUmKYFEH0OwoIO+aULmIF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6C6PSS2tv4pq+EHingyWfRGTsk56uWqvKXYZ7NbHxiouKKcL2aEXgRI2NkL8qyXKovzthz0sWrnJauyf2uEoanRYFGmg9VnmQBrCG0ULQZbM+cAc1Mapr0wXo0A697tXvzlWvReYBsukodSxbL2RAjYZS094XcHYV6o7jYpjQoIciG46xo9Ru6Vp2WNLlx8yGPsbSRHP9vF1MUPpGBKZAwx4zFZpNKgtJik29bPQby/itKuMGQBocLXXGjX85yEpniGA9iJLCu6mleAiUhtCCT0VWc7YvoHjUUAo0mZuvTQTTjfq6qpcnIiPtzc23j/+zw+Yfa4wT88byhfHsjAoWHoVaXZOyYglYBqvTHx8XyUWpDZ4TfXq2dlUtXAp7hDovCq+NoKE2wmVKBYBThi4xU/Od8wVodmQtR6ofRCTAumCg5OLCc7wyGLPUXv1fonh8o51rD/Gctj/7AmfNfbxRhF/ooLlYrKnSlegISdYzLzEPSNNMPpytyqysOUYQv1ZgYlIINDAFvumhx29+AwzXHsIXHF6qx66qk2DhJuy4TPRoV6ZGwOA7C/U3B1EDKpDoX0zypoif2R/cwKcKcX4zFibUESble1uWxFzcTWMV7OeqZvVHGLO7TLmnIXW5apjvyUH+qLmnoO9tShZDNT5O2eSRiCF4fvBmFGD086IHaYpL9lTWBDRl95pTkZlxgnkR9bYv354eUuU4NEAMNw+LNPcztmP8oLZWU7nKaDxpFheItXom2Sa5kpU3w/zmOReTymEWNUYgDt5uKYIWdDmuHiXMpEvhewB4lPfzJoBuGYR37l6YJFilRKdVARJGt2PSDqcdErvjGRogfHLA8QKICl8TPNjgw6QFJrFVGVpyNp0RulujXxWAcwNo5cvdRuGnb/CnXoREZDORw/4LRCRc4rCiO1acOJeVt5389qVW4Zf9SCRXwsaMU7ISZ1mpNPyv6M6brVyNLAT184Lc/Wx9Kdh6hJOmVjGyvTsIAaJr9iLwXPmOHjnyCrgVTt5o0uIvgRqpzhdPG+ujJY4ZpZtRrWD7x9/cCpfcQZ9EHQgXxj8b5JBQiRQx3UTl5eeKiTCaFIF7nTvdl5XLFPytDUiJildrnDihMzXyugnLIkEGdfRJVVtM6T5BTJpf0qg7i4+pTXIIfQr/bmT18w6L63eMKWyiD57xsWKBQSSlENpYC/4tA4ErIZ43zyCl8J0lZEWg/fFZrF8KP52Fy8sYz9XKzt4gMdFjXEf6kA8JBTZS/kTnisppNpjR9thQy/F0xgecgU5Rc1c/mtm2Q1g+Toq7GS30ofrP60qcIrgbhyIoAR2F3ipqLPqMHAHdTl3omA9 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03696443-d046-450b-24ec-08dac013d9ff X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2022 16:27:52.3614 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P250MB0458 Subject: [FFmpeg-devel] [PATCH 1/7] postproc/postprocess: Remove obsolete MMX(EXT)/3Dnow functions 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QM41HGFyn9FE postprocess.c currently has C, MMX, MMXEXT, 3DNow as well as SSE2 versions of its internal functions. But given that only ancient 32-bit x86 CPUs don't support SSE2, the MMX, MMXEXT and 3DNow versions are obsolete and are therefore removed by this commit. This saves about 56KB here. (The SSE2 version in particular is not really complete, so that it often falls back to MMXEXT (which means that there were some identical (apart from the name) MMXEXT and SSE2 functions; this duplication no longer exists with this commit.) Signed-off-by: Andreas Rheinhardt --- The PP_CPU_CAPS_MMX(2)/3DNOW could now be deprecated. libpostproc/postprocess.c | 69 ++-- libpostproc/postprocess_template.c | 521 ++--------------------------- 2 files changed, 57 insertions(+), 533 deletions(-) diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index 383c691cb4..0586e458b4 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -26,28 +26,27 @@ */ /* - C MMX MMX2 3DNow AltiVec -isVertDC Ec Ec Ec -isVertMinMaxOk Ec Ec Ec -doVertLowPass E e e Ec -doVertDefFilter Ec Ec e e Ec -isHorizDC Ec Ec Ec -isHorizMinMaxOk a E Ec -doHorizLowPass E e e Ec -doHorizDefFilter Ec Ec e e Ec -do_a_deblock Ec E Ec E -deRing E e e* Ecp -Vertical RKAlgo1 E a a -Horizontal RKAlgo1 a a -Vertical X1# a E E -Horizontal X1# a E E -LinIpolDeinterlace e E E* -CubicIpolDeinterlace a e e* -LinBlendDeinterlace e E E* + C MMX MMX2 AltiVec +isVertDC Ec Ec Ec +isVertMinMaxOk Ec Ec Ec +doVertLowPass E e Ec +doVertDefFilter Ec Ec e Ec +isHorizDC Ec Ec Ec +isHorizMinMaxOk a E Ec +doHorizLowPass E e Ec +doHorizDefFilter Ec Ec e Ec +do_a_deblock Ec E Ec +deRing E e Ecp +Vertical RKAlgo1 E a +Horizontal RKAlgo1 a +Vertical X1# a E +Horizontal X1# a E +LinIpolDeinterlace e E +CubicIpolDeinterlace a e +LinBlendDeinterlace e E MedianDeinterlace# E Ec Ec -TempDeNoiser# E e e Ec +TempDeNoiser# E e Ec -* I do not have a 3DNow! CPU -> it is untested, but no one said it does not work so it seems to work # more or less selfinvented filters so the exactness is not too meaningful E = Exact implementation e = almost exact implementation (slightly different rounding,...) @@ -83,7 +82,6 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks #include #include //#undef HAVE_MMXEXT_INLINE -//#define HAVE_AMD3DNOW_INLINE //#undef HAVE_MMX_INLINE //#undef ARCH_X86 //#define DEBUG_BRIGHTNESS @@ -494,7 +492,7 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step, } } -//Note: we have C, MMX, MMX2, 3DNOW version there is no 3DNOW+MMX2 one +//Note: we have C and SSE2 version (which uses MMX(EXT) when advantageous) //Plain C versions //we always compile C for testing which needs bitexactness #define TEMPLATE_PP_C 1 @@ -508,27 +506,12 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step, #if ARCH_X86 && HAVE_INLINE_ASM # if CONFIG_RUNTIME_CPUDETECT -# define TEMPLATE_PP_MMX 1 -# include "postprocess_template.c" -# define TEMPLATE_PP_MMXEXT 1 -# include "postprocess_template.c" -# define TEMPLATE_PP_3DNOW 1 -# include "postprocess_template.c" # define TEMPLATE_PP_SSE2 1 # include "postprocess_template.c" # else # if HAVE_SSE2_INLINE # define TEMPLATE_PP_SSE2 1 # include "postprocess_template.c" -# elif HAVE_MMXEXT_INLINE -# define TEMPLATE_PP_MMXEXT 1 -# include "postprocess_template.c" -# elif HAVE_AMD3DNOW_INLINE -# define TEMPLATE_PP_3DNOW 1 -# include "postprocess_template.c" -# elif HAVE_MMX_INLINE -# define TEMPLATE_PP_MMX 1 -# include "postprocess_template.c" # endif # endif #endif @@ -549,21 +532,12 @@ static inline void postProcess(const uint8_t src[], int srcStride, uint8_t dst[] #if ARCH_X86 && HAVE_INLINE_ASM // ordered per speed fastest first if (c->cpuCaps & AV_CPU_FLAG_SSE2) pp = postProcess_SSE2; - else if (c->cpuCaps & AV_CPU_FLAG_MMXEXT) pp = postProcess_MMX2; - else if (c->cpuCaps & AV_CPU_FLAG_3DNOW) pp = postProcess_3DNow; - else if (c->cpuCaps & AV_CPU_FLAG_MMX) pp = postProcess_MMX; #elif HAVE_ALTIVEC if (c->cpuCaps & AV_CPU_FLAG_ALTIVEC) pp = postProcess_altivec; #endif #else /* CONFIG_RUNTIME_CPUDETECT */ #if HAVE_SSE2_INLINE pp = postProcess_SSE2; -#elif HAVE_MMXEXT_INLINE - pp = postProcess_MMX2; -#elif HAVE_AMD3DNOW_INLINE - pp = postProcess_3DNow; -#elif HAVE_MMX_INLINE - pp = postProcess_MMX; #elif HAVE_ALTIVEC pp = postProcess_altivec; #endif @@ -877,9 +851,6 @@ av_cold pp_context *pp_get_context(int width, int height, int cpuCaps){ c->cpuCaps = av_get_cpu_flags(); } else { c->cpuCaps = 0; - if (cpuCaps & PP_CPU_CAPS_MMX) c->cpuCaps |= AV_CPU_FLAG_MMX; - if (cpuCaps & PP_CPU_CAPS_MMX2) c->cpuCaps |= AV_CPU_FLAG_MMXEXT; - if (cpuCaps & PP_CPU_CAPS_3DNOW) c->cpuCaps |= AV_CPU_FLAG_3DNOW; if (cpuCaps & PP_CPU_CAPS_ALTIVEC) c->cpuCaps |= AV_CPU_FLAG_ALTIVEC; } diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c index 9f76b7c587..bcf7bdad66 100644 --- a/libpostproc/postprocess_template.c +++ b/libpostproc/postprocess_template.c @@ -20,7 +20,7 @@ /** * @file - * mmx/mmx2/3dnow postprocess code. + * mmx/mmx2/sse2 postprocess code. */ #include "libavutil/mem_internal.h" @@ -57,14 +57,6 @@ # define TEMPLATE_PP_MMXEXT 0 #endif -#ifdef TEMPLATE_PP_3DNOW -# undef TEMPLATE_PP_MMX -# define TEMPLATE_PP_MMX 1 -# define RENAME(a) a ## _3DNow -#else -# define TEMPLATE_PP_3DNOW 0 -#endif - #ifdef TEMPLATE_PP_SSE2 # undef TEMPLATE_PP_MMX # define TEMPLATE_PP_MMX 1 @@ -82,30 +74,19 @@ #if TEMPLATE_PP_MMXEXT #define REAL_PAVGB(a,b) "pavgb " #a ", " #b " \n\t" -#elif TEMPLATE_PP_3DNOW -#define REAL_PAVGB(a,b) "pavgusb " #a ", " #b " \n\t" #endif #define PAVGB(a,b) REAL_PAVGB(a,b) #if TEMPLATE_PP_MMXEXT #define PMINUB(a,b,t) "pminub " #a ", " #b " \n\t" -#elif TEMPLATE_PP_MMX -#define PMINUB(b,a,t) \ - "movq " #a ", " #t " \n\t"\ - "psubusb " #b ", " #t " \n\t"\ - "psubb " #t ", " #a " \n\t" #endif #if TEMPLATE_PP_MMXEXT #define PMAXUB(a,b) "pmaxub " #a ", " #b " \n\t" -#elif TEMPLATE_PP_MMX -#define PMAXUB(a,b) \ - "psubusb " #a ", " #b " \n\t"\ - "paddb " #a ", " #b " \n\t" #endif //FIXME? |255-0| = 1 (should not be a problem ...) -#if TEMPLATE_PP_MMX +#if TEMPLATE_PP_MMXEXT /** * Check if the middle 8x8 Block in the given 8x16 block is flat */ @@ -185,20 +166,8 @@ static inline int RENAME(vertClassify)(const uint8_t src[], int stride, PPContex "psubusb %%mm3, %%mm4 \n\t" " \n\t" -#if TEMPLATE_PP_MMXEXT "pxor %%mm7, %%mm7 \n\t" "psadbw %%mm7, %%mm0 \n\t" -#else - "movq %%mm0, %%mm1 \n\t" - "psrlw $8, %%mm0 \n\t" - "paddb %%mm1, %%mm0 \n\t" - "movq %%mm0, %%mm1 \n\t" - "psrlq $16, %%mm0 \n\t" - "paddb %%mm1, %%mm0 \n\t" - "movq %%mm0, %%mm1 \n\t" - "psrlq $32, %%mm0 \n\t" - "paddb %%mm1, %%mm0 \n\t" -#endif "movq %4, %%mm7 \n\t" // QP,..., QP "paddusb %%mm7, %%mm7 \n\t" // 2QP ... 2QP "psubusb %%mm7, %%mm4 \n\t" // Diff <= 2QP -> 0 @@ -219,7 +188,7 @@ static inline int RENAME(vertClassify)(const uint8_t src[], int stride, PPContex return 2; } } -#endif //TEMPLATE_PP_MMX +#endif //TEMPLATE_PP_MMXEXT /** * Do a vertical low pass filter on the 8x16 block (only write to the 8x8 block in the middle) @@ -228,7 +197,7 @@ static inline int RENAME(vertClassify)(const uint8_t src[], int stride, PPContex #if !TEMPLATE_PP_ALTIVEC static inline void RENAME(doVertLowPass)(uint8_t *src, int stride, PPContext *c) { -#if TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#if TEMPLATE_PP_MMXEXT src+= stride*3; __asm__ volatile( //"movv %0 %1 %2\n\t" "movq %2, %%mm0 \n\t" // QP,..., QP @@ -355,7 +324,7 @@ static inline void RENAME(doVertLowPass)(uint8_t *src, int stride, PPContext *c) : "r" (src), "r" ((x86_reg)stride), "m" (c->pQPb) : "%"FF_REG_a, "%"FF_REG_c ); -#else //TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#else //TEMPLATE_PP_MMXEXT const int l1= stride; const int l2= stride + l1; const int l3= stride + l2; @@ -394,7 +363,7 @@ static inline void RENAME(doVertLowPass)(uint8_t *src, int stride, PPContext *c) src++; } -#endif //TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#endif //TEMPLATE_PP_MMXEXT } #endif //TEMPLATE_PP_ALTIVEC @@ -407,7 +376,7 @@ static inline void RENAME(doVertLowPass)(uint8_t *src, int stride, PPContext *c) */ static inline void RENAME(vertX1Filter)(uint8_t *src, int stride, PPContext *co) { -#if TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#if TEMPLATE_PP_MMXEXT src+= stride*3; __asm__ volatile( @@ -494,7 +463,7 @@ static inline void RENAME(vertX1Filter)(uint8_t *src, int stride, PPContext *co) NAMED_CONSTRAINTS_ADD(b01) : "%"FF_REG_a, "%"FF_REG_c ); -#else //TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#else //TEMPLATE_PP_MMXEXT const int l1= stride; const int l2= stride + l1; @@ -528,13 +497,13 @@ static inline void RENAME(vertX1Filter)(uint8_t *src, int stride, PPContext *co) } src++; } -#endif //TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#endif //TEMPLATE_PP_MMXEXT } #if !TEMPLATE_PP_ALTIVEC static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext *c) { -#if TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#if TEMPLATE_PP_MMXEXT /* uint8_t tmp[16]; const int l1= stride; @@ -816,239 +785,7 @@ static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext } } */ -#elif TEMPLATE_PP_MMX - DECLARE_ALIGNED(8, uint64_t, tmp)[4]; // make space for 4 8-byte vars - src+= stride*4; - __asm__ volatile( - "pxor %%mm7, %%mm7 \n\t" -// 0 1 2 3 4 5 6 7 -// %0 %0+%1 %0+2%1 eax+2%1 %0+4%1 eax+4%1 edx+%1 edx+2%1 -// %0 eax eax+%1 eax+2%1 %0+4%1 edx edx+%1 edx+2%1 - - "movq (%0), %%mm0 \n\t" - "movq %%mm0, %%mm1 \n\t" - "punpcklbw %%mm7, %%mm0 \n\t" // low part of line 0 - "punpckhbw %%mm7, %%mm1 \n\t" // high part of line 0 - - "movq (%0, %1), %%mm2 \n\t" - "lea (%0, %1, 2), %%"FF_REG_a" \n\t" - "movq %%mm2, %%mm3 \n\t" - "punpcklbw %%mm7, %%mm2 \n\t" // low part of line 1 - "punpckhbw %%mm7, %%mm3 \n\t" // high part of line 1 - - "movq (%%"FF_REG_a"), %%mm4 \n\t" - "movq %%mm4, %%mm5 \n\t" - "punpcklbw %%mm7, %%mm4 \n\t" // low part of line 2 - "punpckhbw %%mm7, %%mm5 \n\t" // high part of line 2 - - "paddw %%mm0, %%mm0 \n\t" // 2L0 - "paddw %%mm1, %%mm1 \n\t" // 2H0 - "psubw %%mm4, %%mm2 \n\t" // L1 - L2 - "psubw %%mm5, %%mm3 \n\t" // H1 - H2 - "psubw %%mm2, %%mm0 \n\t" // 2L0 - L1 + L2 - "psubw %%mm3, %%mm1 \n\t" // 2H0 - H1 + H2 - - "psllw $2, %%mm2 \n\t" // 4L1 - 4L2 - "psllw $2, %%mm3 \n\t" // 4H1 - 4H2 - "psubw %%mm2, %%mm0 \n\t" // 2L0 - 5L1 + 5L2 - "psubw %%mm3, %%mm1 \n\t" // 2H0 - 5H1 + 5H2 - - "movq (%%"FF_REG_a", %1), %%mm2 \n\t" - "movq %%mm2, %%mm3 \n\t" - "punpcklbw %%mm7, %%mm2 \n\t" // L3 - "punpckhbw %%mm7, %%mm3 \n\t" // H3 - - "psubw %%mm2, %%mm0 \n\t" // 2L0 - 5L1 + 5L2 - L3 - "psubw %%mm3, %%mm1 \n\t" // 2H0 - 5H1 + 5H2 - H3 - "psubw %%mm2, %%mm0 \n\t" // 2L0 - 5L1 + 5L2 - 2L3 - "psubw %%mm3, %%mm1 \n\t" // 2H0 - 5H1 + 5H2 - 2H3 - "movq %%mm0, (%3) \n\t" // 2L0 - 5L1 + 5L2 - 2L3 - "movq %%mm1, 8(%3) \n\t" // 2H0 - 5H1 + 5H2 - 2H3 - - "movq (%%"FF_REG_a", %1, 2), %%mm0 \n\t" - "movq %%mm0, %%mm1 \n\t" - "punpcklbw %%mm7, %%mm0 \n\t" // L4 - "punpckhbw %%mm7, %%mm1 \n\t" // H4 - - "psubw %%mm0, %%mm2 \n\t" // L3 - L4 - "psubw %%mm1, %%mm3 \n\t" // H3 - H4 - "movq %%mm2, 16(%3) \n\t" // L3 - L4 - "movq %%mm3, 24(%3) \n\t" // H3 - H4 - "paddw %%mm4, %%mm4 \n\t" // 2L2 - "paddw %%mm5, %%mm5 \n\t" // 2H2 - "psubw %%mm2, %%mm4 \n\t" // 2L2 - L3 + L4 - "psubw %%mm3, %%mm5 \n\t" // 2H2 - H3 + H4 - - "lea (%%"FF_REG_a", %1), %0 \n\t" - "psllw $2, %%mm2 \n\t" // 4L3 - 4L4 - "psllw $2, %%mm3 \n\t" // 4H3 - 4H4 - "psubw %%mm2, %%mm4 \n\t" // 2L2 - 5L3 + 5L4 - "psubw %%mm3, %%mm5 \n\t" // 2H2 - 5H3 + 5H4 -//50 opcodes so far - "movq (%0, %1, 2), %%mm2 \n\t" - "movq %%mm2, %%mm3 \n\t" - "punpcklbw %%mm7, %%mm2 \n\t" // L5 - "punpckhbw %%mm7, %%mm3 \n\t" // H5 - "psubw %%mm2, %%mm4 \n\t" // 2L2 - 5L3 + 5L4 - L5 - "psubw %%mm3, %%mm5 \n\t" // 2H2 - 5H3 + 5H4 - H5 - "psubw %%mm2, %%mm4 \n\t" // 2L2 - 5L3 + 5L4 - 2L5 - "psubw %%mm3, %%mm5 \n\t" // 2H2 - 5H3 + 5H4 - 2H5 - - "movq (%%"FF_REG_a", %1, 4), %%mm6 \n\t" - "punpcklbw %%mm7, %%mm6 \n\t" // L6 - "psubw %%mm6, %%mm2 \n\t" // L5 - L6 - "movq (%%"FF_REG_a", %1, 4), %%mm6 \n\t" - "punpckhbw %%mm7, %%mm6 \n\t" // H6 - "psubw %%mm6, %%mm3 \n\t" // H5 - H6 - - "paddw %%mm0, %%mm0 \n\t" // 2L4 - "paddw %%mm1, %%mm1 \n\t" // 2H4 - "psubw %%mm2, %%mm0 \n\t" // 2L4 - L5 + L6 - "psubw %%mm3, %%mm1 \n\t" // 2H4 - H5 + H6 - - "psllw $2, %%mm2 \n\t" // 4L5 - 4L6 - "psllw $2, %%mm3 \n\t" // 4H5 - 4H6 - "psubw %%mm2, %%mm0 \n\t" // 2L4 - 5L5 + 5L6 - "psubw %%mm3, %%mm1 \n\t" // 2H4 - 5H5 + 5H6 - - "movq (%0, %1, 4), %%mm2 \n\t" - "movq %%mm2, %%mm3 \n\t" - "punpcklbw %%mm7, %%mm2 \n\t" // L7 - "punpckhbw %%mm7, %%mm3 \n\t" // H7 - - "paddw %%mm2, %%mm2 \n\t" // 2L7 - "paddw %%mm3, %%mm3 \n\t" // 2H7 - "psubw %%mm2, %%mm0 \n\t" // 2L4 - 5L5 + 5L6 - 2L7 - "psubw %%mm3, %%mm1 \n\t" // 2H4 - 5H5 + 5H6 - 2H7 - - "movq (%3), %%mm2 \n\t" // 2L0 - 5L1 + 5L2 - 2L3 - "movq 8(%3), %%mm3 \n\t" // 2H0 - 5H1 + 5H2 - 2H3 - -#if TEMPLATE_PP_MMXEXT - "movq %%mm7, %%mm6 \n\t" // 0 - "psubw %%mm0, %%mm6 \n\t" - "pmaxsw %%mm6, %%mm0 \n\t" // |2L4 - 5L5 + 5L6 - 2L7| - "movq %%mm7, %%mm6 \n\t" // 0 - "psubw %%mm1, %%mm6 \n\t" - "pmaxsw %%mm6, %%mm1 \n\t" // |2H4 - 5H5 + 5H6 - 2H7| - "movq %%mm7, %%mm6 \n\t" // 0 - "psubw %%mm2, %%mm6 \n\t" - "pmaxsw %%mm6, %%mm2 \n\t" // |2L0 - 5L1 + 5L2 - 2L3| - "movq %%mm7, %%mm6 \n\t" // 0 - "psubw %%mm3, %%mm6 \n\t" - "pmaxsw %%mm6, %%mm3 \n\t" // |2H0 - 5H1 + 5H2 - 2H3| -#else - "movq %%mm7, %%mm6 \n\t" // 0 - "pcmpgtw %%mm0, %%mm6 \n\t" - "pxor %%mm6, %%mm0 \n\t" - "psubw %%mm6, %%mm0 \n\t" // |2L4 - 5L5 + 5L6 - 2L7| - "movq %%mm7, %%mm6 \n\t" // 0 - "pcmpgtw %%mm1, %%mm6 \n\t" - "pxor %%mm6, %%mm1 \n\t" - "psubw %%mm6, %%mm1 \n\t" // |2H4 - 5H5 + 5H6 - 2H7| - "movq %%mm7, %%mm6 \n\t" // 0 - "pcmpgtw %%mm2, %%mm6 \n\t" - "pxor %%mm6, %%mm2 \n\t" - "psubw %%mm6, %%mm2 \n\t" // |2L0 - 5L1 + 5L2 - 2L3| - "movq %%mm7, %%mm6 \n\t" // 0 - "pcmpgtw %%mm3, %%mm6 \n\t" - "pxor %%mm6, %%mm3 \n\t" - "psubw %%mm6, %%mm3 \n\t" // |2H0 - 5H1 + 5H2 - 2H3| -#endif - -#if TEMPLATE_PP_MMXEXT - "pminsw %%mm2, %%mm0 \n\t" - "pminsw %%mm3, %%mm1 \n\t" -#else - "movq %%mm0, %%mm6 \n\t" - "psubusw %%mm2, %%mm6 \n\t" - "psubw %%mm6, %%mm0 \n\t" - "movq %%mm1, %%mm6 \n\t" - "psubusw %%mm3, %%mm6 \n\t" - "psubw %%mm6, %%mm1 \n\t" -#endif - - "movd %2, %%mm2 \n\t" // QP - "punpcklbw %%mm7, %%mm2 \n\t" - - "movq %%mm7, %%mm6 \n\t" // 0 - "pcmpgtw %%mm4, %%mm6 \n\t" // sign(2L2 - 5L3 + 5L4 - 2L5) - "pxor %%mm6, %%mm4 \n\t" - "psubw %%mm6, %%mm4 \n\t" // |2L2 - 5L3 + 5L4 - 2L5| - "pcmpgtw %%mm5, %%mm7 \n\t" // sign(2H2 - 5H3 + 5H4 - 2H5) - "pxor %%mm7, %%mm5 \n\t" - "psubw %%mm7, %%mm5 \n\t" // |2H2 - 5H3 + 5H4 - 2H5| -// 100 opcodes - "psllw $3, %%mm2 \n\t" // 8QP - "movq %%mm2, %%mm3 \n\t" // 8QP - "pcmpgtw %%mm4, %%mm2 \n\t" - "pcmpgtw %%mm5, %%mm3 \n\t" - "pand %%mm2, %%mm4 \n\t" - "pand %%mm3, %%mm5 \n\t" - - - "psubusw %%mm0, %%mm4 \n\t" // hd - "psubusw %%mm1, %%mm5 \n\t" // ld - - - "movq "MANGLE(w05)", %%mm2 \n\t" // 5 - "pmullw %%mm2, %%mm4 \n\t" - "pmullw %%mm2, %%mm5 \n\t" - "movq "MANGLE(w20)", %%mm2 \n\t" // 32 - "paddw %%mm2, %%mm4 \n\t" - "paddw %%mm2, %%mm5 \n\t" - "psrlw $6, %%mm4 \n\t" - "psrlw $6, %%mm5 \n\t" - - "movq 16(%3), %%mm0 \n\t" // L3 - L4 - "movq 24(%3), %%mm1 \n\t" // H3 - H4 - - "pxor %%mm2, %%mm2 \n\t" - "pxor %%mm3, %%mm3 \n\t" - - "pcmpgtw %%mm0, %%mm2 \n\t" // sign (L3-L4) - "pcmpgtw %%mm1, %%mm3 \n\t" // sign (H3-H4) - "pxor %%mm2, %%mm0 \n\t" - "pxor %%mm3, %%mm1 \n\t" - "psubw %%mm2, %%mm0 \n\t" // |L3-L4| - "psubw %%mm3, %%mm1 \n\t" // |H3-H4| - "psrlw $1, %%mm0 \n\t" // |L3 - L4|/2 - "psrlw $1, %%mm1 \n\t" // |H3 - H4|/2 - - "pxor %%mm6, %%mm2 \n\t" - "pxor %%mm7, %%mm3 \n\t" - "pand %%mm2, %%mm4 \n\t" - "pand %%mm3, %%mm5 \n\t" - -#if TEMPLATE_PP_MMXEXT - "pminsw %%mm0, %%mm4 \n\t" - "pminsw %%mm1, %%mm5 \n\t" -#else - "movq %%mm4, %%mm2 \n\t" - "psubusw %%mm0, %%mm2 \n\t" - "psubw %%mm2, %%mm4 \n\t" - "movq %%mm5, %%mm2 \n\t" - "psubusw %%mm1, %%mm2 \n\t" - "psubw %%mm2, %%mm5 \n\t" -#endif - "pxor %%mm6, %%mm4 \n\t" - "pxor %%mm7, %%mm5 \n\t" - "psubw %%mm6, %%mm4 \n\t" - "psubw %%mm7, %%mm5 \n\t" - "packsswb %%mm5, %%mm4 \n\t" - "movq (%0), %%mm0 \n\t" - "paddb %%mm4, %%mm0 \n\t" - "movq %%mm0, (%0) \n\t" - "movq (%0, %1), %%mm0 \n\t" - "psubb %%mm4, %%mm0 \n\t" - "movq %%mm0, (%0, %1) \n\t" - - : "+r" (src) - : "r" ((x86_reg)stride), "m" (c->pQPb), "r"(tmp) - NAMED_CONSTRAINTS_ADD(w05,w20) - : "%"FF_REG_a - ); -#else //TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#else //TEMPLATE_PP_MMXEXT const int l1= stride; const int l2= stride + l1; const int l3= stride + l2; @@ -1086,14 +823,14 @@ static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext } src++; } -#endif //TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#endif //TEMPLATE_PP_MMXEXT } #endif //TEMPLATE_PP_ALTIVEC #if !TEMPLATE_PP_ALTIVEC static inline void RENAME(dering)(uint8_t src[], int stride, PPContext *c) { -#if HAVE_7REGS && (TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW) +#if HAVE_7REGS && TEMPLATE_PP_MMXEXT DECLARE_ALIGNED(8, uint64_t, tmp)[3]; __asm__ volatile( "pxor %%mm6, %%mm6 \n\t" @@ -1113,20 +850,10 @@ static inline void RENAME(dering)(uint8_t src[], int stride, PPContext *c) #undef REAL_FIND_MIN_MAX #undef FIND_MIN_MAX -#if TEMPLATE_PP_MMXEXT #define REAL_FIND_MIN_MAX(addr)\ "movq " #addr ", %%mm0 \n\t"\ "pminub %%mm0, %%mm7 \n\t"\ "pmaxub %%mm0, %%mm6 \n\t" -#else -#define REAL_FIND_MIN_MAX(addr)\ - "movq " #addr ", %%mm0 \n\t"\ - "movq %%mm7, %%mm1 \n\t"\ - "psubusb %%mm0, %%mm6 \n\t"\ - "paddb %%mm0, %%mm6 \n\t"\ - "psubusb %%mm0, %%mm1 \n\t"\ - "psubb %%mm1, %%mm7 \n\t" -#endif #define FIND_MIN_MAX(addr) REAL_FIND_MIN_MAX(addr) FIND_MIN_MAX((%%FF_REGa)) @@ -1140,49 +867,20 @@ FIND_MIN_MAX((%0, %1, 8)) "movq %%mm7, %%mm4 \n\t" "psrlq $8, %%mm7 \n\t" -#if TEMPLATE_PP_MMXEXT "pminub %%mm4, %%mm7 \n\t" // min of pixels "pshufw $0xF9, %%mm7, %%mm4 \n\t" "pminub %%mm4, %%mm7 \n\t" // min of pixels "pshufw $0xFE, %%mm7, %%mm4 \n\t" "pminub %%mm4, %%mm7 \n\t" -#else - "movq %%mm7, %%mm1 \n\t" - "psubusb %%mm4, %%mm1 \n\t" - "psubb %%mm1, %%mm7 \n\t" - "movq %%mm7, %%mm4 \n\t" - "psrlq $16, %%mm7 \n\t" - "movq %%mm7, %%mm1 \n\t" - "psubusb %%mm4, %%mm1 \n\t" - "psubb %%mm1, %%mm7 \n\t" - "movq %%mm7, %%mm4 \n\t" - "psrlq $32, %%mm7 \n\t" - "movq %%mm7, %%mm1 \n\t" - "psubusb %%mm4, %%mm1 \n\t" - "psubb %%mm1, %%mm7 \n\t" -#endif "movq %%mm6, %%mm4 \n\t" "psrlq $8, %%mm6 \n\t" -#if TEMPLATE_PP_MMXEXT "pmaxub %%mm4, %%mm6 \n\t" // max of pixels "pshufw $0xF9, %%mm6, %%mm4 \n\t" "pmaxub %%mm4, %%mm6 \n\t" "pshufw $0xFE, %%mm6, %%mm4 \n\t" "pmaxub %%mm4, %%mm6 \n\t" -#else - "psubusb %%mm4, %%mm6 \n\t" - "paddb %%mm4, %%mm6 \n\t" - "movq %%mm6, %%mm4 \n\t" - "psrlq $16, %%mm6 \n\t" - "psubusb %%mm4, %%mm6 \n\t" - "paddb %%mm4, %%mm6 \n\t" - "movq %%mm6, %%mm4 \n\t" - "psrlq $32, %%mm6 \n\t" - "psubusb %%mm4, %%mm6 \n\t" - "paddb %%mm4, %%mm6 \n\t" -#endif "movq %%mm6, %%mm0 \n\t" // max "psubb %%mm7, %%mm6 \n\t" // max - min "push %%"FF_REG_a" \n\t" @@ -1320,7 +1018,7 @@ DERING_CORE((%0, %1, 8) ,(%%FF_REGd, %1, 4),%%mm2,%%mm4,%%mm0,%%mm3,%%mm5, NAMED_CONSTRAINTS_ADD(deringThreshold,b00,b02,b08) : "%"FF_REG_a, "%"FF_REG_d ); -#else // HAVE_7REGS && (TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW) +#else // HAVE_7REGS && TEMPLATE_PP_MMXEXT int y; int min=255; int max=0; @@ -1438,7 +1136,7 @@ DERING_CORE((%0, %1, 8) ,(%%FF_REGd, %1, 4),%%mm2,%%mm4,%%mm0,%%mm3,%%mm5, // src[0] = src[7]=src[stride*7]=src[stride*7 + 7]=255; } #endif -#endif //TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#endif //TEMPLATE_PP_MMXEXT } #endif //TEMPLATE_PP_ALTIVEC @@ -1450,7 +1148,7 @@ DERING_CORE((%0, %1, 8) ,(%%FF_REGd, %1, 4),%%mm2,%%mm4,%%mm0,%%mm3,%%mm5, */ static inline void RENAME(deInterlaceInterpolateLinear)(uint8_t src[], int stride) { -#if TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#if TEMPLATE_PP_MMXEXT src+= 4*stride; __asm__ volatile( "lea (%0, %1), %%"FF_REG_a" \n\t" @@ -1503,14 +1201,13 @@ static inline void RENAME(deInterlaceInterpolateLinear)(uint8_t src[], int strid */ static inline void RENAME(deInterlaceInterpolateCubic)(uint8_t src[], int stride) { -#if TEMPLATE_PP_SSE2 || TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#if TEMPLATE_PP_SSE2 src+= stride*3; __asm__ volatile( "lea (%0, %1), %%"FF_REG_a" \n\t" "lea (%%"FF_REG_a", %1, 4), %%"FF_REG_d"\n\t" "lea (%%"FF_REG_d", %1, 4), %%"FF_REG_c"\n\t" "add %1, %%"FF_REG_c" \n\t" -#if TEMPLATE_PP_SSE2 "pxor %%xmm7, %%xmm7 \n\t" #define REAL_DEINT_CUBIC(a,b,c,d,e)\ "movq " #a ", %%xmm0 \n\t"\ @@ -1526,33 +1223,6 @@ static inline void RENAME(deInterlaceInterpolateCubic)(uint8_t src[], int stride "psubw %%xmm0, %%xmm1 \n\t"\ "packuswb %%xmm1, %%xmm1 \n\t"\ "movlps %%xmm1, " #c " \n\t" -#else //TEMPLATE_PP_SSE2 - "pxor %%mm7, %%mm7 \n\t" -// 0 1 2 3 4 5 6 7 8 9 10 -// %0 eax eax+%1 eax+2%1 %0+4%1 edx edx+%1 edx+2%1 %0+8%1 edx+4%1 ecx - -#define REAL_DEINT_CUBIC(a,b,c,d,e)\ - "movq " #a ", %%mm0 \n\t"\ - "movq " #b ", %%mm1 \n\t"\ - "movq " #d ", %%mm2 \n\t"\ - "movq " #e ", %%mm3 \n\t"\ - PAVGB(%%mm2, %%mm1) /* (b+d) /2 */\ - PAVGB(%%mm3, %%mm0) /* (a+e) /2 */\ - "movq %%mm0, %%mm2 \n\t"\ - "punpcklbw %%mm7, %%mm0 \n\t"\ - "punpckhbw %%mm7, %%mm2 \n\t"\ - "movq %%mm1, %%mm3 \n\t"\ - "punpcklbw %%mm7, %%mm1 \n\t"\ - "punpckhbw %%mm7, %%mm3 \n\t"\ - "psubw %%mm1, %%mm0 \n\t" /* L(a+e - (b+d))/2 */\ - "psubw %%mm3, %%mm2 \n\t" /* H(a+e - (b+d))/2 */\ - "psraw $3, %%mm0 \n\t" /* L(a+e - (b+d))/16 */\ - "psraw $3, %%mm2 \n\t" /* H(a+e - (b+d))/16 */\ - "psubw %%mm0, %%mm1 \n\t" /* L(9b + 9d - a - e)/16 */\ - "psubw %%mm2, %%mm3 \n\t" /* H(9b + 9d - a - e)/16 */\ - "packuswb %%mm3, %%mm1 \n\t"\ - "movq %%mm1, " #c " \n\t" -#endif //TEMPLATE_PP_SSE2 #define DEINT_CUBIC(a,b,c,d,e) REAL_DEINT_CUBIC(a,b,c,d,e) DEINT_CUBIC((%0) , (%%FF_REGa, %1), (%%FF_REGa, %1, 2), (%0, %1, 4) , (%%FF_REGd, %1)) @@ -1562,13 +1232,11 @@ DEINT_CUBIC((%%FF_REGd, %1), (%0, %1, 8) , (%%FF_REGd, %1, 4), (%%FF_REGc) : : "r" (src), "r" ((x86_reg)stride) : -#if TEMPLATE_PP_SSE2 XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm7",) -#endif "%"FF_REG_a, "%"FF_REG_d, "%"FF_REG_c ); #undef REAL_DEINT_CUBIC -#else //TEMPLATE_PP_SSE2 || TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#else //TEMPLATE_PP_SSE2 int x; src+= stride*3; for(x=0; x<8; x++){ @@ -1578,7 +1246,7 @@ DEINT_CUBIC((%%FF_REGd, %1), (%0, %1, 8) , (%%FF_REGd, %1, 4), (%%FF_REGc) src[stride*9] = av_clip_uint8((-src[stride*6] + 9*src[stride*8] + 9*src[stride*10] - src[stride*12])>>4); src++; } -#endif //TEMPLATE_PP_SSE2 || TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#endif //TEMPLATE_PP_SSE2 } /** @@ -1590,7 +1258,7 @@ DEINT_CUBIC((%%FF_REGd, %1), (%0, %1, 8) , (%%FF_REGd, %1, 4), (%%FF_REGc) */ static inline void RENAME(deInterlaceFF)(uint8_t src[], int stride, uint8_t *tmp) { -#if TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#if TEMPLATE_PP_MMXEXT src+= stride*4; __asm__ volatile( "lea (%0, %1), %%"FF_REG_a" \n\t" @@ -1639,7 +1307,7 @@ DEINT_FF((%%FF_REGd, %1), (%%FF_REGd, %1, 2), (%0, %1, 8) , (%%FF_REGd, %1, 4 : : "r" (src), "r" ((x86_reg)stride), "r"(tmp) : "%"FF_REG_a, "%"FF_REG_d ); -#else //TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#else //TEMPLATE_PP_MMXEXT int x; src+= stride*4; for(x=0; x<8; x++){ @@ -1657,7 +1325,7 @@ DEINT_FF((%%FF_REGd, %1), (%%FF_REGd, %1, 2), (%0, %1, 8) , (%%FF_REGd, %1, 4 src++; } -#endif //TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#endif //TEMPLATE_PP_MMXEXT } /** @@ -1669,7 +1337,7 @@ DEINT_FF((%%FF_REGd, %1), (%%FF_REGd, %1, 2), (%0, %1, 8) , (%%FF_REGd, %1, 4 */ static inline void RENAME(deInterlaceL5)(uint8_t src[], int stride, uint8_t *tmp, uint8_t *tmp2) { -#if (TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW) && HAVE_6REGS +#if TEMPLATE_PP_MMXEXT && HAVE_6REGS src+= stride*4; __asm__ volatile( "lea (%0, %1), %%"FF_REG_a" \n\t" @@ -1729,7 +1397,7 @@ DEINT_L5(%%mm1, %%mm0, (%%FF_REGd, %1, 2), (%0, %1, 8) , (%%FF_REGd, %1, 4 : : "r" (src), "r" ((x86_reg)stride), "r"(tmp), "r"(tmp2) : "%"FF_REG_a, "%"FF_REG_d ); -#else //(TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW) && HAVE_6REGS +#else //TEMPLATE_PP_MMXEXT && HAVE_6REGS int x; src+= stride*4; for(x=0; x<8; x++){ @@ -1758,7 +1426,7 @@ DEINT_L5(%%mm1, %%mm0, (%%FF_REGd, %1, 2), (%0, %1, 8) , (%%FF_REGd, %1, 4 src++; } -#endif //(TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW) && HAVE_6REGS +#endif // TEMPLATE_PP_MMXEXT && HAVE_6REGS } /** @@ -1770,7 +1438,7 @@ DEINT_L5(%%mm1, %%mm0, (%%FF_REGd, %1, 2), (%0, %1, 8) , (%%FF_REGd, %1, 4 */ static inline void RENAME(deInterlaceBlendLinear)(uint8_t src[], int stride, uint8_t *tmp) { -#if TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#if TEMPLATE_PP_MMXEXT src+= 4*stride; __asm__ volatile( "lea (%0, %1), %%"FF_REG_a" \n\t" @@ -1817,7 +1485,7 @@ static inline void RENAME(deInterlaceBlendLinear)(uint8_t src[], int stride, uin : : "r" (src), "r" ((x86_reg)stride), "r" (tmp) : "%"FF_REG_a, "%"FF_REG_d ); -#else //TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#else //TEMPLATE_PP_MMXEXT int a, b, c, x; src+= 4*stride; @@ -1860,7 +1528,7 @@ static inline void RENAME(deInterlaceBlendLinear)(uint8_t src[], int stride, uin src += 4; tmp += 4; } -#endif //TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW +#endif //TEMPLATE_PP_MMXEXT } /** @@ -1871,9 +1539,8 @@ static inline void RENAME(deInterlaceBlendLinear)(uint8_t src[], int stride, uin */ static inline void RENAME(deInterlaceMedian)(uint8_t src[], int stride) { -#if TEMPLATE_PP_MMX - src+= 4*stride; #if TEMPLATE_PP_MMXEXT + src+= 4*stride; __asm__ volatile( "lea (%0, %1), %%"FF_REG_a" \n\t" "lea (%%"FF_REG_a", %1, 4), %%"FF_REG_d"\n\t" @@ -1922,48 +1589,6 @@ static inline void RENAME(deInterlaceMedian)(uint8_t src[], int stride) : "%"FF_REG_a, "%"FF_REG_d ); -#else // MMX without MMX2 - __asm__ volatile( - "lea (%0, %1), %%"FF_REG_a" \n\t" - "lea (%%"FF_REG_a", %1, 4), %%"FF_REG_d"\n\t" -// 0 1 2 3 4 5 6 7 8 9 -// %0 eax eax+%1 eax+2%1 %0+4%1 edx edx+%1 edx+2%1 %0+8%1 edx+4%1 - "pxor %%mm7, %%mm7 \n\t" - -#define REAL_MEDIAN(a,b,c)\ - "movq " #a ", %%mm0 \n\t"\ - "movq " #b ", %%mm2 \n\t"\ - "movq " #c ", %%mm1 \n\t"\ - "movq %%mm0, %%mm3 \n\t"\ - "movq %%mm1, %%mm4 \n\t"\ - "movq %%mm2, %%mm5 \n\t"\ - "psubusb %%mm1, %%mm3 \n\t"\ - "psubusb %%mm2, %%mm4 \n\t"\ - "psubusb %%mm0, %%mm5 \n\t"\ - "pcmpeqb %%mm7, %%mm3 \n\t"\ - "pcmpeqb %%mm7, %%mm4 \n\t"\ - "pcmpeqb %%mm7, %%mm5 \n\t"\ - "movq %%mm3, %%mm6 \n\t"\ - "pxor %%mm4, %%mm3 \n\t"\ - "pxor %%mm5, %%mm4 \n\t"\ - "pxor %%mm6, %%mm5 \n\t"\ - "por %%mm3, %%mm1 \n\t"\ - "por %%mm4, %%mm2 \n\t"\ - "por %%mm5, %%mm0 \n\t"\ - "pand %%mm2, %%mm0 \n\t"\ - "pand %%mm1, %%mm0 \n\t"\ - "movq %%mm0, " #b " \n\t" -#define MEDIAN(a,b,c) REAL_MEDIAN(a,b,c) - -MEDIAN((%0) , (%%FF_REGa) , (%%FF_REGa, %1)) -MEDIAN((%%FF_REGa, %1), (%%FF_REGa, %1, 2), (%0, %1, 4)) -MEDIAN((%0, %1, 4) , (%%FF_REGd) , (%%FF_REGd, %1)) -MEDIAN((%%FF_REGd, %1), (%%FF_REGd, %1, 2), (%0, %1, 8)) - - : : "r" (src), "r" ((x86_reg)stride) - : "%"FF_REG_a, "%"FF_REG_d - ); -#endif //TEMPLATE_PP_MMXEXT #else //TEMPLATE_PP_MMX int x, y; src+= 4*stride; @@ -2165,7 +1790,7 @@ static inline void RENAME(tempNoiseReducer)(uint8_t *src, int stride, #define FAST_L2_DIFF //#define L1_DIFF //u should change the thresholds too if u try that one -#if (TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW) && HAVE_6REGS +#if TEMPLATE_PP_MMXEXT && HAVE_6REGS __asm__ volatile( "lea (%2, %2, 2), %%"FF_REG_a" \n\t" // 3*stride "lea (%2, %2, 4), %%"FF_REG_d" \n\t" // 5*stride @@ -2454,7 +2079,7 @@ L2_DIFF_CORE((%0, %%FF_REGc) , (%1, %%FF_REGc)) NAMED_CONSTRAINTS_ADD(b80) : "%"FF_REG_a, "%"FF_REG_d, "%"FF_REG_c, "memory" ); -#else //(TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW) && HAVE_6REGS +#else //TEMPLATE_PP_MMXEXT && HAVE_6REGS { int y; int d=0; @@ -2537,11 +2162,11 @@ Switch between } } } -#endif //(TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW) && HAVE_6REGS +#endif //TEMPLATE_PP_MMXEXT && HAVE_6REGS } #endif //TEMPLATE_PP_ALTIVEC -#if TEMPLATE_PP_MMX +#if TEMPLATE_PP_MMXEXT /** * accurate deblock filter */ @@ -2945,7 +2570,6 @@ static av_always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int st "movq (%4), %%mm2 \n\t" // 2L0 - 5L1 + 5L2 - 2L3 "movq 8(%4), %%mm3 \n\t" // 2H0 - 5H1 + 5H2 - 2H3 -#if TEMPLATE_PP_MMXEXT "movq %%mm7, %%mm6 \n\t" // 0 "psubw %%mm0, %%mm6 \n\t" "pmaxsw %%mm6, %%mm0 \n\t" // |2L4 - 5L5 + 5L6 - 2L7| @@ -2958,36 +2582,9 @@ static av_always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int st "movq %%mm7, %%mm6 \n\t" // 0 "psubw %%mm3, %%mm6 \n\t" "pmaxsw %%mm6, %%mm3 \n\t" // |2H0 - 5H1 + 5H2 - 2H3| -#else - "movq %%mm7, %%mm6 \n\t" // 0 - "pcmpgtw %%mm0, %%mm6 \n\t" - "pxor %%mm6, %%mm0 \n\t" - "psubw %%mm6, %%mm0 \n\t" // |2L4 - 5L5 + 5L6 - 2L7| - "movq %%mm7, %%mm6 \n\t" // 0 - "pcmpgtw %%mm1, %%mm6 \n\t" - "pxor %%mm6, %%mm1 \n\t" - "psubw %%mm6, %%mm1 \n\t" // |2H4 - 5H5 + 5H6 - 2H7| - "movq %%mm7, %%mm6 \n\t" // 0 - "pcmpgtw %%mm2, %%mm6 \n\t" - "pxor %%mm6, %%mm2 \n\t" - "psubw %%mm6, %%mm2 \n\t" // |2L0 - 5L1 + 5L2 - 2L3| - "movq %%mm7, %%mm6 \n\t" // 0 - "pcmpgtw %%mm3, %%mm6 \n\t" - "pxor %%mm6, %%mm3 \n\t" - "psubw %%mm6, %%mm3 \n\t" // |2H0 - 5H1 + 5H2 - 2H3| -#endif -#if TEMPLATE_PP_MMXEXT "pminsw %%mm2, %%mm0 \n\t" "pminsw %%mm3, %%mm1 \n\t" -#else - "movq %%mm0, %%mm6 \n\t" - "psubusw %%mm2, %%mm6 \n\t" - "psubw %%mm6, %%mm0 \n\t" - "movq %%mm1, %%mm6 \n\t" - "psubusw %%mm3, %%mm6 \n\t" - "psubw %%mm6, %%mm1 \n\t" -#endif "movd %2, %%mm2 \n\t" // QP "punpcklbw %%mm7, %%mm2 \n\t" @@ -3041,17 +2638,8 @@ static av_always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int st "pand %%mm2, %%mm4 \n\t" "pand %%mm3, %%mm5 \n\t" -#if TEMPLATE_PP_MMXEXT "pminsw %%mm0, %%mm4 \n\t" "pminsw %%mm1, %%mm5 \n\t" -#else - "movq %%mm4, %%mm2 \n\t" - "psubusw %%mm0, %%mm2 \n\t" - "psubw %%mm2, %%mm4 \n\t" - "movq %%mm5, %%mm2 \n\t" - "psubusw %%mm1, %%mm2 \n\t" - "psubw %%mm2, %%mm5 \n\t" -#endif "pxor %%mm6, %%mm4 \n\t" "pxor %%mm7, %%mm5 \n\t" "psubw %%mm6, %%mm4 \n\t" @@ -3088,18 +2676,14 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ static inline void RENAME(blockCopy)(uint8_t dst[], int dstStride, const uint8_t src[], int srcStride, int levelFix, int64_t *packedOffsetAndScale) { -#if !TEMPLATE_PP_MMX || !HAVE_6REGS - int i; -#endif if(levelFix){ -#if TEMPLATE_PP_MMX && HAVE_6REGS +#if TEMPLATE_PP_MMXEXT && HAVE_6REGS __asm__ volatile( "movq (%%"FF_REG_a"), %%mm2 \n\t" // packedYOffset "movq 8(%%"FF_REG_a"), %%mm3 \n\t" // packedYScale "lea (%2,%4), %%"FF_REG_a" \n\t" "lea (%3,%5), %%"FF_REG_d" \n\t" "pxor %%mm4, %%mm4 \n\t" -#if TEMPLATE_PP_MMXEXT #define REAL_SCALED_CPY(src1, src2, dst1, dst2) \ "movq " #src1 ", %%mm0 \n\t"\ "movq " #src1 ", %%mm5 \n\t"\ @@ -3122,34 +2706,6 @@ static inline void RENAME(blockCopy)(uint8_t dst[], int dstStride, const uint8_t "movq %%mm0, " #dst1 " \n\t"\ "movq %%mm1, " #dst2 " \n\t"\ -#else //TEMPLATE_PP_MMXEXT -#define REAL_SCALED_CPY(src1, src2, dst1, dst2) \ - "movq " #src1 ", %%mm0 \n\t"\ - "movq " #src1 ", %%mm5 \n\t"\ - "punpcklbw %%mm4, %%mm0 \n\t"\ - "punpckhbw %%mm4, %%mm5 \n\t"\ - "psubw %%mm2, %%mm0 \n\t"\ - "psubw %%mm2, %%mm5 \n\t"\ - "movq " #src2 ", %%mm1 \n\t"\ - "psllw $6, %%mm0 \n\t"\ - "psllw $6, %%mm5 \n\t"\ - "pmulhw %%mm3, %%mm0 \n\t"\ - "movq " #src2 ", %%mm6 \n\t"\ - "pmulhw %%mm3, %%mm5 \n\t"\ - "punpcklbw %%mm4, %%mm1 \n\t"\ - "punpckhbw %%mm4, %%mm6 \n\t"\ - "psubw %%mm2, %%mm1 \n\t"\ - "psubw %%mm2, %%mm6 \n\t"\ - "psllw $6, %%mm1 \n\t"\ - "psllw $6, %%mm6 \n\t"\ - "pmulhw %%mm3, %%mm1 \n\t"\ - "pmulhw %%mm3, %%mm6 \n\t"\ - "packuswb %%mm5, %%mm0 \n\t"\ - "packuswb %%mm6, %%mm1 \n\t"\ - "movq %%mm0, " #dst1 " \n\t"\ - "movq %%mm1, " #dst2 " \n\t"\ - -#endif //TEMPLATE_PP_MMXEXT #define SCALED_CPY(src1, src2, dst1, dst2)\ REAL_SCALED_CPY(src1, src2, dst1, dst2) @@ -3170,7 +2726,7 @@ SCALED_CPY((%%FF_REGa, %4), (%%FF_REGa, %4, 2), (%%FF_REGd, %5), (%%FF_REGd, %5, : "%"FF_REG_d ); #else //TEMPLATE_PP_MMX && HAVE_6REGS - for(i=0; i<8; i++) + for (int i = 0; i < 8; i++) memcpy( &(dst[dstStride*i]), &(src[srcStride*i]), BLOCK_SIZE); #endif //TEMPLATE_PP_MMX && HAVE_6REGS @@ -3203,7 +2759,7 @@ SIMPLE_CPY((%%FF_REGa, %2), (%%FF_REGa, %2, 2), (%%FF_REGd, %3), (%%FF_REGd, %3, : "%"FF_REG_a, "%"FF_REG_d ); #else //TEMPLATE_PP_MMX && HAVE_6REGS - for(i=0; i<8; i++) + for (int i = 0; i < 8; i++) memcpy( &(dst[dstStride*i]), &(src[srcStride*i]), BLOCK_SIZE); #endif //TEMPLATE_PP_MMX && HAVE_6REGS @@ -3696,9 +3252,7 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ } } } -#if TEMPLATE_PP_3DNOW - __asm__ volatile("femms"); -#elif TEMPLATE_PP_MMX +#if TEMPLATE_PP_MMX __asm__ volatile("emms"); #endif @@ -3734,5 +3288,4 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ #undef TEMPLATE_PP_ALTIVEC #undef TEMPLATE_PP_MMX #undef TEMPLATE_PP_MMXEXT -#undef TEMPLATE_PP_3DNOW #undef TEMPLATE_PP_SSE2 From patchwork Sun Nov 6 16:30:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39208 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1637300pzb; Sun, 6 Nov 2022 08:31:08 -0800 (PST) X-Google-Smtp-Source: AA0mqf6P1nJvfxpiOPJ4xY02UygFPXUzu/DsiU5CCIB7ved+1+lyn443Ur5yJQWhX6VisSGwB3s+ X-Received: by 2002:a17:906:9441:b0:7ae:66a0:aaaa with SMTP id z1-20020a170906944100b007ae66a0aaaamr1851893ejx.744.1667752268479; Sun, 06 Nov 2022 08:31:08 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jv10-20020a170907768a00b007ae286f26b1si4531994ejc.620.2022.11.06.08.31.07; Sun, 06 Nov 2022 08:31:08 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=FBczMNoL; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B5EC68B886; Sun, 6 Nov 2022 18:31:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2079.outbound.protection.outlook.com [40.92.49.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EC8768B797 for ; Sun, 6 Nov 2022 18:30:58 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UM2aT4AaCRDMBWunrNPaHuOkpDd4jggnsGq2mfn4jArTeiAPWNmxYZRt8Qtx17mgr7T3ArtVRB4IpddMj9lTY5+6Fv2ATdCQLKsy9Sr1XyBY2XDcMtxdcj/xnTOm9Ab3Od2cTvsHiZbxNmlQgXHmV25aOyEoedV5ny10rxDroaBcW1WyQRmiO0YUxXSYEN239UYoV40m0Q4q42/npwlb3QQky43r8WkpjCeuLoeqsupBnL8kXDomM+HDl/YTRwgRYdxHlVGzHRLQrafBYqZsjqC29JER54dap4nPXDkYZdg/cX+yt1L4FRj/g58hhJTdiKlnE6lGedYAHhpDQUEqkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=akCy/q6SKfa3KDC8UATM/iGHQ2VkgNayIImL23pDwCk=; b=O45Vvn+bDQt949oBonsG6+9Ki9Lu9MLfCaOO92nPJEcuAequPxLgFr6R4i0pOODADgCVQOEaEOHbscWx9IV5d55RrNk0N1G9eTTHVhGuC2rTzGpmoL/+QPVo1nbTaC7BnTbre0W6D53IZ1dqREZooiZSy0JcM+0UfJePjDOsM2i5e4/iUsqt/O1HgY/GzeL00JTWRVICrpQl0CKXbnUMinAtG3xsAfw58jrcMYdEsu+p43KTly27a2DwZeFtbIxs2vZ9NK+PV+/JLgRyFBUx/qtRnbZ3DM4n4IDzQT58PVGW+6Voq2kDQRFuF+wQ3e/Ggw/fe56j+Yu4br80rZ2PhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=akCy/q6SKfa3KDC8UATM/iGHQ2VkgNayIImL23pDwCk=; b=FBczMNoL8W5Z5M3aJKvNcl/S6gA9oMK+rh5uNp9vQJI7z2PiuKclj22TBLON9nC/dhbJqiymmvCkFvAS2YFXZr3hUcIJ7JMxZexv4f6RjivwGO2qSIvuQ0oo9TD2GVNprGp5OMUQsHQ+dzXkiCKJaB+kpHl8+j/IuCZzTPnep7JCuKnh1PiPiKvFRsA87kNtlUTz8yNoHWPup53Kpzn6R5B/W9rNGTjF/FRUoDolRrZERs+FP/VfZNby7dijHGjA8piTuhsJ+U8Cr4ePtFgQ1yMUHiDyvSFI87dPtBxLirTuE3/aAq7djcdsuN2Oung7UQW4pi8eHtULUvNmesnFhw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0791.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:570::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.25; Sun, 6 Nov 2022 16:30:56 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe%4]) with mapi id 15.20.5791.026; Sun, 6 Nov 2022 16:30:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Nov 2022 17:30:56 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [KYk/8gTx0TVg5qfB6qJjddUIqckpLrMvZNU8JlOX7/8=] X-ClientProxiedBy: AM6P191CA0102.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8a::43) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221106163101.1141408-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0791:EE_ X-MS-Office365-Filtering-Correlation-Id: 11eb4d72-6ebf-4a46-f9d8-08dac0144793 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3lImNjLdz2HEBe7ENlDZxSGItsNFmmdVDUkQnANIf892cnqoclzmD8CHiPdyPEA6y53GoGBDm7J4PaS/jdGFM3GWQz8CWkOtCQwv7ZKgZTkms+/iXvpoNncTkghhoxBsbgIpCyCehv8I1nL/4vVmxcfFg/Kj4NkS1RBxuFUKkeUMmftlDfee90DSMoE+21QninnBBvmUx7r/E1X0CzkMPFEaOVQZiiKtZOXpEA3RPVHhlwybTlOkVRbG0J1KqYQ8S476Kq1v1VQRTEruNVnTnUNBEvd4ibfMneZfV5SA3V8Oxal5VmXfh9wSnz43QsDB9UDSGQ85EG1lZyLrplamjMNxt2+cqpZvlUBmicS7Zroih0dZc0zo6SJ1h1EgjDPXOi/XGBLzxAmzy8ABRcabtYIL6n237sC4lkyQ+TAKzSSenMAO5rmPcxBq1iD0aR1aODD5prz46i90u1mjP5F+nZB/nS2KRNPxwhJlP5e3wpKc9MA7eAht2r/VvXSot9xpJYdsyLapSxwV9qptyQia59TlwLJ1GfpAi8gY3eG4KYybkIFVnuVvhJMHiGiiOcNQlu1eAkkcwTx0c7YisDKJnjfbAOi6G5gsods/Lq9+H+tXSTphDd9QUezZJsd7zsTVqAzHlz8dKv05Wn0sQsqBA3N9MupW/fQKZHW3eAU2yb0JaYpdUrord8y7UTei33+hj54emJ75gZNM+4fcgdXyMIYvnQl0PS5t0Jykoj+bqJnDYkfKNS7zmS09qYhAeijatW9J9j96fv9Ug5GCkJ1JkHh X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rycH3rAqvGuj7v/Uo0sTz2w8puxD6ODl+5xMM3rUHaVd16rc8f11kYdsd5QlOv19LPv3Ol00ud9GNiwf4Y4ADsAF5eYDFgzMkMZI1hkvunPcUNziX92A5xDtwH6FjZwRZhzAbqTc3bFNB661L3JqtwagHBo+J6saa2NlczKucPHb9b6Ts7wi0EavbYhmojE3Fyi59KWc6QB+T+8BWq7UTtE4F+gh6LXP+zHaMbR9HqIkPUC6ZDNKWEabctLJub5tKVwzJtIZErWvnUYMcO26a4QrJGizufWeKp6LfwkqafvQVZ7neY3YIQOKrWzUkhQVL4utGL5UZB+4yiba/skCKJ+jI0AboMB7nYOjmyIy1w/2p4GdilsbZTKg6tQVOT325TpC6bu727cbGE/cb7RBzEoly4BQ81KrIUTpbZRbROCWjYwZaZBPBsm2359fTrg1Tlvt+139RazwJz1dPlY+IK7oROyTaFp1rUgwMoEkXNhlbdx4cEl6Lv4WIBNbUygsiMZHFuHpcMQ0Ka4AjiHzOvsr0s2GuyPRSpQiFWGQH9lHCjUc4nH/lS4p1x0rliNDFPuEMNeDEHysBef1uwELI4T+F1+EPw3qqUUDR3hlTwFz3X8woLc78bjzl5w4ZepNS/8twnXqo0OR9QFdorvjsqQfpm/vk5hn8t4URYdm9hIeP2h8lTnsSBs3HudZ/L7l X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TpnRuTjz2VOWWbXIn+SW0ph+k4QBpYaxc98574ZxtH7ZSlKAvN4rDoCMGwxJ2jH3G0CoQEEkVsQnN33jIDqAeJn+YIksFF66p+8dw18X53o4mt1+UwiX6Lx1X3zygBtULwHc+0ombPfA2a6UuHS+JsHTMYEwuZqAN/GxY3sUSIgnKto+N4XKWYt6tYWcDqqI44/27EJv0sUJZK9Q6MPHLRMPNL5CXuffM9f7qBi1xthgYddNJhaP4wpD3fftwI045mecm0pqozokh9s9KQA/pq5hyAFDJuwAwW3AvnP998IzxBpmmG+UnNM80orpO+Fc2cUU4FLgWBrlgHn05l84wyz+Z1Le/YO2V5ZtGzHoXY4zN/lJfyCxyvt8sMT3lT515fFNpMR7VzYxr5uLKmAgwxhGqcIvrHAKezhu26fCSiZvJCgQcFpJqkoYE/Q6TISPS9qTEyLf1EnQKXbBxZlPttR1Xa7g2H0f4FcIQ5Kq5P6wgdM7ZHJNv+aisF98+aPr4YEdev2l1B0pGyOn+Jk+QDXuFeTNo+f7KEB1Tp9ne0ZjkUYmHNC6Z6LkR/IUQFGpnA49k81fcmWzbBq2c+BORveZiPjiSFgk+2Hw4+DpdTx1PVCjJ0+OSQ+R8LwVIL2S47mHf8tblm/S3HOxPvpeB8tvqQ4bWZWlMvw5TFvOK8WQRmLGjhfx7N+4ceICznXTGsNUc++JIi6MNjWtVjHlSfaZS7wAvCbIskrSYI1Hv/frdYUQQLyzjyD043cjnj/y3BEGnnFUB4OnRYmP2zkgrQ4uK/Fz2JZs/dCly05Z87FMwAVwEnxskXNGWomFkbSJVpE/8Tso2ed7ICmERc0aAsdl04YJ55V0XD1q99P0bTGsduMxhSXBRS6uUMlu2liFkvFG1uu5zAzbLiWjY+aco2ehL1KXfmJZioqBxsYIbYxuOyBRdWfERghtLmC1816hofyCo9t2uwfC74LOc/tJtga8YvQdcc6RnkzTGmYvr4lcPR/QH9+m//3G7bc3+xI3aSKm0S9iRLSTGpHoXzSEttUNYlXdoeWW3TxVI5zzXcD1VvhYNMbUoCMyAgBPW2N9mDh6tFw+4jn16IOsIvU/GHHRxTpdIiwOhx3ScXTaiBLyCORrv6CTnzCa4fkq41JAfuQlm2NnBFUaqhAsyMEGaB9jNKUYby8DxowbDP0D8WYwtQfVui2n+bLHDTYgnhZEUcXypzZGeyDnEcj73Qg2lJR2jPRiV1GmCN9tG9bwAGeGvPDVqZwoeDpi914DpV22GjZhXepLL2JVSOUX+xEc9xCw9969BAwX7As9ZFGkGB8hBk84HjKZ8VfORNxHpa72 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11eb4d72-6ebf-4a46-f9d8-08dac0144793 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2022 16:30:56.1136 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0791 Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/x86/cavsdsp: Remove unused 3DNow-macro 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xhiicYXdcJKT Forgotten in 3221aba87989742ea22b639a7bb4af69f4eaa0e7. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/cavsdsp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c index 4ad977a034..96680836a1 100644 --- a/libavcodec/x86/cavsdsp.c +++ b/libavcodec/x86/cavsdsp.c @@ -308,10 +308,6 @@ static void OPNAME ## cavs_qpel ## SIZE ## _mc03_ ## MMX(uint8_t *dst, const uin }\ #define PUT_OP(a,b,temp, size) "mov" #size " " #a ", " #b " \n\t" -#define AVG_3DNOW_OP(a,b,temp, size) \ -"mov" #size " " #b ", " #temp " \n\t"\ -"pavgusb " #temp ", " #a " \n\t"\ -"mov" #size " " #a ", " #b " \n\t" #define AVG_MMXEXT_OP(a, b, temp, size) \ "mov" #size " " #b ", " #temp " \n\t"\ "pavgb " #temp ", " #a " \n\t"\ From patchwork Sun Nov 6 16:30:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39209 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1637446pzb; Sun, 6 Nov 2022 08:31:28 -0800 (PST) X-Google-Smtp-Source: AMsMyM7bgwXLGPpC1xGAKF401ljrQtjQhY98gM4DFSuhAHWrg/xju6bOzb9Dk6SD+wb56ePtSZl0 X-Received: by 2002:aa7:c14f:0:b0:460:e1cc:2c29 with SMTP id r15-20020aa7c14f000000b00460e1cc2c29mr46587499edp.423.1667752288126; Sun, 06 Nov 2022 08:31:28 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id du10-20020a17090772ca00b007ae3f78c8d5si7046770ejc.787.2022.11.06.08.31.27; Sun, 06 Nov 2022 08:31:28 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=ES4Uij2T; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B20268B908; Sun, 6 Nov 2022 18:31:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2036.outbound.protection.outlook.com [40.92.49.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F84968B896 for ; Sun, 6 Nov 2022 18:31:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lAhaG+KKaUUwvBeCGxVH5DI7h8ntDql5QlFgJTQ61VPdtKLf8y4LSpMITdfIs0ISEiSOa1m0cbuy1KJ6k6UhzmA5XppZnKlFxhNpOIQU6n7Ej7sNsT/K1534LAW9bvcODwe3y7BbVaWR0Y33Mgtms/IiKqoykuoyBMGbVNXZ0/REM4/Gm78WfansOIapdMa43QDPNFFp/1EF8EUN3aaUkwm3w1ddRBu7kkRW51Gq2/1VgapGUS6NMhKuHfAEbKftYxOfQIQqqbiKkT8GtkJ7YrLJL4waNiIbca84051sr3O1bQ92c8Nq3bsqMiuf0Tsbm79Z6Raf1KC86pjlNWPTcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nxMktAkikfk2swXEQdU3NLt2cq145E2w+QDM1eKO7gw=; b=O3OL5Shk+5gpBRhczIdZ9aoSxwWmx/jgJl5FEJjIin03Utnn92Q65B/Y5tExZ32w3tQfuuRJociPW8T5ZxQYAMQFA0cqsrNgkpdT7YxbDCof3mfz2TPeqFsEdrwE3R8fALLdlmrKAxw8ySfCGP68GKNMtmJxfFMz7De3XmaytpHBKiDx6ulEuvcvbqUDVYNjHV6vvXJPDMfdHs8y1d0F3q2AC/J+9C9QPF2bOTH0kKxg4ZVaGAI9Q0pv2gm/kpUJy+3c9ihO88XNYsC8JRQ8SOdP80YXoto5a77wNCuAocU4qkqGY7QTaLHy+AUK53QKwYPKUL5kIbZzdx/1FB3o9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nxMktAkikfk2swXEQdU3NLt2cq145E2w+QDM1eKO7gw=; b=ES4Uij2TN3mVzr2UKJipVCmv7+D4qov85SNPZI2yBUwbCTbkpQIC46jFQAxELArkCKOINUnQdwlCp5mh3no/ur2uq14t1Jil1q1tCzgRkiUWlxYTaBP3B00ojbiI/xB+JbJnlyevkiAhunijoRtq+iGiaYcx7+BlPBMh/Om31VibZh4z+crnpRimfNkkSSY8crMpOEL0lNbWbAehPYkI5j7zTcbUrKmebjG1qcpb4pbkij+whUZPZ5O890Hb2Oxvgb0Rai8DiQf5u0Lc+HTZgE4NQcEw5aHgRBUilpca+VoSpQBFOXIJjcGDI6THG07i6Y20v/DlwtbD8t/pdzcx7A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0791.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:570::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.25; Sun, 6 Nov 2022 16:31:17 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe%4]) with mapi id 15.20.5791.026; Sun, 6 Nov 2022 16:31:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Nov 2022 17:30:57 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [7ohRdR38U+wWPl7drTr1S1Ikjr5zGLVDuw8U/jLkXaM=] X-ClientProxiedBy: AM6P191CA0102.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8a::43) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221106163101.1141408-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0791:EE_ X-MS-Office365-Filtering-Correlation-Id: 11a154b6-ce01-4d73-a870-08dac0145427 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqxUC2t/XAH2JXAVSoE8CDQ3PN07aC4V30vMxoaf7dPQVtDCWR2lFHlpY1Vct8fMAzCb94U22yh13PpvG97n7BQCItws5x+xwfvRIVGqwO0N0w7KcaXFOQ226e4beO3zQp6cxySqQkHT4SQE7eTX+fVxo+FdkppsoReB5lfqK4aw1bG2lu9sQ/ETz00ycCjBvYPgzQJ33f4MRL4rQqt0h7bIrZPUGyHWH+FuoxFewVfhNRDVbgzwKNSYhCgpt/p470uMWYKUXu+tsw50hcXprnlBJjNPhWOe1x5D3hRk6M7uHwGN5t0Ycdm2Jzz1u3ZqnAhGAFXaS9DD6369gohwj4Gs92tc5KkhxRkVoGRNSvIGLzPkDYzD+okve0/umV37Xk/E+1NAJQmUCyn04DSmLnvHElW54F6lTDTA4l1yJMLDOZYhssi7OqnM5aUzws02vh2+rxtV6yubilHm+Hc7VJQboSwkKZJmZ+fMlOx6POEoj3+5/K6eiC6iFW0RlIyvhtlBSKIodnsM8eKQj1q/lJ9Sv9UbIe07GUkQiBUVhjqC/YfzNEsSnIsJNP5OWKLRJm2hlaYFfW4lZAEtTKdq2pPjjCc+8s2vEqn7TEV5GbVQTngh1HczG72h7VbDin38LetvbCo6YGQHbv9bgow42aPJMcstbxz+ExWXghoeIqV38/R1n2aFj455AagzkOLeNldyoa1gDAk8AKNALd39ysRkmotFpHEuGNpzRq9MzoC0ZdbRFmiWGTkKxEGmJx8TLo= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FqDslhR/TYohcE1oarVl/EqK74rhsL3ixu2W7asVbrDu3ld7Y5yUoTxvx5PCdjKKDKifwahCx2+V4aTKvARDu13CtIgMNoViyEts5d2hgqUu3LVaUWydJFltDIb1H7Wik2AhILXOPFlJo2hU/tRzXxmd3Jaub3BAXwnVazt6+/mno9bMVnD1aHkLtUvE869AdndseG4QB8aF1i4RFyOUCOb5um85xc+VI0tKOymSpp+oXtUHehnjYKnCBSyzLmsSU1zu2jw3/BNw1FAWLyUxQuVr8Swpi8VpY1UHacdl1pFUlgwoUmNixVBxNlF/KLflx2SrYdvPzTLb2j3sEbNleRZwCKVCuxvB1x0WUU4SRoPuVUiTFlYC1wEsPsz8wdrpwKLFr7ZnUPZsjorFKLrRkAJTIXesAx0IgX0BDD/sFoqXd9x2FUJP7FxeUIgOVE2TCg5czYOuN/ZKZkWACsOYF4D1igJsxirNdWRs/oiZOMHZiWkgaf/ZHu1dEfLTE+tYx+Aim9vV5lHde0u86oYWLMjpgJU+86z6+8BwBJoKG5mM6ewM7ksBuOQRrV8Idi+zYWX8LbqNECJAEaZl9hdbu0XivQkZvxykeEjFv8nPvKyyWENB4/EU80deC0uRGczx5w0g0mMCGFUXTIvTc+H5TJoXzmekFXDtVdVEJT4iev0QJ5wFawTy5+ge26RU7on/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dHBQaQhz6/RIPBHCbmXIsyZV3ncI9w67lRH9dJMEYKuRZS8s08jmmhiLqE7Owb2DkwbMLogWIInQ0FDTn6viAhaACwKy9FXU8iVVO6wbsh2BXaWGbhwX/QUmYfsQRZiwxVSi9W312SPmxYg9SAR2XhVw5Y5mGHn28/U+JctwdHbg+XH+pqgmc/hGnXfi3V1ss92WO3zmxxcM8qZNdFMl8P//IWDMF+xXuNUJilA/6ug3zFMNZDbGl/yHcfn3i0vCJ9AuLRQhc2AlYLXapqUnI0Aeh3onezHMgsM65IKmTtyo8x8AnKi5m4q785VwOo9k6mSmGCQH2afCE4jqd4uIMdwh+i4JkJGcmqO+wY/ogyGfLH6wSLK5miZIO7D5hHLYhwQObdIl4X8+iCfglteSYAF+qlOPuRQCN08aFd1q94G6Urm1lp/1Qal3+4AVIc+YdrM7pmEk6VNRIusnCXMyTbA8Uo57eXhDd2Xa5WOZauyaDZ+TLZnJYZbhf/kVRqZq0eLzkKnli3oEYXiAouVkzc67CEo9g3VD7G1GEKzTGBpikIji5Y6Xtp4UhiRu3GhVzIOnoxXYoLOdE1d/TrUcIkOSXIqJvpOU9Ht7cL8a+wkw8yHyjjCV337D6rACd198/kr/X9ZsUX1b/HhDwAC+YiGyO2zfkVVMWGk/8hHsdNZt4XZNZmWf6CwOswkwR2KVy895vyGLWn5B3306u0ckpGmWIbs8Q7bbVXofebhqh7PgWLNpKZ0z0MeJPHTOXoAH0HXF5jG8fV+WPuNhecOXnQlPP1h1KEUHxanxC02pZsgFLYEy0zQJg40C45y8aHS2qCcuoQsDC+YW8UzvUayCn+rseMGE54jMOBcr+Lp+RRWFxZxtGUGbheplFS3b360tNMOuux4jID7fbIUtCjPNBN8a+vFUMabW+uQ/bJXP9h1nsl3hFG8ltaJIFrz3xhP2pY+wwlN16n3wTT73iqEvT++j6tyIV5uMJTd5yNpSeBqD3vgS35H2X12HL8QfKW2BYusSCsCN0CJXgAJ3TTJhrZx1Ye1z/DqSoMzZrObRos5Szerqfntdu/26GIvJ4tiYRWWYHzvMpvQfXJz5GVsAxp/B6LISbIGZBlT6q50+xL6EvXx6b20awyWZQYvBFcDRmaAcARvi+S4jiTZZ1+df7HXo+0DL3pKc6SLGm/34bvoolYyrdBTcl0OYKM+o48G8/72TUfKs/xU5+9HPdMiY9LIjJtlydYqDWLnAsGRTccXemQjS+0LiaUGXvPzrYndybV/A82qjp5F3aG1sdbUDlpkdxipIi0/uCtQsG+g9RDE6KoDJEWhdtVh3UyX+3oLM X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11a154b6-ce01-4d73-a870-08dac0145427 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2022 16:31:17.2311 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0791 Subject: [FFmpeg-devel] [PATCH 3/7] swscale/utils: Remove obsolete 3DNow reference 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0JTYiM9wPRuX swscale does not use 3DNow any more since commit 608319a311a31f7d85333a7b08286c00be38eab6. Signed-off-by: Andreas Rheinhardt --- libswscale/utils.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 45baa22b23..85640a143f 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1966,8 +1966,6 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, if (INLINE_MMXEXT(cpu_flags)) cpucaps = "MMXEXT"; - else if (INLINE_AMD3DNOW(cpu_flags)) - cpucaps = "3DNOW"; else if (INLINE_MMX(cpu_flags)) cpucaps = "MMX"; else if (PPC_ALTIVEC(cpu_flags)) From patchwork Sun Nov 6 16:30:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39210 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1637505pzb; Sun, 6 Nov 2022 08:31:36 -0800 (PST) X-Google-Smtp-Source: AMsMyM5i9RkM8k8eGBh5akZjD8AYnLZHsB4QgiI6Xd4CiC2mKKTDgXooKVMuVa+RJjPvC1BTbjwR X-Received: by 2002:a17:907:2bd5:b0:76f:591c:466b with SMTP id gv21-20020a1709072bd500b0076f591c466bmr42416588ejc.504.1667752296788; Sun, 06 Nov 2022 08:31:36 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l12-20020a170906794c00b007adb80fc5d0si7165803ejo.461.2022.11.06.08.31.36; Sun, 06 Nov 2022 08:31:36 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=DgKHzKqc; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B51568B9A9; Sun, 6 Nov 2022 18:31:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2036.outbound.protection.outlook.com [40.92.49.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A76E468B896 for ; Sun, 6 Nov 2022 18:31:23 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R7fF2IALcVXzXX32uXMmX70YJ634cP6EBF8/exLd67xWjIa+nMAVRTxqGTSei2heTLOZHrdq7G8kL0KzzaQZrYeMDzZkH/ScmuYtgDKuh0/NxydwT0HcrvEwgvpUYp9weAMQgFvBuBOLFa4qfd2RbHblalnlnxH8LyAcA5Zb6svMcj6OFceOlf8T47RaPPluXwdp8ryOiEPryC01jeK67kLCW4cOA+PVg07UA2gg4axpLMjDePlVt06cr8wPDnFrODHzSUFbZyFIQoEJqJyuYKy4wAL3LPGArMKA++9rZWfrcRF1GwmQOaNg3U60Is4Yyti8ozFgff3bnF3TZ7Lluw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=f0ZBY9mtCRN7ilCC48biQP9Ws/h9JED4TvxYzs2MqwM=; b=PJDWLlGz8Bv81qM+pQb6UzqIZ2qOiiZtixDsB7u61D5VyaiqL/HXxL8Hq3gCdWzwbHkb9A1roghaRbflBhnz5NAHhE/vjs7obWAsbz6old9r4gVQFsnrIZ3yAPlxwT5WSDgqdrJ+zzKJD5ILI57CuOcxXidyP2t+Dloda5aBMOLIcb2apZumnyHSmxib+ynn/3JF6Ge+4Hu/Qpr9PHslB6cVm3iU2otZ1nPJtxHEtSwVhFjIeGYC4JkPSIuogsmSg/WJlyyOLrV2Gu6lTqhZIYFe62csbJIiJBYeLtB/viWp0rUVfYFHymSqYBXezfVwaZOZlP5rU1VDHIb8ev28ww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=f0ZBY9mtCRN7ilCC48biQP9Ws/h9JED4TvxYzs2MqwM=; b=DgKHzKqcwsIMdNaDeZlefBJqgHiUuDDwE34ebfIwkRPawIlEcPXUqfwm83YElp+MLp9xDEsKIE3j/05SEqb6/SPROvy2S3e/3bjEqLuG4kQ4KLDXiBPjyktp+Dh7yfCvAMVQi/G/dkGV000haJH8cHrzEWmvhjuhjqjAg/EslRt5P/8Sg8IQDWXYJYV8QoqyA0Qa801eMzn8xqTGh4Dd5YPEV54/IEo+xT896TTtsJV6L/iRnKxrV8fB/INtmLWLcjd4s66UR2iq96cgEMtKZbZCQDTqdyFI12i9EpHkh+2pWc9dSQRrYfrOJ0L2vkeHlAaYZ0KMGy0gOIjB6PbG3Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0791.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:570::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.25; Sun, 6 Nov 2022 16:31:19 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe%4]) with mapi id 15.20.5791.026; Sun, 6 Nov 2022 16:31:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Nov 2022 17:30:58 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [qcBS0W/p/b51m2qNaAcrNO4zskQooQSnNVBSmuXaJco=] X-ClientProxiedBy: AM6P191CA0102.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8a::43) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221106163101.1141408-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0791:EE_ X-MS-Office365-Filtering-Correlation-Id: 4892b172-1c16-4d8d-4889-08dac0145567 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqxUC2t/XAH2JXAVSoE8CDQc4VA3QELjK3PlIcTpdozamCfLcbMkXuGI1RO71XmFu7bLxZZJN2iwCYY0/vURypyysOvO71zmgYkywOwr/IDPbx7/wDkqo/s+Qo28aSDjgII6mGx1sSSniZGv/ef6i3N6/7QVcXgjBLTpnoryID3iFiXDMHCknJO5HoHejDS0HTgaSTOndV+oc/EKRkPTBgZybml3Jt59wYAWljeZKIY/ox0eAsetDzYdHj6SL/4IFh+AdKnKM4h7AwLVDsuhmjuEUL97B1tzYqDvxZgxDWz3gb1uDStaMVwzEX5Feepe428kmGnMez4VSDno6zBZSHy7EKpKjIwTauXg9cdu10/Dx5kkwH6D9A2N9ckaDJowJsLA4PmQP4mZ6fuh0axy+LAKOvHUn9xwO+rLiuLjmw8lLby+BT+pVA+oT+wUomCtzqlflm6hL5egWgDyJSHIJ9VThwAu7XzVloaSXJ7P7VtRQ3ppHMq3vRJ76CDCzxyosa1fZr/sZjYE1Fsx2UYgMnu5fMp96Q3qQKmhFzuN5hCy7wCOu5/nG5Sk7xAi06nI1RNebkQeVYQH7T0We7/pSjgGBixKbUr3BPz1t6Ctg9Z3BoJV6WcNYzt5N9sLLHTrY09kliAayJKCdNbXsFYQHn1OcZskxKL/ZYuZ3hX1pHbN3WLaexOFUdixeyudw7SjdlXbzUTs4orcSdSpVzagN+Z08VZCrnJucXHx/M1KZoj6tVep7aGNfMl+/By+EsP5q0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iHxpNcNFIdR8lRIpo6K/n3BtiqaW793TyFnF6v5H/4YFrOwuoHEAsNJ7owN3outT+qhjYDDG/XULy1MEffNV8j8jkClhU8S1JKHtH/Icuz+wlQQ4PffPiOLqdodunV4PcWFPYQ+j+H2U03cgiBx5YS1anPwkwzXhBreqeDbaKQZp9OhdWAHkTzIgSAhRBRfKNOUvimfPKUB1lEA1Wlk64STXj0eUOjWbcV7xNFGi/SFA0StxQY1OYvJV8xZPZ2nAL3jlmOURNo0J86LZ/3+M+NQHUpI6lEJFMB6B7CqhcwS/F9YbpIrvFVk3QaaU2iWrIWjsvDKSRvoAKpnCK9/IZWtwagifZLJq9SH5LaVMl4zQMI0DVBl5UcOKxMW3/deFR8e8n+0Gg85RYJdaPdnLmiwXQWssosU1ARCsYZEWuhnCPpVyCdjKT1J8cfod++nzwICDwWZ7bzLejhRtNUd3bHTIXBg1jg4OpcCu0FDsTDtOnktJxk7Mm9buPE1xo4Ec0y5JI0kZ6LbAuAfbcN5mGBU3vMcnA+o7g4nfQVD6UewcV+pjQy27C8p5TpoPLlF4fNkVATGo4Qpl8cxDTa4yYVq1KRGmpA7Hk/23bj6amcudhzKJoRzkgvqG5hoGc7hiLuaDa764Iv6lpb0rkHrTtoCe+kd0R2FC/c+9y5ElrNXEGXqB3+TpQZi3C6vA4Gaa X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Rv/Rdkmiydf+NyuDGBEGQlFOpMZQyUbEeKsPldqoW2OXOiYlKR8/9T8iV4opHID1/K5qBOHEpk4SKhePKFu0F8cvRjK+YgqgJyjqpQsGz/V8OW9dbxTsQyInSmXAoNjAvGkZwKH3ibYMauuxH71aplLbs0PvpNj6bbA338UNBSjeSfNw3uo7d2EoI2i22aqUXOtDWDAqvC1w3L9aTWTOTwnr4jZIGY/jc0BrayeNkGEKePlqyre8WEBRQ6OIE1lynFVY69mzBS2zSClEKEc00JQ/EDQK0MI5WC2Jp04y9+EcbWN3eHdgTPxnQUgXknT/H0Qfakls8767BSpi8ZgCLUKlyAow7kzi7ib/lZYYsOkIoWQN6XpicOd5+tj2RAuQwc211Id2KEDEA2KKhCTayiU/bphhzfkuxBc6FtTzBCSgrgldBWezX3zMfpIj3rfme+cmQ/GRnRorxKAqsKQt7+/7qH85dgxx5ar20K2/4mw3HXqJvfreTM7y1jIBqTXlrRCNw1kBcszr9mv/x8VxKICzpl3TILf5MYQH/lxlCSc+dvt+1e5iqcN9tMUYvrOqodU9sPdimT68Rkn3FMx2STB0QNZp3hFAS9YG1sGYpgAclhGKEnxsUF8Ccq8FWMNLnTsh3sfp1jhvIw9R4F7YNdoyFIPjhbgQMbBh/MHmhUap+YvAKR4nAcg/lEuwZ1rTxuVAJQlu4vky0USYOKiQiVlXxWR/VdzS4ljIQ7x8MoElRV0Q4bh8Sw8YbrDvwyXfTn4p33Q9RXfx1wzJpJKeyLm1pI8TZy+XNeIzcwSmYxeA37+5gyI1q3Lr723BC+n6Ga9VhPvSV8P06CyrTQBmgfRTGA3KEyYm7QcE2HqKYibSenLAMXT8zqReYGUv+VTTieceCCe0tCgsb7xPLpjoPTGXOUO0P1QgFDieMA2eYuP+eLGiKdb8jR1QI3r9T3xcSZNZ/8U3kyuHKhb0DNs++MUPwVuZqBcNJRS8FWyAAd4biypJvup4G0liL7/VxJFamhy+ON9odqAJuekrR9naObN+2ZR2yI0LD9N6YfBnU+z2QvLwtIjpqMiZml3vSq2d0tn6/UxByDdCEq74G8QAVH0emQ4dqljfrJO3Qkt+TVcvzud5xc3UgN+fHbdJdCO2WkivCE5O6hdGOH08rGq3kn34cJ8/RAUV+sdGZRPqwoG/zPFg9MpK7a6c5YJWTvBeM2hHV8weXx3VtKThkrx/iqwYlVesKuvERW0AtKSvcWKtwzkqj6qEnM9UjozHZJlg/bs4y5jjMkgSXSExigAlD6eU6tSZprVHRItBjFdNliLsJ/PN8mO41a1lrxWnwSOK X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4892b172-1c16-4d8d-4889-08dac0145567 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2022 16:31:19.3100 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0791 Subject: [FFmpeg-devel] [PATCH 4/7] postproc/postprocess_template: Fix alignment 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: VcOTcHTcQBkh postProcess in postprocess_template.c copies a PPContext to the stack, works with this copy and then copies it back again. Said local copy uses a hardcoded alignment of eight, although PPContext has alignment 32 since cbe27006cee0099076d1d68af646f3ef914167d8 (this commit was in anticipation of AVX2 code that never landed). This leads to misalignment in the filter-(pp|pp1|pp2|pp3|qp) FATE-tests which UBSan complains about. So avoid the local copy. Signed-off-by: Andreas Rheinhardt --- libpostproc/postprocess_template.c | 156 ++++++++++++++--------------- 1 file changed, 77 insertions(+), 79 deletions(-) diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c index bcf7bdad66..ade1d6ce2b 100644 --- a/libpostproc/postprocess_template.c +++ b/libpostproc/postprocess_template.c @@ -2860,14 +2860,13 @@ static inline void RENAME(prefetcht2)(const void *p) * Filter array of bytes (Y or U or V values) */ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, - const int8_t QPs[], int QPStride, int isColor, PPContext *c2) + const int8_t QPs[], int QPStride, int isColor, PPContext *c) { - DECLARE_ALIGNED(8, PPContext, c)= *c2; //copy to stack for faster access int x,y; #ifdef TEMPLATE_PP_TIME_MODE const int mode= TEMPLATE_PP_TIME_MODE; #else - const int mode= isColor ? c.ppMode.chromMode : c.ppMode.lumMode; + const int mode = isColor ? c->ppMode.chromMode : c->ppMode.lumMode; #endif int black=0, white=255; // blackest black and whitest white in the picture int QPCorrecture= 256*256; @@ -2877,29 +2876,29 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ int i; #endif - const int qpHShift= isColor ? 4-c.hChromaSubSample : 4; - const int qpVShift= isColor ? 4-c.vChromaSubSample : 4; + const int qpHShift = isColor ? 4 - c->hChromaSubSample : 4; + const int qpVShift = isColor ? 4 - c->vChromaSubSample : 4; //FIXME remove - uint64_t * const yHistogram= c.yHistogram; - uint8_t * const tempSrc= srcStride > 0 ? c.tempSrc : c.tempSrc - 23*srcStride; - uint8_t * const tempDst= (dstStride > 0 ? c.tempDst : c.tempDst - 23*dstStride) + 32; + uint64_t * const yHistogram= c->yHistogram; + uint8_t * const tempSrc = srcStride > 0 ? c->tempSrc : c->tempSrc - 23*srcStride; + uint8_t * const tempDst = (dstStride > 0 ? c->tempDst : c->tempDst - 23*dstStride) + 32; //const int mbWidth= isColor ? (width+7)>>3 : (width+15)>>4; if (mode & VISUALIZE){ if(!(mode & (V_A_DEBLOCK | H_A_DEBLOCK)) || TEMPLATE_PP_MMX) { - av_log(c2, AV_LOG_WARNING, "Visualization is currently only supported with the accurate deblock filter without SIMD\n"); + av_log(c, AV_LOG_WARNING, "Visualization is currently only supported with the accurate deblock filter without SIMD\n"); } } #if TEMPLATE_PP_MMX for(i=0; i<57; i++){ - int offset= ((i*c.ppMode.baseDcDiff)>>8) + 1; + int offset = ((i * c->ppMode.baseDcDiff) >> 8) + 1; int threshold= offset*2 + 1; - c.mmxDcOffset[i]= 0x7F - offset; - c.mmxDcThreshold[i]= 0x7F - threshold; - c.mmxDcOffset[i]*= 0x0101010101010101LL; - c.mmxDcThreshold[i]*= 0x0101010101010101LL; + c->mmxDcOffset[i] = 0x7F - offset; + c->mmxDcThreshold[i] = 0x7F - threshold; + c->mmxDcOffset[i] *= 0x0101010101010101LL; + c->mmxDcThreshold[i] *= 0x0101010101010101LL; } #endif @@ -2925,16 +2924,18 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ uint64_t clipped; AVRational scale; - c.frameNum++; + c->frameNum++; // first frame is fscked so we ignore it - if(c.frameNum == 1) yHistogram[0]= width*(uint64_t)height/64*15/256; + if (c->frameNum == 1) + yHistogram[0] = width * (uint64_t)height/64*15/256; for(i=0; i<256; i++){ sum+= yHistogram[i]; } /* We always get a completely black picture first. */ - maxClipped= av_rescale(sum, c.ppMode.maxClippedThreshold.num, c.ppMode.maxClippedThreshold.den); + maxClipped = av_rescale(sum, c->ppMode.maxClippedThreshold.num, + c->ppMode.maxClippedThreshold.den); clipped= sum; for(black=255; black>0; black--){ @@ -2948,27 +2949,27 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ clipped-= yHistogram[white]; } - scale = (AVRational){c.ppMode.maxAllowedY - c.ppMode.minAllowedY, white - black}; + scale = (AVRational){c->ppMode.maxAllowedY - c->ppMode.minAllowedY, white - black}; #if TEMPLATE_PP_MMXEXT - c.packedYScale = (uint16_t)av_rescale(scale.num, 256, scale.den); - c.packedYOffset= (((black*c.packedYScale)>>8) - c.ppMode.minAllowedY) & 0xFFFF; + c->packedYScale = (uint16_t)av_rescale(scale.num, 256, scale.den); + c->packedYOffset = (((black*c->packedYScale)>>8) - c->ppMode.minAllowedY) & 0xFFFF; #else - c.packedYScale = (uint16_t)av_rescale(scale.num, 1024, scale.den); - c.packedYOffset= (black - c.ppMode.minAllowedY) & 0xFFFF; + c->packedYScale = (uint16_t)av_rescale(scale.num, 1024, scale.den); + c->packedYOffset = (black - c->ppMode.minAllowedY) & 0xFFFF; #endif - c.packedYOffset|= c.packedYOffset<<32; - c.packedYOffset|= c.packedYOffset<<16; + c->packedYOffset |= c->packedYOffset<<32; + c->packedYOffset |= c->packedYOffset<<16; - c.packedYScale|= c.packedYScale<<32; - c.packedYScale|= c.packedYScale<<16; + c->packedYScale |= c->packedYScale<<32; + c->packedYScale |= c->packedYScale<<16; if(mode & LEVEL_FIX) QPCorrecture= (int)av_rescale(scale.num, 256*256, scale.den); else QPCorrecture= 256*256; }else{ - c.packedYScale= 0x0100010001000100LL; - c.packedYOffset= 0; + c->packedYScale = 0x0100010001000100LL; + c->packedYOffset = 0; QPCorrecture= 256*256; } @@ -2988,22 +2989,22 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ RENAME(prefetcht0)(dstBlock + (((x>>2)&6) + copyAhead+1)*dstStride + 32); RENAME(blockCopy)(dstBlock + dstStride*8, dstStride, - srcBlock + srcStride*8, srcStride, mode & LEVEL_FIX, &c.packedYOffset); + srcBlock + srcStride*8, srcStride, mode & LEVEL_FIX, &c->packedYOffset); RENAME(duplicate)(dstBlock + dstStride*8, dstStride); if(mode & LINEAR_IPOL_DEINT_FILTER) RENAME(deInterlaceInterpolateLinear)(dstBlock, dstStride); else if(mode & LINEAR_BLEND_DEINT_FILTER) - RENAME(deInterlaceBlendLinear)(dstBlock, dstStride, c.deintTemp + x); + RENAME(deInterlaceBlendLinear)(dstBlock, dstStride, c->deintTemp + x); else if(mode & MEDIAN_DEINT_FILTER) RENAME(deInterlaceMedian)(dstBlock, dstStride); else if(mode & CUBIC_IPOL_DEINT_FILTER) RENAME(deInterlaceInterpolateCubic)(dstBlock, dstStride); else if(mode & FFMPEG_DEINT_FILTER) - RENAME(deInterlaceFF)(dstBlock, dstStride, c.deintTemp + x); + RENAME(deInterlaceFF)(dstBlock, dstStride, c->deintTemp + x); else if(mode & LOWPASS5_DEINT_FILTER) - RENAME(deInterlaceL5)(dstBlock, dstStride, c.deintTemp + x, c.deintTemp + width + x); + RENAME(deInterlaceL5)(dstBlock, dstStride, c->deintTemp + x, c->deintTemp + width + x); /* else if(mode & CUBIC_BLEND_DEINT_FILTER) RENAME(deInterlaceBlendCubic)(dstBlock, dstStride); */ @@ -3025,11 +3026,11 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ const uint8_t *srcBlock= &(src[y*srcStride]); uint8_t *dstBlock= &(dst[y*dstStride]); #if TEMPLATE_PP_MMX - uint8_t *tempBlock1= c.tempBlocks; - uint8_t *tempBlock2= c.tempBlocks + 8; + uint8_t *tempBlock1 = c->tempBlocks; + uint8_t *tempBlock2 = c->tempBlocks + 8; #endif const int8_t *QPptr= &QPs[(y>>qpVShift)*QPStride]; - int8_t *nonBQPptr= &c.nonBQPTable[(y>>qpVShift)*FFABS(QPStride)]; + int8_t *nonBQPptr = &c->nonBQPTable[(y>>qpVShift)*FFABS(QPStride)]; int QP=0, nonBQP=0; /* can we mess with a 8x16 block from srcBlock/dstBlock downwards and 1 line upwards if not than use a temporary buffer */ @@ -3072,8 +3073,8 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ nonBQP= (nonBQP* QPCorrecture + 256*128)>>16; yHistogram[(srcBlock+qp_index*8)[srcStride*12 + 4]]++; } - c.QP_block[qp_index] = QP; - c.nonBQP_block[qp_index] = nonBQP; + c->QP_block[qp_index] = QP; + c->nonBQP_block[qp_index] = nonBQP; #if TEMPLATE_PP_MMX __asm__ volatile( "movd %1, %%mm7 \n\t" @@ -3081,7 +3082,7 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ "packuswb %%mm7, %%mm7 \n\t" // 0,QP, 0, QP, 0,QP, 0, QP "packuswb %%mm7, %%mm7 \n\t" // QP,..., QP "movq %%mm7, %0 \n\t" - : "=m" (c.pQPb_block[qp_index]) + : "=m" (c->pQPb_block[qp_index]) : "r" (QP) ); #endif @@ -3093,20 +3094,20 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ RENAME(prefetcht0)(dstBlock + (((x>>2)&6) + copyAhead+1)*dstStride + 32); RENAME(blockCopy)(dstBlock + dstStride*copyAhead, dstStride, - srcBlock + srcStride*copyAhead, srcStride, mode & LEVEL_FIX, &c.packedYOffset); + srcBlock + srcStride*copyAhead, srcStride, mode & LEVEL_FIX, &c->packedYOffset); if(mode & LINEAR_IPOL_DEINT_FILTER) RENAME(deInterlaceInterpolateLinear)(dstBlock, dstStride); else if(mode & LINEAR_BLEND_DEINT_FILTER) - RENAME(deInterlaceBlendLinear)(dstBlock, dstStride, c.deintTemp + x); + RENAME(deInterlaceBlendLinear)(dstBlock, dstStride, c->deintTemp + x); else if(mode & MEDIAN_DEINT_FILTER) RENAME(deInterlaceMedian)(dstBlock, dstStride); else if(mode & CUBIC_IPOL_DEINT_FILTER) RENAME(deInterlaceInterpolateCubic)(dstBlock, dstStride); else if(mode & FFMPEG_DEINT_FILTER) - RENAME(deInterlaceFF)(dstBlock, dstStride, c.deintTemp + x); + RENAME(deInterlaceFF)(dstBlock, dstStride, c->deintTemp + x); else if(mode & LOWPASS5_DEINT_FILTER) - RENAME(deInterlaceL5)(dstBlock, dstStride, c.deintTemp + x, c.deintTemp + width + x); + RENAME(deInterlaceL5)(dstBlock, dstStride, c->deintTemp + x, c->deintTemp + width + x); /* else if(mode & CUBIC_BLEND_DEINT_FILTER) RENAME(deInterlaceBlendCubic)(dstBlock, dstStride); */ @@ -3121,24 +3122,24 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ const int stride= dstStride; //temporary while changing QP stuff to make things continue to work //eventually QP,nonBQP,etc will be arrays and this will be unnecessary - c.QP = c.QP_block[qp_index]; - c.nonBQP = c.nonBQP_block[qp_index]; - c.pQPb = c.pQPb_block[qp_index]; - c.pQPb2 = c.pQPb2_block[qp_index]; + c->QP = c->QP_block[qp_index]; + c->nonBQP = c->nonBQP_block[qp_index]; + c->pQPb = c->pQPb_block[qp_index]; + c->pQPb2 = c->pQPb2_block[qp_index]; /* only deblock if we have 2 blocks */ if(y + 8 < height){ if(mode & V_X1_FILTER) - RENAME(vertX1Filter)(dstBlock, stride, &c); + RENAME(vertX1Filter)(dstBlock, stride, c); else if(mode & V_DEBLOCK){ - const int t= RENAME(vertClassify)(dstBlock, stride, &c); + const int t = RENAME(vertClassify)(dstBlock, stride, c); if(t==1) - RENAME(doVertLowPass)(dstBlock, stride, &c); + RENAME(doVertLowPass)(dstBlock, stride, c); else if(t==2) - RENAME(doVertDefFilter)(dstBlock, stride, &c); + RENAME(doVertDefFilter)(dstBlock, stride, c); }else if(mode & V_A_DEBLOCK){ - RENAME(do_a_deblock)(dstBlock, stride, 1, &c, mode); + RENAME(do_a_deblock)(dstBlock, stride, 1, c, mode); } } @@ -3151,10 +3152,10 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ for(x = startx, qp_index=0; x < endx; x+=BLOCK_SIZE, qp_index++){ const int stride= dstStride; - c.QP = c.QP_block[qp_index]; - c.nonBQP = c.nonBQP_block[qp_index]; - c.pQPb = c.pQPb_block[qp_index]; - c.pQPb2 = c.pQPb2_block[qp_index]; + c->QP = c->QP_block[qp_index]; + c->nonBQP = c->nonBQP_block[qp_index]; + c->pQPb = c->pQPb_block[qp_index]; + c->pQPb2 = c->pQPb2_block[qp_index]; #if TEMPLATE_PP_MMX RENAME(transpose1)(tempBlock1, tempBlock2, dstBlock, dstStride); #endif @@ -3162,60 +3163,60 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ if(x - 8 >= 0){ #if TEMPLATE_PP_MMX if(mode & H_X1_FILTER) - RENAME(vertX1Filter)(tempBlock1, 16, &c); + RENAME(vertX1Filter)(tempBlock1, 16, c); else if(mode & H_DEBLOCK){ - const int t= RENAME(vertClassify)(tempBlock1, 16, &c); + const int t= RENAME(vertClassify)(tempBlock1, 16, c); if(t==1) - RENAME(doVertLowPass)(tempBlock1, 16, &c); + RENAME(doVertLowPass)(tempBlock1, 16, c); else if(t==2) - RENAME(doVertDefFilter)(tempBlock1, 16, &c); + RENAME(doVertDefFilter)(tempBlock1, 16, c); }else if(mode & H_A_DEBLOCK){ - RENAME(do_a_deblock)(tempBlock1, 16, 1, &c, mode); + RENAME(do_a_deblock)(tempBlock1, 16, 1, c, mode); } RENAME(transpose2)(dstBlock-4, dstStride, tempBlock1 + 4*16); #else if(mode & H_X1_FILTER) - horizX1Filter(dstBlock-4, stride, c.QP); + horizX1Filter(dstBlock-4, stride, c->QP); else if(mode & H_DEBLOCK){ #if TEMPLATE_PP_ALTIVEC DECLARE_ALIGNED(16, unsigned char, tempBlock)[272]; int t; transpose_16x8_char_toPackedAlign_altivec(tempBlock, dstBlock - (4 + 1), stride); - t = vertClassify_altivec(tempBlock-48, 16, &c); + t = vertClassify_altivec(tempBlock-48, 16, c); if(t==1) { - doVertLowPass_altivec(tempBlock-48, 16, &c); + doVertLowPass_altivec(tempBlock-48, 16, c); transpose_8x16_char_fromPackedAlign_altivec(dstBlock - (4 + 1), tempBlock, stride); } else if(t==2) { - doVertDefFilter_altivec(tempBlock-48, 16, &c); + doVertDefFilter_altivec(tempBlock-48, 16, c); transpose_8x16_char_fromPackedAlign_altivec(dstBlock - (4 + 1), tempBlock, stride); } #else - const int t= RENAME(horizClassify)(dstBlock-4, stride, &c); + const int t= RENAME(horizClassify)(dstBlock-4, stride, c); if(t==1) - RENAME(doHorizLowPass)(dstBlock-4, stride, &c); + RENAME(doHorizLowPass)(dstBlock-4, stride, c); else if(t==2) - RENAME(doHorizDefFilter)(dstBlock-4, stride, &c); + RENAME(doHorizDefFilter)(dstBlock-4, stride, c); #endif }else if(mode & H_A_DEBLOCK){ - RENAME(do_a_deblock)(dstBlock-8, 1, stride, &c, mode); + RENAME(do_a_deblock)(dstBlock-8, 1, stride, c, mode); } #endif //TEMPLATE_PP_MMX if(mode & DERING){ //FIXME filter first line - if(y>0) RENAME(dering)(dstBlock - stride - 8, stride, &c); + if(y>0) RENAME(dering)(dstBlock - stride - 8, stride, c); } if(mode & TEMP_NOISE_FILTER) { RENAME(tempNoiseReducer)(dstBlock-8, stride, - c.tempBlurred[isColor] + y*dstStride + x, - c.tempBlurredPast[isColor] + (y>>3)*256 + (x>>3) + 256, - c.ppMode.maxTmpNoise); + c->tempBlurred[isColor] + y*dstStride + x, + c->tempBlurredPast[isColor] + (y>>3)*256 + (x>>3) + 256, + c->ppMode.maxTmpNoise); } } @@ -3229,14 +3230,14 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ } if(mode & DERING){ - if(y > 0) RENAME(dering)(dstBlock - dstStride - 8, dstStride, &c); + if(y > 0) RENAME(dering)(dstBlock - dstStride - 8, dstStride, c); } if((mode & TEMP_NOISE_FILTER)){ RENAME(tempNoiseReducer)(dstBlock-8, dstStride, - c.tempBlurred[isColor] + y*dstStride + x, - c.tempBlurredPast[isColor] + (y>>3)*256 + (x>>3) + 256, - c.ppMode.maxTmpNoise); + c->tempBlurred[isColor] + y*dstStride + x, + c->tempBlurredPast[isColor] + (y>>3)*256 + (x>>3) + 256, + c->ppMode.maxTmpNoise); } /* did we use a tmp buffer for the last lines*/ @@ -3278,9 +3279,6 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[ } } #endif - - *c2= c; //copy local context back - } #undef RENAME From patchwork Sun Nov 6 16:30:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39211 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1637573pzb; Sun, 6 Nov 2022 08:31:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf6XMQ7zsJi0W6rePfsyruj50GoXpLiCH9aipytecCG4dXqXk/ah4LXKpHzYhkGR05GUh0Ny X-Received: by 2002:a17:906:2284:b0:7ae:5aa5:518f with SMTP id p4-20020a170906228400b007ae5aa5518fmr5373836eja.760.1667752306114; Sun, 06 Nov 2022 08:31:46 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k23-20020aa7d2d7000000b004622a17f12bsi6329415edr.259.2022.11.06.08.31.45; Sun, 06 Nov 2022 08:31:46 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=nChWAWVo; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8097C68B9B7; Sun, 6 Nov 2022 18:31:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2036.outbound.protection.outlook.com [40.92.49.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C69F468B8BF for ; Sun, 6 Nov 2022 18:31:23 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ALgva7uq2AQh2XGTv2n6EC+X2ndwzKzP6KriNopzYxLigPA5/vhq6a4g/2Aip7yRbMMmuXSTmh/9XDfpuIzpf0z9rXbiPOjCDLYLEhfFVimZV6j9hX0+0iWc/8JM8YXwQuJFd/l+aOSNePHirzolQ/2YYsmHJULZW2tuwWx4efMlyebykPWycjsk2jLm24Tk+aKnQucloI15jT3Im5FKI3KosNh2CSkhKOkc/815Cob75VtR+y3Xc0fNYrYrFjqb6cAxnVGoNRnkXzlDNAWSYppBA4JHCgcOKTTEhsltKCJ6DUqra080uB0hoB2tiEZnRYZxiGhkXyv/ng3QwAxtuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Y2G/AwMmLCEuIQl1whu+d/8Ki6Bw3tkNNfKLstINdo0=; b=PtB/gKBktqL6a7tjn2gRiA3vD7jiWeHsECpTJgxUfiJO7cpmWxFtr2cNDmi8HTOhF0c2GA9bEFTsdQlaS5uPlT9Z3M6rKxr8r55KPJBRd43e9AZsHz403uWHMDf7/Iwm9R1CHZQP5bQLFj+dzB/IuYNkVO7CMOB8aUCJXJ8AyOBqG8rpdK5+sUfzGePjvrmKpQb2oYYan0g82eMoEWR7kclzdOimFYuNwsh9+62H659rtHF8RMnKdv06UkiSLYjmi76BlFUEgfVVq/CAU/6rqGNp5Qa24nsSdry+YzixDjo1UcPJIQ5cEide0MFyEBNyTenMo3CE2zMD2UCYMej6MQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Y2G/AwMmLCEuIQl1whu+d/8Ki6Bw3tkNNfKLstINdo0=; b=nChWAWVoshKEsKw3YUIdN3bPEDm9sWRxUggaheJmorVcMk9EAFxN8OuYK00pSGdfuNilGYwyaxBdXYLUuZo+7lfbFMuKQ3ZWL+uKWTsoDYPkiog57jEOnO7/9qr40ne9xNBPlb5mXvaqHlneuC01MCNzFghlvFFZKcWgd29JKTjgvoLRJcbZKCDgwf3hhLnaCBAZUL4y85wNDmPJZXihiv+5qJda6nlKWUCkKwqp6b+tfCSq4wjgKNJ4MYXfe8Lxt/UuG0dwrkgwCskgs4uwgl6lCIPX1vlajyQPQgwsUkGFz6ikx1GSn8nbNvY/Nqlyvc9LK+yXJVhqjKy0n/0AcQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0791.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:570::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.25; Sun, 6 Nov 2022 16:31:22 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe%4]) with mapi id 15.20.5791.026; Sun, 6 Nov 2022 16:31:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Nov 2022 17:30:59 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [B5Ub7RBsdCllbsRIbZSv5I6NRZKUt/Vp4a7fWoCGlK8=] X-ClientProxiedBy: AM6P191CA0102.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8a::43) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221106163101.1141408-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0791:EE_ X-MS-Office365-Filtering-Correlation-Id: b8bf12ca-3119-41c5-15b7-08dac01456fd X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqxUC2t/XAH2JXAVSoE8CDQHN15bQokKwMS/ZHR+ukYe9t48/K4t1tcbue+vr8tTLC1nV3eFvt1NjkBMnh8Sno1ODmirruLbzNe7PjWKa4b7scgp4cQb3son8H00XV1JY/+fIycLqqdiUh2dMgeyPtusq3HRr27e80k6WiVTKu1EfgCE9turkyceZdLHGxdXQ/4PmRVCWmH5whwS0n9BfrQCLiIv3n3K3h0n9MZk5hGCzb/2tQzNrYe8ZR+y+8vYMMwXiEsxCpub1KXA9AKvdD89XaJs06J7/AOL85AWCsBQy4PE2lI3SuyInNMqDXEtynDZOD1YMMY3Yb0Qweqp74mOuWfarHTNFKvph6/vhKCveciyMJBGOEOYob4nAmfN8ozNJJcxhjAdlvlmH+dUnneo1SaCDlnN8DWPCas+f57wq9u+3VDWXW3qhsRd6voWPCJKw5l9qYMgIJU2zXNCzOF5+ATvtveYkxOxH+Jyn8oYKLjdFzlDSzSZI2j3Qz8zX1MpHLXoOPCWke5fiuR9gX8WWjGrtNHKQ++w6nYXTkHlEzd27iW6Ik/jud54BWN9SaYQ9mz4k9zLNfj1neBikQlDcK082RxTtJGfI3bFp6Ur4vRY4DuKZBpVIEHYA7QyPfnCAzsaKwNb1SSFxo7sWVkyUBuuE5F++dHfAqm7U/SgZD0+flkYrM+oPFzQ1wsvHmY3pUdjfoVsHBt7GSUc4jDCbferI9L+Lqp9+073XcK9JwXKI6uKsRb86fg9D0+46Q= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FYDC0tQtUi89slJCNTZqZQkAlpvAB3uOQ2pH+SZcvKclUC8wUFEgmtfhyWSiSHyAmDjagoJsUFD6VV6i6reeW6odLgVWjbGMDLXvjqNRlMFQBJm4SguaxJsQHkUgpt0KwSG0SA0JJCQ9V8HXOLD2/9AeRzhjCWC4X9am0lltY6ibtSkvvwuYqMC0rtea0S+ffDeX7FB1eBu+3sCrBc0BS7hj69X2/arOZRlvpmfWVByMEgUamyNhxtmhUQZgTlmyIsVG2ZFk+/nW+4CLwxDBx0DFoZXfdlzPsHPtFoVE5oexszdzyYCJTu9uvq8yh3tilxR0Ismjo73tkyQLH4GCzn0uzjWgAYKxZvhTwjHqrltmgWTBKaHt2db4Qh2vRvEuDVQOM+Hnh4NbEl/uor4q1oyQCUdAYeLLUSxif+MnfGJGYOdGFXtQI1XeGtxm5EHBNBgJfYiZ9Lz+ppIm+UToQm9ts1+TthXZ6bAOhew70v6gAqm2n/CMOxg3O8iPLvCaxcwa0q3v7z5+U4vTKLBQ7Gzh7a4wevgxaIlJw4xQyZJ8RTHgpo49Ro1K4yenDCtiS06SnVjWGgxcJBTrrQs+NoJlUzpHOiC3kMaYy+BVb8Cbb0Lu7iNIqAU0rrz7IuoILdvhByBG5qiV2IIWNjrjpxQNxvEN8JlOghph6j77ONpRog9NJ0L8BCxoyB6CZOwP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n0Kes4IoJiN7AaWM/SolI61A4gsq/o5fPTrTEQo/017YD0FsZCMVDqhdSPkx01h5dDzdfWIk0nEJv6fxziOlNkPqdXlbAhQ+mnkmJXMuE5atMICc5v0XYsuc7eEk/THj6/2cIdKdIc8GUmeoT1/CtTPiId1e0iFwpeGwoCX3snn0NyGvdVjXn9n7MQKi/Y56eNEmHCaXpstUxe96ZJPR/BrMDdimERlonK3b4F/UeD1lIZ/ErfvPDjpmzey9xvqXP7zkEBG3PakKwGStKyg5nxHLy1e9lOdv/hPD/PKmRTTc9uwYwkmIkHMXl1j0aGEifhBjvpjvgxvkP7lsU1Sy7NZmW5hE2iTv8nULTtYyJRPuX3VKMyB8RZxLtmxNYHKDFaiwelhwiyV0bCipqHxyZWdGRHZXHwgRmUiUcyWwdKv+q77fLothGvwMksELitH+0qSPrKzoEWvxyKm4jVEb4xp8pDRucOMyykyo4cktE8LMBFaRcdvT5V+AAwl/a0q+rgg2B95sKScqfqyy5VZnnOgfoseri4ZdzNYkI8aMLZnXlWMPUvC9wKZf5lfCtdG3nyJIBbxs8uJKfY7aeEe8CvbsG+5TvgrmzzoIBwIMPy2MN9xwMcdlbGGlt9tPLr5jTanXraaddJE8t0YIw0wsTFipv96Ut5b81zvwz2PLuNmeGGOb//5rSnCsMsyld9CJJSg5lEPZ/OJzb95Q9ks99v5SjhnQU9294n5BqITXcgkODE7qAf+uai3IcyFT4Va+WJeVGtzeOFMxs1Cymxp8/HdlCtpyFjwUrvKPFZO6UqkWXjMdSHQWX1y6V91a/h8sderSlyA34EA47fiIPqDrIRx0uYJV0k4CNZMrujU2Wh2drIQa0BuXIOSYRZ3XmG5xjgRmAzaEhwaKZHMnXHJhCwfdvPylOFNHEbu+9tzJ87427fH1SPtENH/IGdZOmqKpNsxW+LPWL482ZrvKQapQqOtnYdOG8wQV9Ngyytsj3EInV//1w6anmRsy1DmVePdLYdgHs7PxgXp2W7/wqtbShy6RMM8BhOlDORdAM0aAW8BnDjSTNyBRERn4ELXTS+sDYVvcFKaqbvezPJi1fMyxZ9XacArxu2Ds5Mr0Qwe+yXtBzq6PchPFHBFk4UA/GCtwHa77OUloK90cfMn1E3NpngBIgb19YeUfWRiZVHc2fDSSE/anGkm72ZwVxzieSSUcCsyMbANDx4DF0te3y4EYI5DkJNHvoAkhvm6hfNkDn6dxQMP1+l7W1zzYwkf1pVDgHE0o6LJ8+4TD3VdRiRbBx1i1UzTu6xx6tqjGc7kTA0ifvjyJcADS8iyCP8n+BiGM X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8bf12ca-3119-41c5-15b7-08dac01456fd X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2022 16:31:21.9682 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0791 Subject: [FFmpeg-devel] [PATCH 5/7] avfilter/vf_qp: Don't store NAN in int 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: we9ZOe6mT0NZ Affected the filter-pp2 FATE-test. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_qp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_qp.c b/libavfilter/vf_qp.c index 7c9d60fe21..a771b51ae1 100644 --- a/libavfilter/vf_qp.c +++ b/libavfilter/vf_qp.c @@ -143,7 +143,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) for (x = 0; x < s->qstride; x++) { unsigned int block_idx = y * s->qstride + x; AVVideoBlockParams *b = av_video_enc_params_block(par_out, block_idx); - int qp = sd_in ? in_qp_global + BLOCK_QP_DELTA(block_idx) : NAN; + double qp = sd_in ? in_qp_global + BLOCK_QP_DELTA(block_idx) : NAN; double var_values[] = { !!sd_in, qp, x, y, s->qstride, s->h, 0}; double temp_val; From patchwork Sun Nov 6 16:31:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39212 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1637612pzb; Sun, 6 Nov 2022 08:31:55 -0800 (PST) X-Google-Smtp-Source: AMsMyM4ji/1HWiY7Rb0K3SEmxsAI4SsENnW9leeQhURp/Wgq+nxahSpBnwzmAVlmnbzH+70sirqf X-Received: by 2002:a17:907:2063:b0:7ad:fa6b:e84b with SMTP id qp3-20020a170907206300b007adfa6be84bmr25552443ejb.69.1667752315400; Sun, 06 Nov 2022 08:31:55 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j27-20020a170906279b00b007982c5e6ec8si4598751ejc.89.2022.11.06.08.31.55; Sun, 06 Nov 2022 08:31:55 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=NMoZqdcs; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 850AC68B9F2; Sun, 6 Nov 2022 18:31:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2050.outbound.protection.outlook.com [40.92.49.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E04FA68B940 for ; Sun, 6 Nov 2022 18:31:25 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WKKGmAOLiFPj/gt7HacEwovrsTCkP+t3CulNA7Bk3IorAk1Z013yG655YLx0VMA3g4gwGDBHr8MzXPeu50P/y6p9pjnUIqdVJnh/cCr8pOu0i9gM6IUdy25gz4xRBkM93xD1CLfH5uHXHR4DAizyqcZ8g4sJrxlyScZ8u05g8PdxPVe3QDS5uYmeQcVs/kP46mjIgPu6QBRexDtxarRQK4qTza4QCQAettYt3pYwqwvkBLNNr91EmR+XRnbV3CmDxgelZdlScsIAXaerTJuTN1zzb/qlBOOjF3auG4rRNAtkiRIHE8odMStBpGQkLEuUNg8CGleqW391Rg8rV376oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=exNbXPZuLOu/VhuQ3bB1jLKKqb5kr+ZLvrFkDOn5nK8=; b=G8yYmQiND2JwO/a+toP9cvd9oO1I2HuvZO7a2tV03SflJMmQuLIPlzHK1FpQQf2mJNBEi8cD06lwLAcFYBJY8XGar9SeTgwBYC2y5J3/KsiSDvdm2zSggnI9tbexMOUutCrJcUXgzjv5cBMLvHJHC+fJO8GKKvep7rgUh1B4q1ZaDTprCjMw0XJau1vc139FeoAiktpbyp5n8hBjCyIeUAramj5oFSS9ltn8GiADdew38wYJiAx4kwQDHvpVmJpe2+VEms8gnJTCm1cgTeKqXduZ61kYX5I2pqyYyuFOyOkia1KYNV/vnoG6F/tGq1zYBggr9VFsqkkLT7m7jEXIMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=exNbXPZuLOu/VhuQ3bB1jLKKqb5kr+ZLvrFkDOn5nK8=; b=NMoZqdcsNfTOalZ2Ns5J3sQ7SnfamYvhQJWWd967IJx6RF80vkiOQ2N3ELoWg3F9mWJqmJNVe6FnJT0ggn3fyL4A7lBc43ymMD/7DViPCZA5M9fSSuH5AHfYLt4tpF5td+jiT8XPbmLBX37jaIjbVUUboo+Vf4XBZWUMsmP2CETpvxbooe+rk+Wg3PBgQlAxxewaDZXXkcYfwju27ONcAPOdFNsHN+Lzubx3x17gU0chmQ13/N5+cSzc+q+ZSl3BMU5ou/zkAU+9FKn6XIDHbkAE7kCn1+59L26b3IN1qwEBzAGSqyCPre91KCfyZ1LThrOyzbM78ZtbaqZjAPGzjA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0791.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:570::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.25; Sun, 6 Nov 2022 16:31:24 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe%4]) with mapi id 15.20.5791.026; Sun, 6 Nov 2022 16:31:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Nov 2022 17:31:00 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [GSWFBELTY+UFZ1H63X3o0RlfmJthUtaZq7GuVcROMfk=] X-ClientProxiedBy: AM6P191CA0102.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8a::43) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221106163101.1141408-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0791:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a8cb5a0-afa7-4ca7-756a-08dac0145860 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqxUC2t/XAH2JXAVSoE8CDQkR8xvLmwmMbQF2IK//gEL1XAuTYyhT9BwNe6yCTVTLIdSugrfmE7FMWnGcjbiCsRgXWdOogfMZ+/SLesd3vDDQ3keiJNmMmIKKm3HZYH2vGhNmXY4UgXcMrIJgBb14ogLqQz7zGgRWSvuvRJuCsKB+IY6YN/u88S+bgn5nqV6/GqXdIRL3H68ndYOjefwoZnTmvJN5mh4gdQWV3hRwVhp7SKGMI+f7ip0ThNGWWfiTfdOnaygCB0P01JlRvH3iX4Q0coWKljAv7kovq56WAUUNLWTs5YHOPVZ7H93jBWwBm8Fv1Awkb4XddTNFv7W6/f5n4OCdac3QN1SfhKERzymL0ar0imPh9JUGDq28tZxfjzOULYoYJoTSyqsp2CNwIbzt0j/uHjReheNs80h4upgQlS6X6tqjHlTwxWqdATMCa1q8GGG/AwIOKT1A/hQRxHWgLrfp+FL+rD/QsohtbrQytXkyC5XosZg6YT9sHHvqwmjmjocyQNXnHK+hL8JLu3LSuJrnLhH/BGS/XBjosdtjFIu11wvSiEbiAmq0heQpRCb40Rg+2FM4UhcC0q4PbsE/2Lh8LdgLgNQEDnmmZOtEtDG92ervodUp6STN/pOvOpAQ8CF1yCxYDvEgPZm+PTk3Fk3DoBl8p9+CXuX5QfYKa1laVXp6Ba9nNjismAprJmZ02AgADLvolXgfogtUAycUz3HO2KTFBygsfuTCEQnaezf8RHXD6GICEPa3mPuQQ= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tRAl90aK0CNRzcTa//e1Ud51PqlnACg9n6Tg8dlx+bpdYtAsOSRN8wfWLVNosL4/N51mBZAScj81KIG5dZFPHw9mzhJ5QiM5Npc3l425ZL+cvE+TJmM+8rAx/89uNgFFH9lMWsZzkPsi/DVaCgmLhJU14+E4TVGB5QI4hhTZlH+BCGm1XIDtAnsC6oLQ9pi7Gx+bRKP4Tz/cGayt9Al7feyxtLG4PV5YVPBx18CVWkufK2Tpt+BFAk6R60mKULAtHT0E+pNfNnxXPC7qabM04f9AcADUDHHTWaVpb3ICCPgq2m6OGm9TuLfRl71I9NmjP6gz/8/GczKm2xd9sXQ47uQDgtIyjETVhjwHPJre7SCiZ2842osznXQHjjLkMplFNvPpEI3qhpCZxXmJ2zjxW7+0eNv8hkYe1w4RgdpjiIJ2MSssPAHM4aA05UKmbnBpmrW/wAAvseVbalFP7cIpYWd6wqiITaf6tiGVg/124a3yKlmm1vVcwCI51Dn5OQ9u1m+fXUuzLVHOZbEUETk2cq6bAL7DmyUODO0FcglOUHWto2RwsrSCI9YRYA5EgCEn50z+QCByJ4KV8LvFlJIqOOWaDhR6aw+umFsMQDiXpAR1syG+j5LVbwKVoVv5I1Uw9Kx32SHdhd7pXdVgrwX7UUR5r+eAp2HiTN5zJe/ZFDslQf8FImCFQLguY412BM/P X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GheMwZgNIBKwlZTnvCtTdQ+vcu3w77SrUYpLxcKCz1XWjdUo0G+jkmwqCg6CI16QhvlM77Mt1nH6SuxpR1jYWCOy0JEkNxsKCRDdccAoXq5xBatS97QuLME81zQ7u5+HEHCvOqsNKELta1miJPsh39uJ+WxV8vxeUbmdGnl5KchhBtqi1xthtl5EK9W7C1lRcNnHdre8sNGYAUUaO62/PtMfM1Krhtwljn2Q1b++LOOLMhkbFZ4Jvhv+oyG+fi6ehj8oFRIwaZbLG1ZdgS9+oICtYPdoF+cyDfnYcidFOHHitfodwSqZiDb7NDY1HaH9IOAtbnHFBnXsjhLaHWHQ/Hd1NMAasgBJ8sHJONtrDXpKXSxUjWF9y3Slyozj8HtWIGf9C+AmeW0nF+SkyK6q1MAspDRh9BkArh46uR0pY4z6W6rBl6IxiAfxP3mIJG/3P2tHCM5TUoWi9zohB9+ZIPvqb/7gUr4Nc2uwhtH4Pwy/Czvl4YrE4rMZlivAJF34a6RQb4WJ/XjQ7NkovCGPPgsK5OLILe03M6GXsWhw42BAi0anFpnr9jM5XhwYOyXnKMwHbcaSVag/QpgSRhX5tBJFfHYhAulw1sEHboL32NvYgwBv8cyNykqHmfrSomwcrdZAEBT9Eh9TVI2s4KnzsNPfL17l9AW3vWPshWeS3GFuHRuVkYveoMj51S4DeLAzKdi9NCeVhRJ7524giaQ3i256FU8vh95YjvnMB6lrHkJe5dbgOdbyB0QqNnRME+VrVyPneCo6GaJ/saZjtB+l7iMbNYWuq5Ee7Ur/0SI/zxSeLwSpJ1lzlwUMS4zhJPE/Sk5H3sIN3CCAWPNE9lgSp8g505JlU1cimTH5+LPIVRFK9DZmv9OwMFX4bALNN+Fc7CGK7+mQFaRbSyYkZ6QAe4tu85WZtelGyhtT1Mk+k4cyJqTgOADu/8E4JC1Ce/W7UlD6eO6+jGIfUBTm7+X/c6uieoxlsFbAMkWuD9A0UldG68b4vSW/VcySarWeG1z+czCQWH8bLt0B9Jso+X6oQRSlzSM/ZgpUSS3Lks0hk0Y4zSnXklHfAju9VDF1zYKnSdADo6SY1ggoegG5d8UNkfGFXWW+EPxWBkuzUSXPJIpVWZzo/HP40SzLuSJxTlBosB0UHaQw2zWsGQLjk6PlZwXvk4BIqfEozM3V8wS9p4vtXkgE9R5KonowUfbUhVjpISK87kQcsxTcd2Nd+6Z1OS6SHR0CfTkNbzhxTlvMsjOofAzDWvKscytxXWZNIWfXXX2C46ahi32Y/HRku0BpCwzY0ByjhBu6nFOo1x6zgjR6l6pJltYonxTiYNZgTKbR X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a8cb5a0-afa7-4ca7-756a-08dac0145860 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2022 16:31:24.3128 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0791 Subject: [FFmpeg-devel] [PATCH 6/7] avfilter/phase_template: Fix left-shift of negative numbers 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fuvo/BpX+AYX Affected the filter-phase FATE-test. Signed-off-by: Andreas Rheinhardt --- libavfilter/phase_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/phase_template.c b/libavfilter/phase_template.c index 491612b826..8450670234 100644 --- a/libavfilter/phase_template.c +++ b/libavfilter/phase_template.c @@ -46,7 +46,7 @@ * * (The result is actually multiplied by 25) */ -#define DIFF(a, as, b, bs) ((t) = ((*(a) - (b)[bs]) << 2) + (a)[(as) << 1] - (b)[-(bs)], (t) * (t)) +#define DIFF(a, as, b, bs) ((t) = ((*(a) - (b)[bs]) * 4) + (a)[(as) * 2] - (b)[-(bs)], (t) * (t)) /* * Find which field combination has the smallest average squared difference From patchwork Sun Nov 6 16:31:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39213 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1637670pzb; Sun, 6 Nov 2022 08:32:04 -0800 (PST) X-Google-Smtp-Source: AMsMyM4PXwveuQ7ujbAlgFxQc6xq1jf+fbaXMGm/cO2zX/36L6l/zufp5F5TVWfucw8BuzCYbHDQ X-Received: by 2002:a17:906:4f82:b0:7ad:c7d6:eee5 with SMTP id o2-20020a1709064f8200b007adc7d6eee5mr37294836eju.681.1667752324195; Sun, 06 Nov 2022 08:32:04 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gs37-20020a1709072d2500b0078dcd448f99si6111940ejc.855.2022.11.06.08.32.03; Sun, 06 Nov 2022 08:32:04 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=FXqAq3pe; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7F11D68BA0E; Sun, 6 Nov 2022 18:31:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066068.outbound.protection.outlook.com [40.92.66.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9FF4C68B9F3 for ; Sun, 6 Nov 2022 18:31:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k3p6PHpEpYfel6izlBZELK5YGaIhwHy9q3WdX95UlprS0clWHpyxbjckd+e+9iBJfIU9n78w0Mak+UUCRLomr5zSeIY8Vv6LJlb8ywTlugM6LVV390VgAzUsMf4qFBj4s/IIOJTVwQYn8sNcr841049UtVwEtpEcT0/+I9FdE/cosl4sc4kVcB4ywM7lyPsG/E7ePIIiLJcU0gy2UZ+4uFLauOdTPhUSyTWPTGY6K9u0ocfA0mf2ATITxmvlq7pVwcpBXyqH7sy8PlNvD0WeGX59xDIHIAUIXzB3mvwSBwnnZLqNlbkYBD7cX7GQk9pzp20yV8PU0E9k3f2YSRHppQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4fFmDlfgMC1/uOmaOzyLpxsBoR2ihWY1Fducyb4HF70=; b=iiI3hbk8eXq4Kis1Lx3jJUzua1DWVi/wgce50T09aHOOvArNyzY3+Fpe6upavK8d5P7ppYNSV1SsyzhKcFLx/mjpYHlyvA4Y572wxmiWucT5jzhQBu8546B4W6e2+qHvpRzSjkcfV4qoffnAEuXODscnWr3Qjy5DHnX2dKg+X/NTW9u3Mc8vhFih+i1WAEkInTYeQoL0BYgolDEmY0OjHHN9WGGRNRe1psbhkqbBTI3tQHG3ZeHK0iY9UdGJQ1z1qb/2+PQjSRU+KOIhwgjlutpYix0gLhv3aIKhW0faCdFa5XwMRjkV6z+n3YuXfCH1CoaoxQcsBN/H3trM73BtwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4fFmDlfgMC1/uOmaOzyLpxsBoR2ihWY1Fducyb4HF70=; b=FXqAq3peehYbR+5MilEAIGG1KTdr9yJ3Jl7xAKIQrjHxFAvNr3VGlMYq+/QVK9Tt9rKJvudD7TkHzfENkyyNNE4p8HHw57HU7UaUgYzcYE18woK8Ezpq/LaOzn9vWMOcTJb1C2vr+lsFcYXFwSmgqh90+Z2c/QOnIjCb945ZJ7QdUJ4ULFQ8SN30vDRbhzfD8i6A2tsZyDyMsOWDAnI20hoh63HBQdQDCV/wo6ip6F6WZkaq2xvYD4VBw1BjxtZpU8Le5D1GYW71CWcx7aIn2HnXDaXfLBT1r2NwjEkXIlZQmw+CG5TdBAOcGhUpW8mtc6EXPMu8AYPR5YaHAEjDzQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0026.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b7::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.22; Sun, 6 Nov 2022 16:31:26 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe%4]) with mapi id 15.20.5791.026; Sun, 6 Nov 2022 16:31:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Nov 2022 17:31:01 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [iquLYiYoda/C8zWIFqHRgixXGy1n9yusAiDSqPHglp4=] X-ClientProxiedBy: AM6P191CA0102.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8a::43) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221106163101.1141408-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0026:EE_ X-MS-Office365-Filtering-Correlation-Id: de89107e-3af1-49d4-3100-08dac0145970 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqxUC2t/XAH2JXAVSoE8CDQGDC5D8OPt3oD2D+4uIaki96pZU9hiOeVAC4JOvSZKYP95X5qx/aiOk9kvngZSsFpravl2iijDkY2E/TXDjrftUCzylW2K45wT5sJn1whIC6lzTRUuh1FtkVRgaBtCD8xMY1Y2s+cSPS3HN+D/IRnXPsZJBkQxNFkkcg1SX6I60I2Kim6QXJVFaxrpZpyftw1eqH/GfE56EGjKx4GH82FVfFS2qbt+weOFEfQCGp/MeUMpc2xSqWpN8QoON414AsIR0N32nXLv21oj7FEeiJuEAFxvDLqDKNHtUWNHLka8K2eCH2VixR1Yqmhar5i5uc+sNRanepMB7rr1IKBp2KW85tNL7Azt10R3JzG/Ar3R9r6K0vvr9+2lJEMT/x4x3Rbnwn/p4NzUC3xmc2a4tVKh3McXRieuc0SLD0st9kLazHZRozUuebyWRxKwizvb5Iuc6CPis6fkAcjudzm6Kz8GwB3YSHszLLzXyWRqkdWksOrU/pY5zL4NmUHc2Mzg+qTX6RIWoedRe1e6Sk/oX29a2+fl70P/cNZUL+LRZEWpH8gViLN9djdVBwomouiXj5HhE4SC/jXcEUAK0Hijw9avADHhSrYNhzAJNGXjjC3ediBCTGaf6yPuFKC8tQTR1Gpf7504gKq3Lvctnucfw3pSmEaZY/giFVXVzWaNVjWvpAGEv9agOfYQ3YjfUXPLigA3OuxQrDysxD+GvLvjccYY8rlVzVt50vgPCbbe2VrvBE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9j2DoTV8eDlTaxMNFU+eyMj0aMu8ag2t3crl5Qsm43sOFtTBxF1PpyND3kK6l0o0xP3OE/VzqZHu2p/QMIchJ2Cf5TAesP/z490lhjnXoTXaecNz9hmHnUBTxETIb+T6zji4MXgUPAQxqKN9sbfxpzoCZCEdcYjHpJ5cP0LbnJaPKbAq74mLTmeNldZj876r8VUW49+jMLJzgNhfkbvzfap/9gYqGfCpo156xT6yOTeB3NsqxgPb4nwHSvbUzLdcttRrf0Ku/mJlm9zChh8gKQRrwYpqIW95y31V/sV0uqDyLCGwg0e5HHCMVYP74NseI8fji8sYaBIoNomWmzfdC+JbxUm+jgXj8TEgCCHkXOruHzzSxnwBNcllcJL7JHdeyEoBsLNXEZYUah+HgOMmaxxFvd058pR+TOHNLjAX34wV/n0DOLVfJPFUILSQnbbej8xbPJx0rQlL1q7LAFuyQsCXq0Y28c/RlubolktTeyq6GR/lMFjDKnmaE8fup5+h9G3/HAUEXT0puOSj499gXLbk72WRTT96sBM2izc1L5H54d+p3rBjFY3BpFgGbGjVKU7CKMN1O1r5zhqyvoMVD3NP28HTDb8dv41pJi81fLAOJogqzIgcCfpkAT5OSOQKL0dLpftNT9fT2QmE0QJxO6iTjSNzdUHNfBVTH9KRY9p1PNxK5tnuQnvUYS8HpyWW X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xbYCjcpa/JW7eh7dreM35M/RBkG/Y1Q52bm2GxaKYJ792aJbTjsmlffgK41bffeYVTTaGUsdr5UuDkgFEv0GWbzBjlQbVFBETYukpi14RFxHfoCxdQ2UCbvK0OXwrm0Bs4rEC4SA+WZYdzUXCbCIi+FjOi/rafJ7NINHnS83VcXtWRqWP0cTplErTIPHIzJhy82WMpUjvUVVUK0u67hfHctbtHv8tIBTgwYwovk1UrIOY8tMS44u4nScsFALmglXxnnG8jsjMQDmW1b4AuCkIrdBPXBb/Hg/Jy8wbW+ZcHNpxx94jLBlUzhZ9rT+EwjugpiNE7YBEU8UJGs7No9snMaVQKxvExpRPNbHkgjKrohb00nraQB9ljfL3v5a1N2PzpkHCvQQojUXTCZy2nbKIFnCzwMcGN6wqYHSnlSP/KwTg3DG4Q79Xe7HNttDGsHbVuRrwbyxehyYiGTdKgfwabkYcwFREU960NYYtjl7CPB/vU8KckB/i1/Ojgb6sezkCNmo+kxtx15CYoq1BkKmkobT6bT8RTpSL6BXSVNs10flTlOLPUIgIQkB59RAYWwBi1FU4Ib6pblCLmFWSt5MeiVaMNRRkgEI0tIAOse7u1D9gxBeRB41qkfEWP32kmHNtluc/rwojaYJeSxGsCwB05occ8lwE2YcgBwtxu84l/YQONYicRjdU56IVHIt4oc8X1FiVZqTsIfOhWkVcia82wNd3oIK3IQzOT98uQV31f6z/ersai09rht/+MZKiPUp28XIUeVnnmab1MycCBc/1EbkmxOAImaAVs0z0QnZqUiZhTUY39mVDF+CF42pD+nPt3gmthGD6kKJCkMALTRVb71U75dqXJ0V3yIciTlM3GNd1RwGgktBgjTzDhSYApbOOJU2alzozesvY5HoDyTR5Dt9psJxGCyahgY1hVik4r0XVs/tLRF/WKUh14JebZ/FDmt540vK6kc5TLCwEELm16SE5lT34L/ERIjPh4X0FU/bcOyaRqcALjtg/Xp4N4B+ahnpzjMy4Uz+qJJVBggEmfbaKgUvit3PAlK6yHQgkLlnE2Y/zQKUGQPGIKEfnnfkIcvwwWX/ICzNHWaSbkFux7KWBKFD1jrCMLWCxrB1luJ+yFsnZn7q6qNzpPSLhyCdjCLOF93bJ3oILWyA0qVFixYiqDYiLT1auY8KWA3+EISZQ4dmsghvDRFJFmS9T6nADJfFyUetievN5K39nkLWxBtfKb+2i/pUVNvP2UznQt/DYIG5jM8cqiAy3npjerWS1cfM4VoPmCZUdVddjmVOgmuv8cIT/Wv6GK/1yGyDfP+gVHFj60QamS2CAQLQKLi6 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: de89107e-3af1-49d4-3100-08dac0145970 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Nov 2022 16:31:26.0937 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2P250MB0026 Subject: [FFmpeg-devel] [PATCH 7/7] avfilter/vf_hqdn3d: Fix left-shift of negative numbers 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CXeiAXHQNdxB Affected filter-hqdn3d and filter-hqdn3d-sample FATE-tests. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_hqdn3d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c index ce2b9a2974..c796ea9ab4 100644 --- a/libavfilter/vf_hqdn3d.c +++ b/libavfilter/vf_hqdn3d.c @@ -180,7 +180,7 @@ static void precalc_coefs(double dist25, int depth, int16_t *ct) gamma = log(0.25) / log(1.0 - FFMIN(dist25,252.0)/255.0 - 0.00001); for (i = -(256<