From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9D6BB40F66 for ; Fri, 11 Feb 2022 09:23:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F01B68B256; Fri, 11 Feb 2022 11:23:28 +0200 (EET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075059.outbound.protection.outlook.com [40.92.75.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F24168B20C for ; Fri, 11 Feb 2022 11:23:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hbruOJRib0xN7l4R9Pw/Igt9og9dVUSY9ugmygGgo3I1FCCIm0vWbYeV3fDu7M5hXpjvbCyCMUyIdX6t/UkzaGBQrfJT5fPhSFbRCFjTClgY1hCYboFBjfGI/Q4pjrTM793ylQnegn22iTWYk809m1m4X2G4dTpI5hWY2s/1+hQfhVxrw2UsS5PXsYQentT+5ce3l9yu6puRoiOIQlhYFPdChSS9CZhIBaesjr10U8+Ovm9pmDUGGmNA5SEf1MRLLcQhA7oGiEVQBmX/YfkhOvBnVYpexMJhk7HHLJBhbv0505WO44hNZmDect4BniEJB58WeSGei7IU2mCk3vHK5g== 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=xlmCfM3M4PNbzFZWtK4umrsY/DDMC2funOkf/0B/Blw=; b=GUY0+nQjJdkMbYzlox9rQuBnE0f3+qD9fBomK+KZc/pyPoyxgxfI9bIAVgOIYkNz7jXEqVxq03kCLrSG1EL7isoiENAFmAJH+F2nQ8LezVyLn2AfbR2iEbLBwYnXqYu2VXiC+0vansYKEPkn3YhjB0B2Iugx2EblwWssd9SrMKObeoVtPdNx8DEizKPonJxgNh4FiRvIYJkLAdrOzaVFN3/ujf7S++FhT9CzVlNoBkZt5KfkQ7mWGWRXtHfUKibo380d9tZ05jiRtISgLuX5rBgE60JaNKkmAfQxUc26ULvO1wPdVQWx3/cSWkiwVUwv9UflspVohYVboNkpQ6MhHQ== 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=xlmCfM3M4PNbzFZWtK4umrsY/DDMC2funOkf/0B/Blw=; b=gQjsGu4XXgN2NFUfZFE3SxgWuKe2MVx0x+WHZDFu7kNZnkReVjC9VOkHOwScs68wnxrspyVPp+6iI98XnrlGR2cKaueZJd7BASKo9BT4R/wounrYK2Ba62vaallyTmuJU0b+ge9E2Hyv+s7IsSH2Ft47jhz1eYv3LFiT+MSAVAAkeuq+lCHZPMmC4lanFlfWpTKXJVN2bMsFip4hhrKaos7yyno4ReOynWM5sAyn//h3pvZNIdtuOMIHdKmdSJ4b5yhGyLQLy2a80z8iFJKL/KIlu14lg8lHrdoK0J4jJ8ut/hEH/pUGlaKj2w9oikYI3FC6hvGwIJ05JfDdDG1OBA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4312.eurprd03.prod.outlook.com (2603:10a6:20b:2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Fri, 11 Feb 2022 09:23:21 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.011; Fri, 11 Feb 2022 09:23:21 +0000 Message-ID: Date: Fri, 11 Feb 2022 10:23:09 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [vUB9mEDY6jT0+rLzRRYCN86n6Ymc6wTS] X-ClientProxiedBy: AS8PR07CA0035.eurprd07.prod.outlook.com (2603:10a6:20b:459::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <2069440f-0b0f-8243-4063-a30ed3285c4a@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6c6f9aa8-80ee-4220-233e-08d9ed402547 X-MS-TrafficTypeDiagnostic: AM6PR03MB4312:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GcNdnueBdDnZir1zkc8FDEpe+KUpckb2Guf+6S7VVU9Y5ZFYAWm5dHV1xJtc8r3MrtHwj//n0jHRTVgwjX88CS0+Wbxmo+oZCUr97M4q7TbOFVz/7x/FOOTxnnxck551ykDpd+PcqzMLEaOZiJruAlJphWA9gr6OPjtnUTtie+uJpzrgR44tjA0Cwzzb4h3hLqKVy1M9Nap57uU6yf9/lQ6rvaXvJ2T8++QE+ZOHzz8wMCtHq3GtOfuv+ZhRWP/uTOcEtWGyIke57ae4B3zV3wLcXUNfTRMbRKByVBgWDQdyiDcN9TuiD4Go3Yl+44vZ5o1vtSK5yks4IaDRqmoGlZ8mgvICyX6qr0pJNFzpITiD89IMRZoWCxPvsSCqGs4ktpqDg8CtirmzLF5nNQ1p+Tj4IbzySbO6pLAvaIJMcn4mqBEMKNESC5MXgSuZ9yMDdFBjXEZ8BZVjfZ7YhpPDG3KGD7PC2D7i8Kr4DmR/sPc4V4w609z+1tL5itnFekJeVQd0+nz2sjtwG6edzQNJMeTTGZycNkazDqFwr1PeWwMTb1+0UvwNuQ/oUmKew9Xo0iVkc7jh5Z4w7UJEkPgIFg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YjZrMFJRZzcyMmY4a2lFVnQ3UnE3dVhCREV6ZzBzQ2VpZ0ltdzhHNHB0dTI1?= =?utf-8?B?ZCtzU2tDUkw4UEpHL3hxNE9rQ29jK0JQSjRmMHp5M0J5TWtmYmV1aWtTY1Zh?= =?utf-8?B?Rmx0RG1WeVBGM2Z2UUlmOHdXTHhGVTdFRzhPbk5QT29GaGFoUUM3ZXhvckM5?= =?utf-8?B?dm5rV0txU3U1T2tKWmZDWHdVUUYvVzUrRHlxbVQ2alBUVzBHYVFxaWZ5c0Vs?= =?utf-8?B?TmMrTlJ1NE4rV2NWMXVVOHV4TTdKRHFpTFNUV083VFVyT3g5NmdFcUJXS3Z5?= =?utf-8?B?dlc3Wk9aTVo0ZWhhK2U5czFGN3l0Y3RVZDdDaGxqaU56NEx6WUxRU2hwdTJ3?= =?utf-8?B?a1MwRFF4cDhSK3g2Kzl5Zzd5VXlqZVpRdFR3T25peXlwUXFtYzk3SU00Q0x5?= =?utf-8?B?VVd3QkkrMHZxQVZPL0xCcjcvVjhEdnMzbUg5ZHV1RUVwNVM4bVlyQjR2enhy?= =?utf-8?B?T3VMMXd0aS9SRFlQVTM3YUtCRmU4SmM2bTBLNDZaQ3NVZ0FQRzNkc0c5c0Vw?= =?utf-8?B?WnJ3eFlVSmhtL1lJcHBFTG9DKzR4N1JRVVRyTEpzamExMDJocEVjWmVFd29B?= =?utf-8?B?aGNWclFyYTRtcmZoSStxV1Rua3hvS05wbmdNUkdSZ2xaZE1lWkVLajlDQzlz?= =?utf-8?B?ZDBhSWF5OVdEYU01cWtnbGlQanoyL0dJMTFjWExKWTRTT0JCa1hHc0lyRHpT?= =?utf-8?B?b2RzUk9SL2hyRUxJdmViK1oyemdXci95b1NoUklmSFd2b1dZV0d4azRvOStr?= =?utf-8?B?MWYwOUhLNzlFNVJuMlg1RW9VVmJPNkRQT2dsQUo0V20wMTd1aTFXVC9WNjQ2?= =?utf-8?B?OVcxTTNuRDE1R3lZdkUzMFlQUWdjdlNRRVJkdHN5UWUzWU9zcEJRcFRPNHEx?= =?utf-8?B?OE9BWWR4VUtFcUJic0p4VllSM0JWSm9ieU9PZms1LzIvREhaMEZkU0RWd0cw?= =?utf-8?B?TUZqdVBMcVhxcVlXV3dCMzE4WkRQZnA3cTRrZ2xvd012eGRXZDN4QVBNTzZU?= =?utf-8?B?eTdraU5NVGcyT3dKbThxOGZSQWM0QzNtV3RCUkY5emt3WEhNekFJWnVWU0dI?= =?utf-8?B?Ykd0NFIzS2NodnkxZ3M1cHZsbUN4bDlFR2hkUzdXZzZUOHRYS3M3WUZYOEhU?= =?utf-8?B?bkVtQWNBcENEUkM5YzdjM3Y1VG5DU2FwTzZEQ1hiUE1KSkdvZkdhakRTUUJX?= =?utf-8?B?SjdHcHF2T3Z5bXByY3RNaktEb04yRFhNNGxXNEpMTGllaGhkcnBES2N4dmt5?= =?utf-8?B?NXZGOVoxQWhwWUticEZqblJpNDhuRlNvdFBMMjNmeHdwdXRldz09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c6f9aa8-80ee-4220-233e-08d9ed402547 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 09:23:21.0463 (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: AM6PR03MB4312 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/metasound, twinvqdec: Cleanup generically upon 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/metasound.c | 2 +- > libavcodec/twinvq.c | 5 +---- > libavcodec/twinvq.h | 1 + > libavcodec/twinvqdec.c | 2 +- > 4 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c > index 57851a43c5..f066182f02 100644 > --- a/libavcodec/metasound.c > +++ b/libavcodec/metasound.c > @@ -382,5 +382,5 @@ const AVCodec ff_metasound_decoder = { > .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, > .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, > AV_SAMPLE_FMT_NONE }, > - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, > + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, > }; > diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c > index 6dfaf06b14..38482e8c21 100644 > --- a/libavcodec/twinvq.c > +++ b/libavcodec/twinvq.c > @@ -783,13 +783,10 @@ av_cold int ff_twinvq_decode_init(AVCodecContext *avctx) > tctx->frames_per_packet = frames_per_packet; > > tctx->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); > - if (!tctx->fdsp) { > - ff_twinvq_decode_close(avctx); > + if (!tctx->fdsp) > return AVERROR(ENOMEM); > - } > if ((ret = init_mdct_win(tctx))) { > av_log(avctx, AV_LOG_ERROR, "Error initializing MDCT\n"); > - ff_twinvq_decode_close(avctx); > return ret; > } > init_bitstream_params(tctx); > diff --git a/libavcodec/twinvq.h b/libavcodec/twinvq.h > index 234604f581..5f49796f03 100644 > --- a/libavcodec/twinvq.h > +++ b/libavcodec/twinvq.h > @@ -197,6 +197,7 @@ static inline float twinvq_mulawinv(float y, float clip, float mu) > int ff_twinvq_decode_frame(AVCodecContext *avctx, void *data, > int *got_frame_ptr, AVPacket *avpkt); > int ff_twinvq_decode_close(AVCodecContext *avctx); > +/** Requires the caller to call ff_twinvq_decode_close() upon failure. */ > int ff_twinvq_decode_init(AVCodecContext *avctx); > > #endif /* AVCODEC_TWINVQ_H */ > diff --git a/libavcodec/twinvqdec.c b/libavcodec/twinvqdec.c > index 1fbe0bc32e..090a9fb0eb 100644 > --- a/libavcodec/twinvqdec.c > +++ b/libavcodec/twinvqdec.c > @@ -426,5 +426,5 @@ const AVCodec ff_twinvq_decoder = { > .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, > .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, > AV_SAMPLE_FMT_NONE }, > - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, > + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, > }; Will apply this later tonight unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".