From patchwork Thu May 6 05:11:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27592 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp980461iob; Wed, 5 May 2021 22:12:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3tlV39fEXlK9unfYvt2sEDc4t/Adqir5JP5Ibrsv9elO5RNyVdMGL7BJ1RQGlbemMkZVt X-Received: by 2002:a17:907:10cb:: with SMTP id rv11mr2384694ejb.379.1620277959488; Wed, 05 May 2021 22:12:39 -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 ha1si1243275ejb.743.2021.05.05.22.12.39; Wed, 05 May 2021 22:12:39 -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=kVogsdJ2; 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 25909680A3D; Thu, 6 May 2021 08:11:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074045.outbound.protection.outlook.com [40.92.74.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94E816808EE for ; Thu, 6 May 2021 08:11:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V4GfgZZbkvsmjkKrAevXZafU2TYAmUm1zLBQz0yuF6pwmkD7aPj5hJI4pCCopO9QvVacgHJEE1hBgtur0qDx6PLIcYMvN8KG9oE29bhIVhljYnqLw+VxJWbcAnZYVBSXv5yzyYX4+rRXd5PrVNs1fcdRBDNoF4beA332BzaAwbBD/GNPHU1ieddBfvQuBfJRf1M4EZYesY9rhtMDTlnv0LAjshTaQG1IH7GqyCXMk0qQ9Dn7PFfVlb8HvmQ78ChfBUmlIrGoTa8zg3P00JMDmwTRZH3uouKl8u4tyYR1J/2xSGS1aQYASNb6CY2/juAXj4I75drUxpcNErKbF2vthQ== 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-SenderADCheck; bh=yS5wARXvGl1HSOKoENGoyz1Tmq5k3IA1wTAyYLgTuzY=; b=AF/S2eJZVOO0UctJFGwrlbCBFkLrrnFadVQrB/eKRnPhKWeRxihLmKlARw4YRb56GZEA0cZgI9lMAY0C1AmDLowwHufDcUklp2estb6ZH+lSWB5uA1CFiZFyjFGCeeP4Hb4j43bp3i+mfrL1iDu4pc2zbEuAKnJMBUGymlIV7rD+eYpYdedvIixGJPy+HECoaOclnrWsPUP8IfHT9GQc1r/PYGowahMqW+5ipjFS3K86oH14DfcLc2SfFa5gFQvdIkTH1Yo1lrow5/cVetpmag7ZsKkQCoZmJY9pS9+C9zQKaCx2ZkfBjmYlNhh+wgZBIgMYEVjRwo2ptl6o4E6tIQ== 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=yS5wARXvGl1HSOKoENGoyz1Tmq5k3IA1wTAyYLgTuzY=; b=kVogsdJ2+h+ItEUnBqAv6LOMGG8nE7uk/IABwgyf1vSZ7oYFaS2iDzI5OyR8LEyRoDiaCLOMXTITQZn17Wea3YajYjpJS2VhlC5fPFg321LeIT7BqHd/XWDXQ8uVw518FhLvS4kIDuyCPe3KaLl7vEw1oATwA2FHoa50XcjIJZ30oFYtQV8dm1sCX9GHSWiP+64lO7HJfmGM1FiScFgcmTfV/i6cwB496GvNJokvc81PqdWSVjwYae8uK5ZbGe2rY1zT8I0Te3nRIFAmA9jGNOio75m01RrZnfUJgKQ21I4YvUUtajh45FC3UeJOlpjkQw8VxWZxHC1KSCqsuQP/jw== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::47) by DB3EUR04HT020.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::311) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:47 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:47 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:BA39CD287B38DE88BD7B183E09098F66E60FE458FDA30A24777E6B5DA076D834; UpperCasedChecksum:91D3A2A74115F1D117C03767B5D1076BF690F63390ED5640FF34839749ED2F8C; SizeAsReceived:7594; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:06 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [ejPORzzRVRp2cdLCFw5jRkxacNtnYR6d2ckgJxcGqes=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:46 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 8e50a5d1-c686-4a2d-4ccd-08d9104d727c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQard1uCGdQvPTEg6DjnyLH3U63QWz69b6bbPVSOuXF1/6CeArzlLQyDFN6EpKaLZ2+A3Gl7Xpm9847zshgkBhAD/P3+/xYpeRzxQMMJNVR5f3ZWYaYcX1yyhPIUIhH5Vjn5IRR87fh3ClM9HTpITWZnc/TRAcArZFIAZ3PZ++i9f5e1m88Slvw9PbnNGTnfujL5OOsfBTWDs5J/8yzOD4OasNKwfjtaqLYJW8gOASMCd7w6PnOZk39oFQaDGlK5MriEaJV8qiXrmUXU/UYJOcpWUpY6Chtc2S55wdAeQDtzaPoPjrCeH4MGa6TC35RoDpnOfywegwL2wrhVTY/fgEcg1Z/Tc2rFdU44xBG+Il/3HMIJIu/pEELMJVIr/LjGPwJE9zVcDIXUFdaJe7IsS8qR1OhD4k1nXsvFY/jLOslNfn5ntGqlar7i8+p/xSGhJPj3z8RV3WgXhDN0hmR1YfF9YvxU9Kg9kkc1pXZyKcFohusZCbCqm33Kmz1jns+r5CRepaXxHRjrBHi6MUDFaVLsIoHxDjF05A2dqfEjufMcoSOepLSGwguJoBWCnWIfITkbVNS/wtCT9sfEqXCFKEyD8di+1rScRxvTcfo1fXgkdYUBdy44VrzdkvGB2u1PE/eNHteFlo5cDgmalej200jZFs9otrfPliF236hOgJcR6DNcVNtvwYafHdkMMRllegQoWsO7IDXN3OiQk+HxAOkc9mylIOidGU8GPT3ivTvJA8zS+IRIRzkqM= X-MS-TrafficTypeDiagnostic: DB3EUR04HT020: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2Mb1wQT0V5xjBaODVcLNh4uuoZ6ReAgOgRqd/pZfNlH3inpVhpqbQWglzMTr6WH/RftXXsFer/i36PygctOQZbjAMjTMLUB/KlKTiv20U1mTcY4dltWLYEEa7CxvBb57kU5E3gJxjZfvyE75QlqENQ0pmAh7A5FZhp0m8d7OWQysEskNnmDkJIEr59oYF06e7sPqz+mOs04z2eVjdZCZRkZJ9PUuTZdsoLo4qUpXfe61cMHgvtqn6Wyiq6LAfjlgkWwW6Ucp/EqqdqsDMJ3jVq6lIYkYuSpqzOC8Db0NJqJLbS8ZlFDnBidkJURGqM1piRM3nwisD4KR5sIZq5HCPRIZvitInHygTuPBbeEwB7lAe8BGn+lyDK5Na2DkfkifTizBl/V5K/tWbwam0esvzw== X-MS-Exchange-AntiSpam-MessageData: QlEXr3w6cXSgxt2vxXFbznJewLWjcY4+6f+8Ny6Lew08mNvKS+t6m5gTMvJuUKipTqXC2ASGF+13yExxdspnwueM0mA4UU1d0jUMNXKxJVh2SgSnk2i8vt0zL+HyRE6Z5PsP2O0uQ89yAZp6iWbe1w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e50a5d1-c686-4a2d-4ccd-08d9104d727c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:47.0969 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3EUR04HT020 Subject: [FFmpeg-devel] [PATCH 08/23] avcodec/vp9: Cleanup generically on init failure 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: 6x63eze38y2/ Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 32776ebae7..7409178501 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1798,7 +1798,6 @@ static int init_frames(AVCodecContext *avctx) for (i = 0; i < 3; i++) { s->s.frames[i].tf.f = av_frame_alloc(); if (!s->s.frames[i].tf.f) { - vp9_decode_free(avctx); av_log(avctx, AV_LOG_ERROR, "Failed to allocate frame buffer %d\n", i); return AVERROR(ENOMEM); } @@ -1807,7 +1806,6 @@ static int init_frames(AVCodecContext *avctx) s->s.refs[i].f = av_frame_alloc(); s->next_refs[i].f = av_frame_alloc(); if (!s->s.refs[i].f || !s->next_refs[i].f) { - vp9_decode_free(avctx); av_log(avctx, AV_LOG_ERROR, "Failed to allocate frame buffer %d\n", i); return AVERROR(ENOMEM); } @@ -1883,7 +1881,8 @@ const AVCodec ff_vp9_decoder = { .close = vp9_decode_free, .decode = vp9_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, - .caps_internal = FF_CODEC_CAP_SLICE_THREAD_HAS_MF | + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | + FF_CODEC_CAP_SLICE_THREAD_HAS_MF | FF_CODEC_CAP_ALLOCATE_PROGRESS, .flush = vp9_decode_flush, .update_thread_context = ONLY_IF_THREADS_ENABLED(vp9_decode_update_thread_context),