From patchwork Mon Oct 10 03:13:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38642 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165701pzb; Sun, 9 Oct 2022 20:13:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7FNbf0SVzins1Sqqi6S+E8VdQhLY+XrAWafbO6tC+xNdTV7PSumnT/A+JUBuI2NAdOczM+ X-Received: by 2002:a17:907:970b:b0:78d:8d70:e4e8 with SMTP id jg11-20020a170907970b00b0078d8d70e4e8mr9086497ejc.614.1665371634721; Sun, 09 Oct 2022 20:13:54 -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 e5-20020a170906844500b007882926c091si8212627ejy.768.2022.10.09.20.13.54; Sun, 09 Oct 2022 20:13:54 -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=oErr0AiV; 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 1780968BC9A; Mon, 10 Oct 2022 06:13:45 +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 EB8DF68BC90 for ; Mon, 10 Oct 2022 06:13:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=it/f7RhMgp4ARdkGubZI3jEaGRB3ioVpYkb+YL3GHozgxZfsEWHyuVPtQinqMwM7H/Qnluvm7ESWYinvwFopmBLil6TLo1kkemTJp85Ouc6mwoMzfAJl5Rc8B2IAJx0xrJfnl/cnxHmgwSKIbJ/2GSWa7n0dmWzDaT7cHhZ+arsdMYGFFDjAsd4ayXAXq6pKPBQzwFNsrqJTJxgL6WW0uUwNE9cJfuwHkNwx6G2ikQ8FoVFT2ISg0mZ84fc939fx/IjrzvIKIQZqV6WPkpKKev98tBWk4OPOBFoCmpMQos9Lf2X8OGpYyR7cmH1AOrsGIDZzlIui/I3cFjCiHTNXAw== 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=RIpYC452AIYAmYamz61HeMmswKunE3wjcxaGbUhaqt0=; b=D0uKuqEobgFtoMWBV9dDXFCwCmxu+QklVmGomv0+D1+lIGRNP9e8yRdMjFHbprCTqbm9OiymbPY2+sfO5+mjBonPrdA3+oMSi6PX8MRJOLnK8ZT2B8BFW545MAfSvL6IFPfAooOp8zhTWUlHXAgtPL1YDr0EiHhart6qnZVwcpLaIr+VArVbsowHR3DeyxzN/qdoP5+4+t5NzgymI2LG15MhpIffRnxo8FgmEY0DwDrbb3L1KnQbCEYixWXEPuh9kXoZ5z3kOqmq2nRxwYiy3TKmQyN47PQlA7Tp7B2Oi+8K3lv7PMK7rXMxkmUqVPLeBYr3vxwSG4xUEWfbh2Yn1g== 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=RIpYC452AIYAmYamz61HeMmswKunE3wjcxaGbUhaqt0=; b=oErr0AiVytnoLgtet9ai5MdJLtwJ8BGux8kYWaWeWw6y0qwKwBYknlPl5tWdE7wbGUx8eaW0ScHwzCDfTN4uNeB5XI+nd3ghM0/v6vLC5AKAYkQHdtyYjvvmrfwH7ye+TNJvV0yI1QYr8mrELWV0fAYA/Rx13grgZq/2jx1xpWtPProS6cZhah/OaW1/LNpqF6J7M/jyB34UQ1b6MEXe/WcLfC+5fPHMI5L3g2wnUg6EXb+xkRB5hlfmHTN1gcf92v2r0E6KPVHLZ8t7uOhB59laGewgMwE5P/tH6ppmfaRFFcuSIWNHVkz+anZUo85x+KTDiGrOsqyexLUWJVUQiA== 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:30 +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:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:02 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ylsHN2EEYuHh6mLwT8OFH+J+x97M0EOf8QlxvJhS290=] 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-4-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: 9b4193b3-a543-40b1-5c32-08daaa6d6819 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3mQ8fCRM+tO9PrWxfTD9d2+m8duj3Q1+4k/3SOOrg8sG5OY5EQR8jl+yn49zyDR0PKYbdsCbyi9MDGWtrn+GYsOVZAzHtwzM+yS1yb+sWe8d6kVOtRms1XokLpnA3dmcScL6Ua+k3INp7lV7mQR2W4nGAxATX+m0i3rH82LsJD3MBnz1o7FwSr0AljBNMfvGKE6cU8xn3k7LGoR8D11aSbeSUXSPNJGYFAJng50SQXl/QbxoX3dYRWnrT78GxuZ/BgoUH9VFFx3kJWrHoyaBpZnJuup3jlgIaQrU787Z3rys6iDB6uJ9Yxax+RkEcmA2VLF9xKl7WZ/YW4UcV55xbUDMM3CSBa4jWnpPODrEhY2kIt7iQNrXo3EO4awU3VOZB5qOw55LfxDN9+HZXwtTrlrdowvDhr1oc8YZqZF8cD/jbKZPsRLWgfAk1/kuLCOriqgB9XCQzs+ypnYYKCL61ZA6Jtc2dXpOjLKNo4qgurdUmd9yToGL+Dc00AAUbu8btUpJFnd+gmQQaP0JrBXv5AFeU524R7EzmPBVPHAwlQiVHzqsXUDW1YYd0ItjBCzX0BYKHKKLSCGMWzLqWbpS1/DRT9NdSr+A62sVMZgVOzlzNITa95BW8ZFurSPKOxwVtv2ZoMs2QTCjc5xAGPiv+65bOdRAsicCg93heIoOlFED8py5HbfcJb0YpzLu0R+VtGLIB206RNHqr527VYzJVeEvJwOnZgmnMbNBbVGTWjd1H1Alv9kCnVEMI0g6k/u7Ol63lmVPZ9dh3732FM0jMxB X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KflG6rG+rDk/RzHR+1MSIKf7L3Fu8Fe9y440htaG4cX8Nt9FBGJNSTzmc/Xn3HohzRFwZCY0EnEwQOsQE6c+xAwA4s3mlDtZTHPZx2V3aFt1TIQRVx1WhJjjznKM9lVTsNKBcQMf5yCRJYK3C4VpSm8e/jH5hZUiL3CZS92H/7Aqb1alz9/P8M0yyZi6G5ahyEmL2WewZjERAPzo7q+El3xZj96o/sweX45pSFYveu52TuWzFnzSdEXgYJiJskF8gcFjrWWZUM4bb2Kl/et4N0L4vAhn9SpHJIIJbiMzHsyCMEV8aoz7h0IOQDQjBZGQctFlZCmTMUQszPT775m4LaCdtCJ6Z4Hc69itGO7+Tainh5m/3/m1BAoX7vyODgYuH/3RdmAdeU/hlPqWNJFLHULjy+8J/JXVPsdNUVvyK7tKWjKIf0klRGSJQBOuzcCYDgxHExq0xs1sFYCFuEDBSSl1epJ+bOS0BWskkBYnu1wStJtdFOaNiTYGDGIdQMbDYMYBoL/alS+NvN31+9nSgSaWwg3rTdGy1a2OFxcUmgU16SdQ7uHP39j1GyX1257SqhgZWaiLTlfcYqtUblo3XGmV8Ec2F7dequZO/2BBepSqkhSPiJSVp37bmRuOHki4Rz21DFS4eL/mqRBZUMySKerjI5R2W4Tz0quRMvxv9+CuAwyEhYKKt0mLSG0hf8Wt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vUNqmjgOrh+cyPsK1Kv/hu7YbiAtVVOu7oFK6jOdmSfhYUxMubnAgy5jDCLMaQ560c2Za9Cdi4ElbDSX4nmLZMv489umn089VPI8gIyoypcqYX2ahrFT2MAFt55T0n75PWMBccWjm/OF1ggoSnlB1arkAxeHi3ol0j3nx0Y6ldhJDzqI7j3gr1pfk942oq1FCOXIUKAYc3yx+iW2emtLfnhnmFSb3OwjZFSPVwazOYYZGjOIui0nQrECyDaKfBmIUqJvQVk7dUNEvJh/WPNDJoJKbT8fQJjvkQ6HmpE9jX3zn7PV1pxdjNNWK++d3wsqdmSDzdFjCxrTG8GpxBl7dMD9i4RSIVda2YyFuWn/TR7aTWvUEwUYaSprixk7CGLB5J8arDT5ValTishn7Zw9XjAK28/Y4C262IAv+5QTRVHuGZdd0zW1Y3sXDQAsBqKmApv8QT8u4IaRISCV9WYVBZyhQVBn7As2PjwIWm7U4ETKQk/EtAQ70CEiABYvkaLH2uy9mhH+Y7qmwHjHG2iZDzjG1ZGPRqC3uo8WhNS7/bZMfJJ1NAHThl+scioToE4yrl6//dBNtr9lUP7J0+PO31Qd3QspF9HUKINXn1lINSHkbwYTUmFYJ6g5d/pcUzOFdaEDHhHYsvE3Y5oG9c9O6qUQ1mduE8IPwh7ctxuu+YvyfDR3eMVAFBIDWc2lPFvyD8rCxoAsXP2ZDfLbsNgyXFATurNDkXUerBZnyGIb2RsdQnlX0oCpLkpHPpo3PEN4dpimnZ69bStlORfDLQLKz6SX0qbFaWIwYFJA9ACAvrEDCY4Dq95iUqOXu5lYLQxVoNaYWxRXHuEPa+bKC+RydKkJn7noZLgp5BJ+oOnmWkDN6lASfS70FBa6MuN03xQelS27/JsnKJ7/ET7V7xu2YMQAbKmXu2q2oF2DcIXZuNbuklWLiQTk8pbfbp2o5WtmY9eCL3hnILPTh3r069HWesiX8XIZjej94XaOEY3BD0jKlF1nbz/rtEDSntSf2GV0oXZYkT1zcBEcSLVntrvvYZnyud1/LIrc8ACo+BEO26pbDQU//Goy2uUKNuigQWu9s1+RED6YcNVsWXsHhB8g+ToymOre/fW+ryEMMomuS4BDCvzvqwpw3kWly/WuGJL0N9NWK7n/W+kQkWJkngz1vMqf0JZRyvnVgcbkF2W2LdVNezxtI76GRmPsX/KcAi7Etgp1X4e+MmQPu5xh1DYrqmIvwIP3zEIQuU80siCVbIAl4WPBTiKw64A2Pn8SqtD2dv68/9zzvIPfQ0biIfMppzn+QZZVic5/9rOXZ9CkdwP/8VOsB2Ekq9IRtV1PRsl7 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b4193b3-a543-40b1-5c32-08daaa6d6819 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:30.2714 (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 12/20] avcodec/snow: Move initializing HpelDSPContext 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: +vdYA3Fy5dTS Only used by the encoder. Signed-off-by: Andreas Rheinhardt --- configure | 2 +- libavcodec/snow.c | 1 - libavcodec/snowenc.c | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index f3fd91f592..bccbf1bdbf 100755 --- a/configure +++ b/configure @@ -2946,7 +2946,7 @@ screenpresso_decoder_deps="zlib" shorten_decoder_select="bswapdsp" sipr_decoder_select="lsp" smvjpeg_decoder_select="mjpeg_decoder" -snow_decoder_select="dwt h264qpel hpeldsp rangecoder videodsp" +snow_decoder_select="dwt h264qpel rangecoder videodsp" snow_encoder_select="dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder videodsp" sonic_decoder_select="golomb rangecoder" sonic_encoder_select="golomb rangecoder" diff --git a/libavcodec/snow.c b/libavcodec/snow.c index c9bc4dbab9..4a6c781a95 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -433,7 +433,6 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ s->max_ref_frames=1; //just make sure it's not an invalid value in case of no initial keyframe s->spatial_decomposition_count = 1; - ff_hpeldsp_init(&s->hdsp, avctx->flags); ff_videodsp_init(&s->vdsp, 8); ff_dwt_init(&s->dwt); ff_h264qpel_init(&s->h264qpel, 8); diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index addca0ced9..0854f78da7 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -128,6 +128,8 @@ static av_cold int encode_init(AVCodecContext *avctx) s->plane[plane_index].fast_mc= 1; } + // Must be before ff_snow_common_init() + ff_hpeldsp_init(&s->hdsp, avctx->flags); if ((ret = ff_snow_common_init(avctx)) < 0) { return ret; }