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 E8941476FA for ; Fri, 20 Oct 2023 15:40:11 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E6D8568CAD6; Fri, 20 Oct 2023 18:40:08 +0300 (EEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2045.outbound.protection.outlook.com [40.92.58.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA71C68C9AD for ; Fri, 20 Oct 2023 18:40:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ClUAVCpuD3h7vuTNf3MNbK2G9fagBA7ayzErnKx7jB6rm6vAKGEAUFCkoPSVpf81UJKniQsFiP0i9ORd0waYvxab7r30/ekpyQX72RSeulj77c8OLAYJ9LqiIss37ztgWwWnR+xLu1vVp4Iv0BJhTHBbkw2iIkMe0k4Ngo6guBK1K+Dx7NOYvYYr7TtRHkM3kAfw7NCptynbXvSFQQxpPL7wsdfIJZrm4RxIf/5N7xGViQzPn5iTZ/+oExcLFilAciMpE2WccFNhkcgVOGnqur+5DiXbLWg1iu9PVA9hBPorXUEEgAT/kVYk8aq416zzbKyHwCJua5NpFrVF+c/zDw== 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=jnRKAPrAXdsdjZu5Sy9bLRxn3pw9up2TfkRePuP8mRA=; b=HxIdgnjkJGitXCURpLzrI+W9GgJSuo5Ah1gCIEiaOKBS3VLpKhL82ds8WXCwbA7jDrpDOUhqjFN7tNVUNz/PnyBD/Fnjuf/ng0wpJRpWnE4Ok17vf5RL9u5M16LWntzQO8jjVcoOKKbXVRuG78dM2NhKsXVs2RayVVwraGii9TLLWRrzhJVU3AFRh6nrvKNBaJkLcnorFFcFIWTsiVep0IaoOWCrf3QOMqQ+1Qa3VMniUN26S1q3+YrV8j8L0EI5dcJIwzbanGy/zNXm1Wh+r7iZgoIjgjtPMrb2vNRz+J4zb2x/Ml1USjyup/qjmWoWAs46cV9yaY9su1Cm5YQOPw== 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=jnRKAPrAXdsdjZu5Sy9bLRxn3pw9up2TfkRePuP8mRA=; b=qPd/zuuHSjT+gcq1/D0Ydnu96oWQNnv+a0fn6u3oBqbjn78v878AGuzFKKuqbE3KlNW8Wau7dvVhNO+GTWmX3LAghNx1mxzKOP4pYLPYE3V+S77zDaRWOU0WDWvfaPwC7WTbQfhuQRPsr/S2JQeRR8z4H3eZQpgRJDjjsfy4cAamEmn2uINu/D+wTGvC80YPL0X4W6rWfaQpY4kO/jBoItzjxxW7hxTGxMUx8a14aqAaeiG2dTcOPeRnH5sP2EIuNh1ga3ksjsZoofDsw65Uf1pm2c9uO/AXW/RKauukkqrxePEbrRdl3956oXsJXAqFLrF1e8Ob/i1gJ9vRRfgXcg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Fri, 20 Oct 2023 15:40:00 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::3126:4823:194e:6f86]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::3126:4823:194e:6f86%5]) with mapi id 15.20.6907.022; Fri, 20 Oct 2023 15:40:00 +0000 Message-ID: Date: Fri, 20 Oct 2023 17:41:17 +0200 User-Agent: Mozilla Thunderbird To: FFmpeg development discussions and patches References: <169781540929.30698.17624996838550323031@lain.khirnov.net> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <169781540929.30698.17624996838550323031@lain.khirnov.net> X-TMN: [kIEexvoKKS+wZJ8ByivYy4S/HUHsT2xbK0dso+hmKoc=] X-ClientProxiedBy: ZR0P278CA0142.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ed42b1b-32bb-4545-3c50-08dbd182d1bb X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n/JR8mhL7AoXWhj2HfIO+ukKOqna5rLTkIq0i7BhHV6jLXaksDR++Y+APsvR9Wuv10rMApusHxymXA06TkiR7E/vSO9mVvDCxw5KcorpIfx6p6uk0FbecCXmFe9PaPeYW0Co2YM0Q/y4tbXVY17f/t2Kk4TYmGnJH1R93gSzhCaUOBZMeiMfFxoT4JlzdVGVxBAxASDnwoPJI/69CRm/IUx0CGmYb+TFQCmNRivssFbRI4STeCq8LCxSmHnVKyD9eVhKB0yfW4Y8mGZ2DiaY2HUJIP3op85O2uygyjeUWwiUkZq697odxN0C80MmH0LVLgwcOfWRiZOqjC2tJGDKSaNsK+U/KWs7Kd+SXyRzqpDmWfRXektSEDXbg+ZDZ3dqzcofJ+K73iBt+oc9ecTGFBZfffxZvHwOlOpq0km7IU5A2icJzDw4B+Rgk0O+33SkqYAGT14NBs+pvsco6Tx9gIb9CZsTtacHmCwiuO//ee4mSKkB0sNxtBsMD9MHgVubKswydHe4S3DOZ44wxoYvOTY3jpIjFsRDWTe/umzcDhz5jOQBXs1UNq7TNFQDV/I9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?V3JlMGhvVUtTOUl4cENSVnE5STM0RWt6QTViN1pyZ2pSQ01RMkl5aVpVNnB0?= =?utf-8?B?LzFRZ0RWOEdOYjNTQ3VZNm8rRGp4TG0yMmRlR1p6Z1Y0cVhqVndOYm94RmdG?= =?utf-8?B?OE9URWVUbHNGVmJoWi80ZHVZTDFIb3NkQVhwR0d4VHcvWUJ0VERESTdNRXla?= =?utf-8?B?RVpuZ253OHo5ajZyTGRCZlRNVlNYbEtranQrVHk0eXM0TmJEb1A1dDVYUXFJ?= =?utf-8?B?VDY0SGN3VWNMcG9IVUJDVi9zS1lRb1M1RVp5RitkcDRwU0F4NFJ3My9OdzZ1?= =?utf-8?B?V2psem1KeGpZZWkyVURyV284UTNXOXRESDhMVHg1STZtYitRQ2FodzJ5MXho?= =?utf-8?B?bFZZbEkwNjUrRDV2ZGxnR1FKUEk1dWwzSVMyZ1ZYOWVrVGFSVkgxVmRLN3l1?= =?utf-8?B?anBQZGFZMnQ3TVI5bHlGY3Z6OHFkdGt5b1prYlRMSGplWmhGSExoL3JYcWow?= =?utf-8?B?bG5odEZweldUVUtEWE5HdC85VmtuOTR5dlB5QlNTU21COXh1REtGUlE0M2E4?= =?utf-8?B?Z1Q0L1g5K3ZEZjg4UGcvY05qWlpVNithRWcyK25NTWdEQkdXNWpzV1pqNG9K?= =?utf-8?B?dFRvUkpmZlIzb2d1MWNpZWJEWnA4Q3YvME92ejJwUU0yU2ZKSGR4U2VYUmZZ?= =?utf-8?B?bGJqVlI5WWo0R0RPTFN3QmhnRFBSeU80SWNjYjFJcGNSU0dySTZ6dXhtREEw?= =?utf-8?B?YzVUNTVnWFhNY3FYSGJvSnhkcFBBRVZhQmdDUDdnWUZzRVduYU55Z3RpV3hW?= =?utf-8?B?U0RBdUNwTWFiR0NkdXRNTU5LSjdkL1BUVlJOZGMveG54L2VBRWNXVWhBN2lW?= =?utf-8?B?OHduWnZ5cjJQSHI4MHY1Vi9WS1AyU1kxVGdIWlBieE1QY001bFZZNVU5c0lB?= =?utf-8?B?OUs5UzFuM1BKVFIwREdOeFFsUjNpT09wUkhWUHdlNUpPU2Z3L21iQVdhUkJ0?= =?utf-8?B?NGQ1QTRBKzJWNFZBejQxOW90UldJcHRZdThzMThzK0FXR3lYQ0tRM2lvaVpV?= =?utf-8?B?Ukc3bjlnWFFXQ25Dc2V4eGNmeW80N1VvL0x4WWpwQWYyZHhyNGlVTlpucEJx?= =?utf-8?B?dkhjbTRMVExVbUFpNmtLb3kzR3RzUWdyUzcxYmRKMWtBblRXUjhOb3hRQWpa?= =?utf-8?B?eGlDQ0ZOczhKK3lSd2pDZERPWGMzM3Y0em9xaEFKdGhtN1pKYjRZWWxJYVVC?= =?utf-8?B?ZmRWblJOcTZIK3BIUXFYRmRnTzlQVzdic3NUN2gwT3l4VWt0cUFQSEVMVmdY?= =?utf-8?B?SHk4dThJRjN3WDNEL0NsRVRqQy90QTdJRGtDb2M1ODkveDNzZ2hCemoxYlh6?= =?utf-8?B?amQwdDVQc3NjT0pWdTVxNkxRZjJuZFJBL1V5Q2VhWFJVZ04rcU8vaHdJdVU1?= =?utf-8?B?cFZXemU2aTlHS2h5dkJkeVZETUFiRkJGMzJYL25iN2ZPNjdjb1ZJUWR0MTZN?= =?utf-8?B?RE9LSENEUlpvcXhlN2hXVklTN3lzTVhKY1V4RU9jZlk1a2QrdG5TYzE2TC9P?= =?utf-8?B?M2o5V0g1YjJEK2ZWVjRlUTE5NlQ1S1VjN1lQK2JBRlVjMXM2UGVId0Z6ZTJj?= =?utf-8?B?Wlp2ZTZoTGtURjl5cnF4TW9LQlZUY2xWTjQ3TXpQTXU5NVhWNll0SVVoRW5n?= =?utf-8?B?SnZZTnh0MkV4TXJEcjY2YnZsSFhyd2orUVQ3emFXSVhSNEVWZHJ5VlUyWmRt?= =?utf-8?Q?2ttdOn4zXF6N/6MQrzrL?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ed42b1b-32bb-4545-3c50-08dbd182d1bb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2023 15:40:00.0236 (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: PR3P250MB0002 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/pthread_frame: Remove ff_thread_release_buffer() 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: Anton Khirnov: > Quoting Andreas Rheinhardt (2023-10-20 16:33:06) >> diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c >> index c02408548c..1a4339b346 100644 >> --- a/libavcodec/av1dec.c >> +++ b/libavcodec/av1dec.c >> @@ -636,9 +636,9 @@ static int get_pixel_format(AVCodecContext *avctx) >> return 0; >> } >> >> -static void av1_frame_unref(AVCodecContext *avctx, AV1Frame *f) >> +static void av1_frame_unref(AV1Frame *f) >> { >> - ff_thread_release_buffer(avctx, f->f); >> + av_frame_unref(f->f); >> ff_refstruct_unref(&f->hwaccel_picture_private); >> ff_refstruct_unref(&f->header_ref); >> f->raw_frame_header = NULL; >> @@ -689,7 +689,7 @@ static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *s >> return 0; >> >> fail: >> - av1_frame_unref(avctx, dst); >> + av1_frame_unref(dst); >> return AVERROR(ENOMEM); >> } >> >> @@ -699,12 +699,15 @@ static av_cold int av1_decode_free(AVCodecContext *avctx) >> AV1RawMetadataITUTT35 itut_t35; >> >> for (int i = 0; i < FF_ARRAY_ELEMS(s->ref); i++) { >> - av1_frame_unref(avctx, &s->ref[i]); >> - av_frame_free(&s->ref[i].f); >> + if (s->ref[i].f) { > > Wouldn't it be simpler and more consistent to check for the frame's > existence in av1_frame_unref()? > The frame being NULL is a very exceptional scenario: It can only happen if init failed. In this case it is clear that the AV1Frame is blank and need not be unreferenced at all. Given that av1_frame_unref() is not called infrequently, why should it check all the time for this exceptional scenario? It seems better to handle this case in the only codepath that needs to handle this. >> + av1_frame_unref(&s->ref[i]); >> + av_frame_free(&s->ref[i].f); >> + } >> + } >> + if (s->cur_frame.f) { >> + av1_frame_unref(&s->cur_frame); >> + av_frame_free(&s->cur_frame.f); >> } >> - av1_frame_unref(avctx, &s->cur_frame); >> - av_frame_free(&s->cur_frame.f); >> - >> ff_refstruct_unref(&s->seq_ref); >> ff_refstruct_unref(&s->header_ref); >> ff_refstruct_unref(&s->cll_ref); > > LGTM otherwise. > _______________________________________________ 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".