From patchwork Mon Oct 10 03:13: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: 38640 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165620pzb; Sun, 9 Oct 2022 20:13:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7cLCR2+iXISogbbPHG0KATY8AE/0SS/KhzLC63q1CnF+46sTZ0xdbwY3DcRm+IxIRx4ww6 X-Received: by 2002:a05:6402:5406:b0:452:1560:f9d4 with SMTP id ev6-20020a056402540600b004521560f9d4mr16027522edb.333.1665371617151; Sun, 09 Oct 2022 20:13:37 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b19-20020a056402279300b0045c24cb5bfdsi1557905ede.321.2022.10.09.20.13.36; Sun, 09 Oct 2022 20:13:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=acSl2+5I; 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 E8CB668BC6F; Mon, 10 Oct 2022 06:13:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073059.outbound.protection.outlook.com [40.92.73.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5AE8A68BC60 for ; Mon, 10 Oct 2022 06:13:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q8x2dZ/njRSyZS3R6PpEABmpTkXdVsAAqr002Y+ObaFprfIDaYFOLvDNVZN2TkAn4TfRcRQ2slbrLdVFxWz+Bqd91+uQlujLHFAukqkp3QqmUVVlSw14Swt6PQhtka5eHd/OtXtsMdzS9v10xsNb8yughFgksZ+HMTzCAijgVrNnj1NzYMvX8M5Ip113gWja88e+eEMof/NhXeLZXKZ+SpZ2j4xzZXQ0H/f7QyEER65R623MZMygnGFm2zQ8esKcFv0avI3vtBBmytuCy1sERhh/2aFtZlydg0n4172Rp597GNxQ1zcbNJhABEkWKzbSE3iPABJW1BdfzYUAS6q0jg== 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=OGGRhGhrIWznDqHmt4gPwSc6GvPs25x8VVqOtOocwWk=; b=cZHgeVjdm65A8P+WRoN2gR5XJYK6qAeKId63h6xf+zhEwcCo08/HP+zspQTv2cuwiMRBop83e4cfZilhcTuhp6McpiacasYcudCr56iFknJkA+WrvWVehARMcx+G/ObThYv2BSVaXll//zVP6vzK2N8dQM86COpNRgJFKuJtlod0dr/dQaUbrmVHy1Ieq6SCROQLbO9zb0exY3P7HTxjX2MEucgnsZrcbHR5lTUzyzpUwF5hOVl1WOvDl6Fxq+ErippXltTGc5XvRqqxJ5HI0OIsK8QzKIi6dEJ59xbUrFD+NbZELChoOPJ4+03+7chizQKDI8GivJRjoyFwzU2swQ== 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=OGGRhGhrIWznDqHmt4gPwSc6GvPs25x8VVqOtOocwWk=; b=acSl2+5ImiTetgoNgRTwTKg0gl5+ql1O60pyc5h2hkovTPc7VGnq+B6l2t9UccYliAxcCDDWKppU2ATgipqovlNseoRPJ3GPBidZL36sOaSKKdk3NN13vEUp7VVdKnIIcBkiKCpIlVtMHPJJCLXDb64/kaC2Vk+oVlin/KojTU4BjWbiC5gb+0Jzfl/Cp52yx+13g5XlyS/a63KKPrFNmxjGON0ee1oyE2njRIOkyly0UanbscIBgQ8vrYpCXTJwCxLSbL2+lunBMSwFZzjkuD/eNaQUROlHU5o0htwWk23Jbr94QzL9+o/O7kTmuc2Ju165KmNm2oCk+YLdX7pg8g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:13:26 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 03:13:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:00 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [WKJs+2A1mGGhXhSWICALf2v+kZ85VOyGBDQjslrq4EE=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: e91447cc-4da8-47b5-c454-08daaa6d6607 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3mQ8fCRM+tO9PrWxfTD9d2+m8duj3Q1+4nZUGN/uADSV5cigqAsRHgXQaNeEw9auqybLXubfq7Xgpn7/dDsNlPys0TcCwojdn6F+9FcI5qbSy9AdFw+KvQ9SbEmKX/aa4BfVZSMVf7/wrpQPqDRru6erDKd4cta9rkCjgTE9iXSolkgGlqziaxiw/tCLcHhxa3+oU/N6PRW91v87/ScPttNg1tFw1uMlibNJRQURMazCpfSZe2taq8dCRj6VEyY3WNGS1Zx/UaZ18V//YT98M/Rz3au8QI3FjxdQiDL/G8PyMDmcbctZZRoBkqm3N+M9NtX0IHRfLip5HuLAK43Rbz06AbkeEpBCHDhwFN504cgquONqUZ0v5IoFeRBgC443S4PgaID1o7hDEerPulCLzTCkLCBzaKGXTy9MtyuTPmw0aEnxDr4suDowMRfYnLLkqMZrIZafcQsdWwUcfVzQ8VsZCJgTy+LhpOlCDEDz6EET40u8V9XzYdGi6t6nLlHeNPc9XfWLOBytTAZuwQm/XGl6jqSxqLzw/7/qO/T62cQHA+45mRkoyh6NRa2ogWK5iL95Kvpn3qnsNieLmr6XTQgPcspsT32OBWgzEGqbkgWfV67W6y0c00iwdn/4kCIfPn8w6pyStr2MN4+MDYf1WJ5RGb39cjvwhiDmWQVOZ8MXSnAsnupXtZ5V9eOvD3SIbedqEfn+gwlvYHJ00DHMMTlQBIRll9DplIwqg1V9JOU9hZjB80Ts8LLrLvevNtzchiXaw5825gfhTXJBY+txvyp X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kw3M6z04KWZNvo+7BFuF/Bc0Nm5Fk6Y4SI5c+U1eXZ9ehVGYxNJgjiKxXG1ra/UjQ4Wbz8riklXxH237DYlePk5arN7E4wZxhIR4i04TNG5MggT6Krpz/QtMGn4rYj6ULGWBJlIRIYp9NxGK8NJraxsqyS5Q/9645OJthTJhfTN/nO+Sv0MhYzYDxKDO+MUo2Us9h3aro3DQqBJnsQfG3u9hj0Se3vgIUcl7AwKoCsBqGLtyRf2WucqHT05bVvcVYe5ikYqEtrj07OSHPLshVAyxXL/fS91dnrf6KZXz3/tOL/wQlNb4JJIR9cgfjaYWbPSXQoMHHIym34TyhggV9OWzzGGn3AxjrUg1Pi8AjTFnLUlVrNiK6R1W90SoM+5+szRwsN7karDpQhYCFVuxlk7E/sFEJ0WV+CV7Tcb7JV/r4nBJ/2MgL0K0CS6YpRI5UJ/T1NL2LFZUzomxDPRaO79m/r56Gl0o9UfaruChotQx+q1LxkaJiikRCbGrp5xjC5LIcTIFRuDrsPgq6Qx7ioBW4Cdc2jDMjaquUzGxU/Chjwa3l/gJeaHrOomL5fJGifGM1/3An5L4V63lcdyIvAJ5sv0e4UJsWIWvZsbHTYkbL8qvYbbQxLdiGjrTi1UMliuUwbvBlRJZJt6gnOPK6yZoU6WY5DzgIXKqRmSGq1GjJibe4eab46ToGO6MQHFJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8ep1/h8ngj7as0GUTD3/00ELz8TEV89lm+6Glp7+yD61GQ4dAsLYWuoLp1ckll/BOnQbjcdAFAKY4u3xeuOBSYGn7yvdwjrGyQr2VbIZWf3ZzPe0LidjnyYqK9aEuHNoYC/sSIfBgd/YPoMDjgNr0shZqt/qx9ly6JhfY10maFKWqHxob5Rfl8diAflZBcpeQSQHp1G3WNhU79rVultGtLAGa7PQ4JEPs/c90NIxr0SZi9F89IabHRinmCPa1py+E08ZN4/bNQpSgnFM9SeW105yj0ZVMB+oH04ZqKt8wBeBOCTPEkpyz3BomSphcoqLMlxi5W3IIPSex2le8QUFZOAVRHjTIlWfhtRYsKcYvCKLgDtzExKc/wtJLGIQQ8Mrl0u73ORC0yqUIMgmN6jePkd4Pn8VWNLtLM7qEQGw8cGEPvrOBlPbG9DSeVf8fwyx+V49vkvVHnDjRVzjdqBCRO/DhsjGNZ5nj3KGNnAZLdfeD452ZujwqnIH/SXGee6HstOXYkAHeI9cVLiso6JiTkXnrxloX8Kjub9dw0StnIlSfjqEcbAi2ajN8BhJ6Lv7yoI+NKVzw5x3GeSpfsP54/xu5RHqa/tPG6GIg+pd55e0ibRaWoWFRWRvJ7nN/EOo4t6tSEpGc/xrD7kca8i+J3cgL2ElqV3hVUbbH+Yos5tcichNa0jVL2NkT9WMH5/ULVahwqoQy3ssPZW7SI8oi3AthXg6T005B/OT9P8w9J8V2YnY+57kDUz4evTFNiuGOCm+aNRMq/OwIYoR6Y2PSTnv7Hrjx5AQx0uVkUO0wQc17TxjB1LA1CgCvT/VarLjpSoCQ4gg9JoHrrU4ocZCZCsPfLxbfTqe4IEExOn2in5U8ayGdlnFeWP+/C1rYTD0JMzQQW2/3jRM0/cWlfkI9C4r/Gyk/0eLdPaAs/M9zIAAlkLgoSYmIKkIfpSuagXZwZaDBrOQx3DdbpkVPFvMjF9unO7QzKztqfX3y0oHQxLpXQHWJYKv3yIQH1U/UuhozR7+PX8U0yAzkDDi/UkgGikKRBRqWpUUxff5aOrLYiz6Rfa7aXfjqCFdOvxlVuzy70wKLMS5Yb9YGVu86Ouxpp3TY00ReFTuRnZiZ56WTcvimrN21F+fA+Ao4ziunKs4tK54Ln2joEdU9/RWeSqjZShNLEiTMvs+bGCWry1gkPOFcLppXgn+oUmTLKtgMAKb8vPYb32n8uwQEgdBqAs5GIHYPYqgUxjCmqNZRhQgCCZntxtN9wE8a5k20EwII30tQhsj+2vHcq/n8G66UFGj6AK2my+Rzid4/O623y9kyHQLIpZzH0EaJnqVr0Drwr37 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e91447cc-4da8-47b5-c454-08daaa6d6607 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:13:26.8006 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 10/20] avcodec/snow: Move initializing QpelDSPContext to snowenc.c 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: AmR6ATRMnmP4 Only used by the encoder. Signed-off-by: Andreas Rheinhardt --- libavcodec/snow.c | 25 ------------------------- libavcodec/snowenc.c | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index cde09902c3..c9bc4dbab9 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -438,31 +438,6 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ ff_dwt_init(&s->dwt); ff_h264qpel_init(&s->h264qpel, 8); -#define mcf(dx,dy)\ - s->qdsp.put_qpel_pixels_tab [0][dy+dx/4]=\ - s->qdsp.put_no_rnd_qpel_pixels_tab[0][dy+dx/4]=\ - s->h264qpel.put_h264_qpel_pixels_tab[0][dy+dx/4];\ - s->qdsp.put_qpel_pixels_tab [1][dy+dx/4]=\ - s->qdsp.put_no_rnd_qpel_pixels_tab[1][dy+dx/4]=\ - s->h264qpel.put_h264_qpel_pixels_tab[1][dy+dx/4]; - - mcf( 0, 0) - mcf( 4, 0) - mcf( 8, 0) - mcf(12, 0) - mcf( 0, 4) - mcf( 4, 4) - mcf( 8, 4) - mcf(12, 4) - mcf( 0, 8) - mcf( 4, 8) - mcf( 8, 8) - mcf(12, 8) - mcf( 0,12) - mcf( 4,12) - mcf( 8,12) - mcf(12,12) - #define mcfh(dx,dy)\ s->hdsp.put_pixels_tab [0][dy/4+dx/8]=\ s->hdsp.put_no_rnd_pixels_tab[0][dy/4+dx/8]=\ diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index ea0d4fc27f..929edc1340 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -67,6 +67,32 @@ static av_cold int encode_init(AVCodecContext *avctx) if ((ret = ff_snow_common_init(avctx)) < 0) { return ret; } + +#define mcf(dx,dy)\ + s->qdsp.put_qpel_pixels_tab [0][dy+dx/4]=\ + s->qdsp.put_no_rnd_qpel_pixels_tab[0][dy+dx/4]=\ + s->h264qpel.put_h264_qpel_pixels_tab[0][dy+dx/4];\ + s->qdsp.put_qpel_pixels_tab [1][dy+dx/4]=\ + s->qdsp.put_no_rnd_qpel_pixels_tab[1][dy+dx/4]=\ + s->h264qpel.put_h264_qpel_pixels_tab[1][dy+dx/4]; + + mcf( 0, 0) + mcf( 4, 0) + mcf( 8, 0) + mcf(12, 0) + mcf( 0, 4) + mcf( 4, 4) + mcf( 8, 4) + mcf(12, 4) + mcf( 0, 8) + mcf( 4, 8) + mcf( 8, 8) + mcf(12, 8) + mcf( 0,12) + mcf( 4,12) + mcf( 8,12) + mcf(12,12) + ff_me_cmp_init(&s->mecc, avctx); ff_mpegvideoencdsp_init(&s->mpvencdsp, avctx);