From patchwork Mon Oct 10 03:13:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38681 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6a10:9905:b0:2f4:3559:b653 with SMTP id j5csp2312118pxh; Sun, 9 Oct 2022 20:14:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM48LXttI9kGnczwWAsg27kRGwnaRJdmsf567zmEoOY+ulLO5hBG58FZzK4Blpbol0el3ev9 X-Received: by 2002:a17:906:9b94:b0:78d:b8a5:7493 with SMTP id dd20-20020a1709069b9400b0078db8a57493mr1437225ejc.530.1665371652157; Sun, 09 Oct 2022 20:14:12 -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 h13-20020a056402280d00b00450bda7e40bsi11692412ede.29.2022.10.09.20.14.11; Sun, 09 Oct 2022 20:14:12 -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=mb0otY3g; 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 CF69D68BCA8; Mon, 10 Oct 2022 06:14:10 +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-oln040092073026.outbound.protection.outlook.com [40.92.73.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED14268BC92 for ; Mon, 10 Oct 2022 06:14:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QwnBWTiCz5EgApS1N61UUeFcVxZoe9DWTIKtN/bzjo/Kci7JAgOW7RvvoTBTKOVJzlOU+lCLwgHOx4XZHpgqPVEoQ2F1qFPOjTq97Rh+m0yz78ZuLpdPdTIoS+DaAYo3RgiqIoJn3M1V2zP9R47gqd2EefbAOLU8jsSHQiN6YSNbZjTwsYcJyMimZ3Wng6VLC2fD1fa240AVe+UKZINtQtKkrvBtAd9GhH/zqtX/x8on0jzqk2XqU7VVUAyEscDwhbm7Q7M56ekr9Npy4eYo418KVPbaqgz8XJKyDLLsZ0AMbvYWAcH6r8YawOeetOpk2DmAiil2zrk9wNCpxs7Zig== 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=rSCkZEsJSnLMQXAwC9pxDJrsjksNSkh3vJG1za0lewc=; b=a26cozjxbpKypQXvXJSTTkEmkWvQGT4IU5PTsvrbS6awWfGRVqcvQi+5UAXIDh9ihWBXEG43VHomHct2CQhHxgiEpBU3b01yf3iAD2RbiOwhvI0kxouIfcJfZ/d6spvDv3x3IAygDLMfR/64cV2xEsIzJLBqGSB3KpEMcE7qTxcsnT4R/WlDmJAw90tZkILFMAS/ZQUCuJxwLnDH5YIrTTecJ+LY00Wqh/q4E2ReAZIuv1h8lfUvsPtQcOG+XD14O/ENdS572ytcPG8N1x9O1VCDKrpYmWj9GzkdHlK5qPwiPbAjUfmYXI+jlieoW+EaQVmpTeeJznf3iP/w40CHaQ== 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=rSCkZEsJSnLMQXAwC9pxDJrsjksNSkh3vJG1za0lewc=; b=mb0otY3gE/kc7Qz6hdLGm8hWuEqE1vrAAi30oJVKorh2/I7ZjUxLATkEGKb6Kjaa6g/HYXPDSv07/1bz5vU3Iod/5hTxfzQ9/Z0lFj7jum0pQX4Lw34H9rdpac5ZXNoIMeETl6KHzVPe+w75dWfxLmn0nLz1W8STiI5iB0mRipkKGaDp308+8FU6zP+dJlP+FdJxHTkirDdASYAIzp4oDVJF82YB3jXZPq82L5/x0XmcWVNwgBpwRPlB/AG7o0NZYfkh0rgWc2LKVPt7JioeEdI30Kn7PzWCl6FAvI9/wYH+ZcTi1r7zXpQJUVXyrgvoprJVw14/85WCtV7ZeaSg6A== 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:14:08 +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:14:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:04 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [1OEFJX+IlaD3WnaWsxrmUV0fwX/m1irnM6tzHQMAuJs=] 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-6-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: 27b18fa8-bbb0-4ed3-3994-08daaa6d7ecc X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFVxtZUJ43WkHeenGj2EVIHND9fY5MDn78lo6WIW0NwruCS0I0vgujhCla38s9nSgHEhdFYCvd0hrrYXAyQwo6Xm+pFlTzxph10AHUGWjiYcSsNW/7UjcNtyhUiGa8WajzfWMb1DcaWf93rsID1XicNWJg15vfK/KrQl/ZvB+SvVnUWhcps5/SYO5dDZiup3HA5ruwydvkoXaoEPP4RrvnR95vPBGBVcWw+Z0cMc26CN+L3HQ5k/RzPrxcuRP8WamgkH8/txp/LXdual1vLK20lJF/r5twG2Wv92kFgPSVlzBEGMioUG+2H6XVZzcIq0SxfXSxj+YICQVydgQq5VzxWFh6huu4HmHTc8piUP1n8UXMDSKrewbfpDBm8x8z65f2OwqnmouYqJFFDtU0gotG8jtKdGR989CaEhtyIdOAt83KSrree1qFon8kElAkBt1tBKyTT+MEtTTHGpUZoTPzKOLBlN0g7FRECok2VmOcx+poUDnYReUt2xCsuAdOu917dxyO6Yu7qaQP/OkqkvZ9oxY/pGieqe/NU+bNqLuxMlKUo6tpdkqINj7CEffsYOGvGqbv7bPN1ULdi001IObkUjwaheVQ9nXOMyRczYWMubhO9E2q7gTq0xMpR1UEqV1tZUZeSYKP4L9cCenLjjOQ/7LceBccJbkxKUboPZk7EHQgv8xXeciHESzypH14uO4cFOHNWlJIYkPSkOkUYnSH8Rda03/JU5svsQVYhbtk0zaS6rjCVVOq5Y= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bGVk1eyixqmofT4h7/QJNaNVtLqUZ+gHvkBeseB1Bmnws+HO50RttvjQIR+QWQaXZYgOvquowe3shhmqnizWGbCvqRzTe4Fp5GrHzmNv5SD30f8Lox3OeJAUXncRQq1/g/G3ni38UDE5EUw0odM/aH7igpS5pMhOY1tUo+FkUrj7Kqtuj3roJjS7uvU2WIGiwvuC414LWJgFKufS9XQNOjAaJQ5J4HNBpoepCHcv700uL64hxCk8JsCoHBEDvN/L0sDSW9OB5bMvTBYGFenJweihVIqWyCGl3sm3ycDIkuyVdbgujf9h2HEex0KzNxs3z7NrG+iHliy49a5/bp7O35fcWsS63LKZ6fAKKfaUMBnM24TIz5JSH+ewfm85NHwdaBpNjMWgc0mmXSowsCvoJ8+f4QMfMaNclA4KwcK2fiZMmIiEoELaTFGohRb2uGojMHlWHmFjQ1kpXcZIiclRS03xSNXWZnn3Bco0XXig3v1AkKtIs2/3wLu5bGercBf63XAxU39aPG8vQS9BjCjIHg3znWKCAhKo/pqtaqq5/Gk+RciNOSL2i5c1ObSYbowVm/9ZQ4pXT1hAccAwuDVfC0WDS6uwNpVsF9n97NgxGsxfQbwlwrrwKXWnwdhjvduw0guMfREUuGs3D9oz4o577Ai3gPdCnron8eiMx6B8QSi4rYTE0muramtewx+JqWA5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PANQ8E+ZhlBcfv5OzxeDe0ogg0NCWhop/S1mpDfgp1860Iscwx7eqMKfb4AwEwl+bHgl9sjuzlKHuZbuj0rooUc9mSdyD4w8Jj6D7t+KTGqhBO0nvtBTyNu1jzv7rTYccCHwWRbgzwfmufxOYenEJz+K8KH6ctHnNGkA90ZZ0H732F8SrXDeWG8VWTziNwEllj+c8LRJ4gvRNgyttwTKFbY5Lj79ZoUDGLRtQH+dithQGeQvDeweCNzxuuU4XolBQbzrsmNRudAGUQGSrbOV3ybVjKsy8wn/c0M7H88C3d87Bnes5P7K8pg/h0NmG2tDQPl5ah31e40J1h1jEIbRCeUWpsZb3ygQ+N+T0N1hSN9UHLRXkEVFUJCTZyfD6vBgwKFv+cfgradgBfEeK7c86sVZKyj1xTejpr9SnGMsHt0LmyjmVMdUl/9cjvtAhk5ntksoVY86oJGHefXvVTC2YCYoWivnximx0JMjAKIeMLI27H4rIediJlXwX06yKL45iczLDMEHDuGhVgkzcl/hNa7Xy8i+Ii0p5S8ggx3exOO7Il9V64T9i20/3dvsydwHUKEGvsfNuO8thfYWxH2977tha2M3oH9DmLLCVaFC0mNFiu1oX6pKjdHx6P6SOuNngAtYcTnjdu4kvaLsyupFG/WYXxy9HI6rdSnEXwSg+ClvzSItDNUocpI50SYZCDzF69NYy+QrNW5xT5Zh1bkBVqcdrTiXLAtQDuuB7kU4n1EmblHeIFE2uGqzJTYdGV2ZviD/AxoYInDEMnCCEnj5cU1VLZEzFvwhgbkSYAhgUw7HmH9EUYv1iaV4QDT9U/JFFmBZYWC91U24GB5mjPBwgDFV3/O7EqDUD6vGquAGRYV95aWkKueYAMPhjM7Rm2y37w7dvpHc+v8hJS6hXcgf6+BLTlnoa1gOOLmD2LRyWGHUOUvSocNjKf/FnpTwOgdFvYmLiuC1B0a+TsPFBBK7m8WADt8+/Df3ywYMhKI25ndX0xWHu1PARgwH7Qfk3ceDqTym5lzrZjqMe5XrcXnHOObpwRxplbozkrlgdjMCYJlwIonSD56SxgDRCXxx4gsyIpL/C4wghTAMOLzFNqKHX+Pn97Cuu1/tp60lS/M/87iyqFsoZkPsvQJOSz+XsPiQROPtKxNnIgfRSAVfoP6U6uRfIyGUgIuDCPbAe0o5s1UtNZErvByeVph7wqiRJOF0BZb8EKnbdVIv6FKMrLd63g1/Ou7AhlWC43jVyUeQjaH+C59MA+8Bti7Avnqpyo8LL6/3YVf6m4RY34o+4bQH0yxVSRiL6tmXB5WwlMJPeMU7NvMrNAmGq29EQw6S/JO4 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27b18fa8-bbb0-4ed3-3994-08daaa6d7ecc 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:14:08.3535 (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 14/20] avcodec/snow: Only allocate mconly_picture for the decoder 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: hrXditUH8XlS Content-Length: 3801 And use its presence to check whether buffers should be allocated for it in ff_snow_common_init_after_header(). Signed-off-by: Andreas Rheinhardt --- libavcodec/snow.c | 18 +++++++++--------- libavcodec/snowdec.c | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index f55b3310ac..7fb1660dd6 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -468,9 +468,8 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ return AVERROR(ENOMEM); } - s->mconly_picture = av_frame_alloc(); s->current_picture = av_frame_alloc(); - if (!s->mconly_picture || !s->current_picture) + if (!s->current_picture) return AVERROR(ENOMEM); ff_thread_once(&init_static_once, snow_static_init); @@ -481,22 +480,24 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ int ff_snow_common_init_after_header(AVCodecContext *avctx) { SnowContext *s = avctx->priv_data; int plane_index, level, orientation; - int ret, emu_buf_size; + int ret; if(!s->scratchbuf) { - if (av_codec_is_decoder(avctx->codec)) { + size_t size = 2U * avctx->width + 256; + + if (s->mconly_picture) { if ((ret = ff_get_buffer(s->avctx, s->mconly_picture, AV_GET_BUFFER_FLAG_REF)) < 0) return ret; + size = FFMAX(FFABS(s->mconly_picture->linesize[0]), size); } - emu_buf_size = FFMAX(s->mconly_picture->linesize[0], 2*avctx->width+256) * (2 * MB_SIZE + HTAPS_MAX - 1); - if (!FF_ALLOCZ_TYPED_ARRAY(s->scratchbuf, FFMAX(s->mconly_picture->linesize[0], 2*avctx->width+256) * 7 * MB_SIZE) || - !FF_ALLOCZ_TYPED_ARRAY(s->emu_edge_buffer, emu_buf_size)) + if (!(s->scratchbuf = av_calloc(size, 7 * MB_SIZE)) || + !(s->emu_edge_buffer = av_calloc(size, 2 * MB_SIZE + HTAPS_MAX - 1))) return AVERROR(ENOMEM); } - if (av_codec_is_decoder(avctx->codec) && + if (s->mconly_picture && s->mconly_picture->format != avctx->pix_fmt) { av_log(avctx, AV_LOG_ERROR, "pixel format changed\n"); return AVERROR_INVALIDDATA; @@ -626,6 +627,5 @@ av_cold void ff_snow_common_end(SnowContext *s) } } } - av_frame_free(&s->mconly_picture); av_frame_free(&s->current_picture); } diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 3a835650a5..96221b9802 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -794,19 +794,32 @@ static av_cold int decode_end(AVCodecContext *avctx) ff_snow_common_end(s); + av_frame_free(&s->mconly_picture); + s->avmv_size = 0; av_freep(&s->avmv); return 0; } +static av_cold int snow_decode_init(AVCodecContext *avctx) +{ + SnowContext *const s = avctx->priv_data; + + s->mconly_picture = av_frame_alloc(); + if (!s->mconly_picture) + return AVERROR(ENOMEM); + + return ff_snow_common_init(avctx); +} + const FFCodec ff_snow_decoder = { .p.name = "snow", CODEC_LONG_NAME("Snow"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_SNOW, .priv_data_size = sizeof(SnowContext), - .init = ff_snow_common_init, + .init = snow_decode_init, .close = decode_end, FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1 /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/,