From patchwork Mon Oct 10 03:13:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38643 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165733pzb; Sun, 9 Oct 2022 20:14:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7tiGuMycyXKTRzK+/CHV5CvrV7JHV5jrphryPkSXW1jU3Iav/AS3cdVBbcFguwf3VErhUm X-Received: by 2002:a50:eb8f:0:b0:458:482d:43de with SMTP id y15-20020a50eb8f000000b00458482d43demr15647759edr.205.1665371643201; Sun, 09 Oct 2022 20:14:03 -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 n14-20020a05640204ce00b00456d5c4de7fsi7910413edw.240.2022.10.09.20.14.02; Sun, 09 Oct 2022 20:14:03 -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=D2yxXAyP; 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 0FFE468BC9B; Mon, 10 Oct 2022 06:13:46 +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 3625F68BC9A for ; Mon, 10 Oct 2022 06:13:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CCOEf2jW1n9KmjIgUP6mVf73sJo5ZfufQL4j27Gxl0JyI8h8pGfRCoE9b8x4O3lo0YozlUhmmYDxrx2KAF1cfXf/Te5jV6+zhZzT2woKk/9NRtv6Q99rWW3xOlyIRdxHHHErM0qNNZQPN952jZ4tK+xK09wX+lH9i/D+z4OwuNHPXIpMPciQhSp3b2SL5GVbGpbA5XwRmcCY7rOFe0Ngtu+q7VHT3mhaKacuEMsqywRB2dJpBXnHtVFFmupiJG65ViXbryYLLQEhrgKHOqNq+ttW07aIlW9sz8yHGXAbbMzL778tmas/1wWhaI+joQ97Gr3yKNXqaMlTmNLNfOwQAg== 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=ZW7FWct6QL0S7+ZRMKdUyUV2gb12rng00PUa13aanOA=; b=mlnvqLolTNjSPLcloiZA/KSTB+8eef6MhorCxa7rwXV+Vpj+2n7wz5YWUtuiTT52GiKyfAeMLlShHb80RHDHdE9XnOULjibfhKi61+UB2H4Qs5yBjJ5WTMrHp9M760L6pj/7ZW68L437IEct99BW1QkcJuTfGGcANQyYzkB+WBh1on1wiZwBzSnE3vvEyzkEDq+w6PuubN5dy6Zlyij5YUXclayNIRLphhcCvYlFI48P0th6TylOQx7+Y3y7a1g/UngbiagR693M1Hq3Zy9Mttx04l56gII75ButpHzWcu9rPrYsk77PFhPHF7RvOiocNIL8zTzreWLfBwpdcBH6uA== 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=ZW7FWct6QL0S7+ZRMKdUyUV2gb12rng00PUa13aanOA=; b=D2yxXAyP0+52VxG5qt581T+d8ZIWs6Z1g0TB+LfMnTl825xaE5Tmn8I4H1s8wJuJ3k5QKPGXoJo8wR8zrs9hRJkRsIX8lLZIhTa6ZHw4Fa+Gx0rF67Tk4JDrR+7odbYq8xlxJNQYOBofPUYoe6cg5waEres0xnfXZPWXYS2J7KTVFkj/qnIBBkvEw6NB7/JDbFBVDqjUB4MwQ+cWrHOhXlXJw2kyIs6SpBBBSaL5OQ6eu6xxzq5oM6VbUt0Q+R1EpFU4zXvPJTYVt1hSpOLdmLYgfwWeQO/K+iwyo1TcwKSIcESfpStygV9APZqArUJUaL8nxz6amkyQictkW2kUkg== 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:31 +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:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:03 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [E2VIvjHUrCkbngdZwloADAT8uuso9Rp1D+yEyhbV8fE=] 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-5-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: b8cf8917-7694-4384-ea0c-08daaa6d68d0 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFVxtZUJ43WkH34M/rcYTrLkT82+notTN9JURPByfbM0NWOon0ofebyfXxitRrhPDiRuj28YnXS5TEYgdoDlXnorOogVFE0py/m+1DVrhBXv3LqKg6MqydG8KOf+oXPD9BsJhwebig+HV9Ka7v8VGA3eJ8YVFHFCH0yG+TtFIJcRshJv7UzybH/lqYkQFeucobbK0FTbCE/qWIcGr679EzNRr3aQwNbywx7Y/J4NmnP3E7uB0bewHmF/LD1fjDkQJqIgKRye4BZ+Zg1OIOtJYbAe87Fo+nfkHqaEXIfcOOT4kL508KoChtk7uFIoZ+LpKNeo4wWOxR9Bb5dSq8JZ8AKaN9XTOfYtOyqSdRvrRNk58OeTryJyYtbnyuMcKJ0Axq1U0pJtEzJImHOkVXhQ1QeCIOlaVcCrhrFaJkT2uHGlmUtND9eKdHP2gDO0gT42hIXcbF4R+JPEAfksoLEY3hjrz04hNVPd654mQ+HMFq8NpyIkt9CwmUdDRe1d9RLe+yhghwZ3O3KHNOtxX7wyt4BBap3qzrHNKJP70+JAjZVXJsIMurW374VQ1Pa/wKXD1DBUMpSPQL88k7Lk1CoAlfIBTOjbaZinBv/9hFh4E8wSY9CDpqApm2I5ECYENuzYFjTFotcMD6uI4GyR5SPfO9uUNcuGKaOHITHXR6qZBkzZ69WCahLAls2nU0StZHIqJYwsimkul1+d2BKfOSswWjJXLXjya8L1f6qCkckaMramIo3Ie5H+zCoY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NT4mJySLqDoXQN8mkeuDTUb3rUi3dyDDXIyAEEHPPQDnkXK8U15l+7TCy+Y/CzoSZXvMmqYxe69weW3s81vw6gY7xbhtJp50uOh20uI1wmjy2jnMSMZrQYIengfmX1/wjlpnj7t7QXlNN3YmfdOqrjsXEsoqOk4GAYPLUgOu72K9WixM9vB4Hk3ADF975V55QynGB0VhHC7bhQA/CiYYi4nOes8pdwI92zqOl/T5Uo/I1642GAHNr9PoXwUbd12cOsfk5iCgzJGSQ9237bFZp1kI4+fzw9zU6PzBqEWse/aSgoaAkgHRwX4ur+CZXEZkl6SjVcxDsmDe6aqGTA+0WlTS0VTDFY7nmoko+t+y44Y2N6BUDeDGkrKuY7JqP+9IKQMzBUJaQ8fOo85+Pl9+4htv2+r2VkjQ7FNYX1NOE6qOPbx61SCutUGb4miMdavNLqIdeXu1a2VdxjnDEJ46NlGIxW/PyAV2Eaab5UJdhltx07MvOrgbs2lk0yPIBTJaCr9L53P6UGYTFmE0rEDF9Rs1q/P4uIQ+e6PfveD4CppHy6VaPBFqhWS+W/7ViXeMtt3WASQp4Jz8KWREbIpOeLThLsGkQlamYzob7X6jZsOOHtSYeirsmVBfv4EU/Q68W6gT5WNF+hpZcl9HM6U3GMJsaRRv2KTmira7wrfgQMVBgmEdbTSZAI5dSEi8byCQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TtZjYzwLQ7vLwa3Iwe7n2ONU5Z88n8t3uHk3S1fMcHzUWFidTmIHhrOVbRw9OvNO2I7yr0sPB1t426JW3zw2+QXK4RL1oWpicHSH4R2iiDfCbbEk/2pXJf1zKpXb+lCSWTZGMeFbLAtqU2PxX/zodj5lEydK4aARVR0gVyRBwUjUL77UKB0uCWB3PuKw+wChojycgMoS5wSu7LyLartipdlSATd4Dl1wQ/yWWNjib9DqDae0naB+YdSVgA3q/4ZCmjQk/q+0y94iMO5mdH0KTsLwgYNEfVR7z/GCOEX6HLo0oaRtgm6rhoGON1FGjz6MgtlojyxDgwBIONHEwboFmaH/Ln9eSfDLkJ1tt15uNzNH3BBAZBdABZBE8yaMe0Wo/AeS488u65rM91fvQ7O5veZA6zvl4f7wI8KczLJgu1yZvXvAwhsUzXfz8dBSxZ1Z1XX3B0y6SYFgg/nseCqDg7W+pqaqQBzURbHAXrsO4bIxCFYeKfXnIPP0FQaLv/SUlKCgPPocWJWgWPbpRXA0MjMSCaB0ypMmi1TVsPjJC+Vii92kCOMvi1D0siBq6INIRmS2vGeXdaiYzSVWCkq87iJQXXWeZ4nsx1EAQCShdgexvKWG06ygSNM3iEUYJtGTj/7ZCTf3gxzOOi75lvEaqKLuWWhMcoTbQMo04OLQJQDeJkspN8NdWufEG0+6zjN03uA6bxBz5Lm7QSNVn9WP5cgtSUfO4CN7bKLWJ6jL4vplXPqMZGVREDHP+j3IDF2XKRBrW19v08kPSSc3AVYvjddacVsgDe8F2Yu8gzNp5TdjcjgpTxgIWgurS2rkAQn3p1fjfwP5VVrHmb5aVoihgiWUpxeQjzZmiAFYGnzNydsV3AnsmyHkcUW0ukFpRqO/AV/MBVaH60mb/pnJvy7GY0TejdI38gvemxG+8JRKOriuxUmwZN8vZM3ZXSAhPsE8kEayd8slRDNdFFAC20zUmnl/ew8GNyQW8WIXq9T/WQYeifIdSBUL4rhgS89k9OSdn0E6FYwMoxTd+1YazAJwilyeTdLOOf9RSJhqpLxyeZNLeyiEqqECfEfSVFa5T6uLZN8ogF2ceI62i2B2tp5kkrPL2HmQj6xHpCc0KIp5P0V6iMW/TK0JPfmusXJQMrwsoVhi4je2G9JLfslswZpmXyTQM7+UhaWmmOep/FKauUbfbZaYwyLJDdS9aChhk7YpHZpkA7uzlz5NYwDhZXs9QN/CdIAtiudRjlTAbtKIHRsKbck3pinVaCStqQhA1iH0TSBefi78vPWmymbpDQqtZQt1foXV1SgnQWBHvKS3Bkyh4paXKsQimrS0oQ/OG5ZN X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8cf8917-7694-4384-ea0c-08daaa6d68d0 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:31.4900 (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 13/20] avcodec/snow: Move freeing encoder-only buffers 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: shIjRCbjlSAD Signed-off-by: Andreas Rheinhardt --- libavcodec/snow.c | 8 -------- libavcodec/snowenc.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 4a6c781a95..f55b3310ac 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -606,19 +606,11 @@ av_cold void ff_snow_common_end(SnowContext *s) av_freep(&s->temp_idwt_buffer); av_freep(&s->run_buffer); - s->m.me.temp= NULL; - av_freep(&s->m.me.scratchpad); - av_freep(&s->m.me.map); - av_freep(&s->m.me.score_map); - av_freep(&s->m.sc.obmc_scratchpad); - av_freep(&s->block); av_freep(&s->scratchbuf); av_freep(&s->emu_edge_buffer); for(i=0; iref_mvs[i]); - av_freep(&s->ref_scores[i]); if(s->last_picture[i] && s->last_picture[i]->data[0]) { av_assert0(s->last_picture[i]->data[0] != s->current_picture->data[0]); } diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 0854f78da7..fec061a8c5 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1986,6 +1986,18 @@ static av_cold int encode_end(AVCodecContext *avctx) ff_snow_common_end(s); ff_rate_control_uninit(&s->m); av_frame_free(&s->input_picture); + + for (int i = 0; i < MAX_REF_FRAMES; i++) { + av_freep(&s->ref_mvs[i]); + av_freep(&s->ref_scores[i]); + } + + s->m.me.temp = NULL; + av_freep(&s->m.me.scratchpad); + av_freep(&s->m.me.map); + av_freep(&s->m.me.score_map); + av_freep(&s->m.sc.obmc_scratchpad); + av_freep(&avctx->stats_out); return 0;