From patchwork Mon Oct 10 03:12: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: 38639 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165570pzb; Sun, 9 Oct 2022 20:13:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5D0WBMI56SoTiio5LTuSM2c6YAeUGRgrC7Bi/7mr8YYxMmxtASAdoz1/KgbOmuilo3ASX0 X-Received: by 2002:a05:6402:1a42:b0:458:b430:7e70 with SMTP id bf2-20020a0564021a4200b00458b4307e70mr16109218edb.293.1665371602175; Sun, 09 Oct 2022 20:13:22 -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 hb20-20020a170907161400b00782befcd0e4si10309460ejc.29.2022.10.09.20.13.21; Sun, 09 Oct 2022 20:13:22 -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="WguL/llX"; 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 C0CD368BB3E; Mon, 10 Oct 2022 06:13:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2082.outbound.protection.outlook.com [40.92.91.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C790F68BBB5 for ; Mon, 10 Oct 2022 06:13:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EbP+Wqri3UmsntusR1MuHxhOlUAbZqKFiMzMLtPg0Q0XGqLfPqxFnnultpBn9QILAmAxwx8nCeOqCEC2NwVRC8hxHFvWXh93LT9NwsXXXoHBIQ0Gmp7D1qMxmsgbN7OKBnMqr5DGYeAhgQbd+nkM8XU4RNHESP+malgdspL+GbgRrlHGRovb+orqHgBQeY4CjjhJ4+VwBNi0tEkHX4d0LmBflyhefJ7OuOIl6xgvR1UFai6+mKkv2GqsMNGdxnYY+85ppfFwB79ehS0E30EQds7wjGv62pQ15hcU6qt6+Oowb5pQNMLDk5P15jmc45+50HaIL95oumBv8mCCaL+u6Q== 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=Ymke1Oq3zE6LJNMldt41x+fuf+iBjmJx1ADhA2mpJWQ=; b=RB4LkuxFH7E4WK5BOwNMMh2FH/+oWCzXKt6LT0ZTj8CZMrc/FUxvYRfyMcCTPw0HM9MaMsLBK97iX/0eb34vzyILY3KhiH3h0TI8EKFBZZb8GCrTOj2l3nNBiccwTnMVPVMR3PDMmsdGH+ZP7LyUptkPqVRik2XsTVCZeG/IdO+fVVHO73MIlb5pHgCAAgGoxa9lEYySv+XRjhyfXhbJEsvZCZ4vJxlPQUH/dllrVyAmhZGG9KlVHqkb0SRMqR5e6PDmB+reqrn0KJX9lqQ6lRfAcCguLwS6Hn4Nm0PfY9l7BPRl8BH5+y2UqUDWoZLWDkCchc+ajTTl5NDEQBYIrQ== 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=Ymke1Oq3zE6LJNMldt41x+fuf+iBjmJx1ADhA2mpJWQ=; b=WguL/llX7hSjKbEkyqEWPXHFlAW6a3zYkNVlidwpkC/6NBePIh0j9YZR3nM8ITvlhmejvbdWH2+m66Ai0VqI4YwVbhdDx/d4bgCuAOaxXenjCsC61rFKow90KN715ziqKdmbP0H1UEbF5qq6Is0c8ck98FyK7VfHT8GnlisLOr83B0zDS1bTxa+bp+GWPTpwPJ05jHuekCiT8J2102W2gNy4XYzvdDEYUfwhW8K15anHrlh4TLlG9pYV1BItGGkH3nMyQAxaWNz02OaFVEqNyQV/rQhfN4eSIeL7iBgQV5zV7u71WJV8DqDGFNxtHyE5sI3j1JAlGrRoy30PWVrjdw== 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:10 +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:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:12:59 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Y4Yg6yx99Jf4X89SyE+HZZX1j3qWLQu7+TWw07sxKoo=] 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-1-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: d10e6180-7575-4e60-a8d7-08daaa6d5bdb X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3mQ8fCRM+tO9PrWxfTD9d2+69AHyIJ13UIh/zNe/C6JTCoGPms3OGRv0c9BHYQi3WhjjSlvdsHxesDdwIp6rDm3nsWB4cUL0ucyCPXJ2GurIlxNRTlriso71xI9KeSNcqnfVylOmhpP/OIvTEtXtNpDVjR+MdfoAH7W7LFh0g4IqYqi74GpIunqpFppRYlaNwPW+CsehItxhrlTV8r3PU4GF5Ya+rJPDjNRcQnwfuzxRNo75w2EUsRqKzhkQ+Ge/TUDYWiDn/E36GjWc7gTr+NlPDmmRAlsIzuCGOfMlO97a5FrTcLqXCFKo88eXmfnHSnGUuXLprIruVC6HT7ShrAS7X7r/7fliIVR5D7zqksdZiRt1yRm32BCpXrZlBcE9/uvoh//Psz9uThiHLZvObUfye9cApFUIt4JN3zgmPpmQ7vjzQ0Sfs1aOM1NLvZrn4Wfez+2k2vpZu2fV40P36ogT6hTJt+0BgXp/1qFE9J5IYm07qzT1yd+OmUa2Fda2ljtYa6JLi0drRCHMaXjYKXEU4ewXB84XJvxObeH6nB/exMrkaeme2gGvmNkMMNaWj8+yHpGczChAxKTp8elCMvLvQDIWnz5qQLontmUMo9lX5IRpcKaBHpUIT9ut5rOeYBGHipWIwRbH5YBSNePXNQM8sqaULLnu/4Zbtr1pCNNCCZZ5RssA0rljN4qX1c1u7H5SXqTtu9Yh52EazVJo7Wulzuak1dJBq3bNijoPxQ7jQMyNQmYcG7v7MqlXC0JZFMlfnXNXWX7Fif7G3mraKJw X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j0cKPoPpb9xAFjB8S7AJEbRTYUTDZ7K6SMPU5BgsxMhpiV6C8ClTrtHeZ16ovDd6M7essfy0xzWt7urBo27nlLOePqmiBTjd6URVj0GrQA1QQs93JbEk8ZvPQ84Ml8EzvUTt/2v1869JC+Cs6uaLqo+DmRTghVS3HmtXrng/J7NBAWZg0i0iP9snlJvq8fEBk/UohIxJWNbAR2nl0GpRjmEtRSQJEQ89TyoQoLob257qYgHnmBujRNI7eERZNWEdx/AVKvdGi9Wy7gxoUaCv2Mnityu3vYW4uvPv4xbPaU3+9lVXn7/C/NvteuFq+iWuD5KFXvM18SqxVwqOvZ77Y6GTouMOsNLOGZJioMk+vG9YlEBjDLpB6tYTNXcH3MwAOnVuMkV1B84Ro6mvS6RGeGJxMsGyk9nsR+Eg492LnP8W/tiHFvUeGLN/S40giF4ZrusKIbi0VFm9nkHrzbW07k+BGUXpiZ8Dp4s2e8Z1OQgsEvbEN4c/BbeNmWRjFFGKrU5Km3E3kJ3oNJKrAPsu5X9I3UIUZmaoHZb2rNSDLMRqvfMSqfdqebU90YuGOHqKdFfj1wgRfuwTX4LWDFOFxhW6X4jJchLbvIKZ8lCz8WWYtm7V67WvkFIjw1MdawfL3UFD7dQmyyZ7na76MwTV2mp3Pt+I0mmIQ7ZbsHJPjxhQEkZSOI2MWL3hf5eUzJCx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Trk40H3V+ENiD8GPMJCiRtXwzuxl9jnHFFeLc8j5Q0j2krHZZYrEv4T+XfrFHrCnv3DTYzqbywj2DnUasKW3hjxHjLfKJUkyu1Ux6snEgclBiZHLx4ZfkQwZxC85WaceLY0hvu8ysm41VOdO5jRruSNgGbZRl23RomE9yr9u9fQN9pqS8+avDYbLTHW79gamD2n3wMEG6AhSeFkkGZSDKQythBYMnITLKyYUNoKUyOQbz4iHm2tdtS249rsK6egaJeM1HR6B/69VNiKfCOlOb2IWLPWfKFkvd25bPn9lRHzq28UqXLjDOyyTwavwFPESIL06dcIBEhH1/8S41HPpx/n2hcVaIW+XVTCLcjmYj///WyZpwDzPs4zYSwSuOLYR900p7vUmIrNfUsfcc9qq9PLMitaHuOqt4Mluqfrltw8sOi44lh1COtQHVo51VScQBzo/iUJVg+1OGrKr8AxY73riQaQaJqAp0jb1UU/tQJ8euROv/VqtayO+v80uSdHKzqpFEbzpB6ZVrUi1XJUjTDsQBJf/bh/9Zrl/VGHdvzWCctzhfk1qNVbkm3/afGXW/g+oZ0ZdmUw7yNj3a2Xe408v6uVasjqo0e7CDlUQt3tp9z5kx3NKJiS+cApmwhxpKAdDsNaMpJmBHlirde+RivgduNznEuYrw8u3WLhwDQ0hXt8PIHzQk5mWn/0WJZwWdnoYD4PGJDCzICsAfAIT4em0VhMHNmUFt5G1+78dWjzzkLgwnOEg8ighUX0Hw/wE/crRomnj1KGD3cw13Qxrcc3cm+HpfJwT4KGIaoPzMqe0Jnxj1XOkPKFEwCWB8cI7GlN3JW5HSj6CvsmivWIQ5aWNn8//XBbPUXsMYZWdkDrIVQum6WLJHerXrhqg60D/+fZ5VJRHk0ImRETNRCvFxCNy+ojxAeXo3LmA2f2XLkTPg15AhL1wBBmvto4r+durwKLxkyWleXLy+/nkxIsOS2Tdp0+7w+rp5CKhGbpPVm/yMJUSjASG+AWq29Z6gWcDy2512fjbEE1N7fxMLdsSl3mPGi3Z52Ooea4H0nc5rzIs87AY4TZwtDyEGC6XpixofwlmYbqIPVWBADJOaVKpWZen7Tlzpa2jbK++IdE1fDQz8apgI/Rzfoem5+58ekbjVjZ8wRKCU27OjkTMYKUq44jZBLTiPAhqrh5qek3PaA4EvF7dzekqu+wDIy1HagiovPzHB66GINqsd/ZNFKaT+rlQgefJjUYhR0s6hSOrPLCaI0Cxf74pAQytJZLac+k9To9OdCKR95V7OZeus4T4JNRX0OaYFQXCUUq7FMhWGV2p+zi3rb4MP1bQP0RGO1FL X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d10e6180-7575-4e60-a8d7-08daaa6d5bdb 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:09.7656 (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 09/20] avcodec/snow: Move initializing MotionEstContext 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: YTxAOFJGoFVK Only used by the encoder. Signed-off-by: Andreas Rheinhardt --- configure | 2 +- libavcodec/snow.c | 2 -- libavcodec/snowenc.c | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index b16a46cab8..f3fd91f592 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 me_cmp rangecoder videodsp" +snow_decoder_select="dwt h264qpel hpeldsp 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 aa15fccc42..cde09902c3 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -23,7 +23,6 @@ #include "avcodec.h" #include "decode.h" #include "encode.h" -#include "me_cmp.h" #include "snow_dwt.h" #include "snow.h" #include "snowdata.h" @@ -434,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_me_cmp_init(&s->mecc, avctx); ff_hpeldsp_init(&s->hdsp, avctx->flags); ff_videodsp_init(&s->vdsp, 8); ff_dwt_init(&s->dwt); diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index c5ff50639e..ea0d4fc27f 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "codec_internal.h" #include "encode.h" +#include "me_cmp.h" #include "packet_internal.h" #include "snow_dwt.h" #include "snow.h" @@ -66,6 +67,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if ((ret = ff_snow_common_init(avctx)) < 0) { return ret; } + ff_me_cmp_init(&s->mecc, avctx); ff_mpegvideoencdsp_init(&s->mpvencdsp, avctx); ff_snow_alloc_blocks(s);