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 7928742B1E for ; Wed, 13 Apr 2022 15:58:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A000568B42A; Wed, 13 Apr 2022 18:58:17 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2042.outbound.protection.outlook.com [40.92.89.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDF0B68B425 for ; Wed, 13 Apr 2022 18:58:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iLwT3b3StfCrZDkMYSJtGymAb28VTWwzddFIrkO3aqAt+dYN8D7D92fHqLaV8F/JedWiYJHFkNzmdSYGBGI9cbUMVgUusoB/AerwD8cddlkioz79yZ+r57YERCFOzOvuvpvLpcoabGhZyNK6ZXOq70fvIMVgvRifKY+0HHPYRwdlt9piExAdXU3v5p1wJ4f3nJbf8KzNZ2L0SJZVJvS1NpqRuEZ3+w5Ph0FWDUn+c4MCEXWa8cqELbeSyRA7zzWke+5GLlWhYCX2LirJH8Q9WPPF5vDbIh0cONRFM34D07ofMwzdyCYvK44LBMb7vRkktL1Lg83K0OMtaYmY9ltvPw== 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=SOyeu6RdijSxGsCEfu3q7sAo2a/JYOE47eSRqmdPr74=; b=nvhcDs9AJvSfNNPW9YamjkfDM5XwBd7qaOekLa1K0/7WEcLGVQcT+XgcoMIqY4QiW5LHq79cjJbKkSugeuAEMdBVq+1MaJWETXU2GEmYpiZWaZDuERk7HDo7GdfqbzKSrY8ZmlFCgFSkApo6GhTgsDJNnRSD+8WglCHjN8e2+aFSm0ju1GvmkhNH7tD3WUZIepNyWWU2+nheFt/dcJCCTmp6iZ0PjCIovxJhImt7/qVv5XADf1cMkP+yuQyAeBeXTbmAYTyUjtGrQp6/RRtFkhIYCZXJYIoaJf3UGImIJN6A/7vljCmvdOBFZMc6et5/906nMSRz5Rkju48TLxI4Xw== 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=SOyeu6RdijSxGsCEfu3q7sAo2a/JYOE47eSRqmdPr74=; b=s6jKHPqRLlPiZWIBa6iys/MlJkv//G5M3qLCRKpbdWce6gOG1AF6yaElw+PKBJ/caPM4tm8vE8eduEE14O+k6d4291o+m3N+8CWW6HhAA7lKIB5gO4oGXiXKaLIGAXgqXW5fVF2hn/VN5DEtbJn0GZBC4H32po/A7i/8gTjZ0kkuF4y0z850+0NReZ3hksD772OWgTDVKlwpayhyzbltJkWQZfQwQ0QrSFCpOUtVaGh3CJ1W3AjxzRGIcf0rS68eVtqRkP1E1/iGAvl/bfrJvorRn4dBonP6BRgJhiqlPiLsGJ/yORLCuXJSe9/3jkHTGtJ5t8CrQ7XXsRoTGL6ARg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by PA4PR01MB10277.eurprd01.prod.exchangelabs.com (2603:10a6:102:267::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Wed, 13 Apr 2022 15:58:09 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2%5]) with mapi id 15.20.5164.020; Wed, 13 Apr 2022 15:58:09 +0000 Message-ID: Date: Wed, 13 Apr 2022 17:58:08 +0200 Content-Language: en-US To: FFmpeg development discussions and patches References: <164986490489.24258.10809421738885762835@lain.red.khirnov.net> From: Andreas Rheinhardt In-Reply-To: <164986490489.24258.10809421738885762835@lain.red.khirnov.net> X-TMN: [5aWVXoSm3iRAoNopBbhKsuJsUKz+4KRI] X-ClientProxiedBy: ZR0P278CA0093.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::8) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <3c4a39f7-f884-8c8c-86fd-aba88313c8df@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 079b5790-8251-4496-4ff8-08da1d6667fa X-MS-TrafficTypeDiagnostic: PA4PR01MB10277:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5VxzZd2cFHTK64lZGABKVh2vZKQyXKSiIBAaHA9KoCLhgdlZh4sKeelwy7glvfK0etK93XK8cXsw33mEY9GJLeWYy1+dthS/ZZ7L5M/owwPDIdqe4+gJAjb84PnMfvtf7wAV4HiJHAKOw0yQN/y9Nen+UQWfp/acEbDu6j4MK1TvX1IyyTYr7Xa+7Bmc9fDLQZzT0d1NmJSx1FXeWFkty4Av+YVfW8UXaBXrzFCVIuru6btSC4UVimjDa1lzKQ7JGI2jOIBHMkS4SwRRzbaosS5zKghgUl9h5ceNsdUPdgrkG28ZfwqBs5O0zOFE+Lb9k3KsJx8l2ZcNxNv2usnGxErCC2N0Qi6nXAKo3NmIb6aX5pXEliBi5F8TGcsb1ZcNh2yDN78zOIXIRWyUK+a4qYM88GmhlpOKXotXOKvChiLNYwEBCyQBcsDdPtEmjigp5BNbYDaGEDXHE9EuzyEB1BlnoT9kBuyWosKHxqzMAHDjUNBY0sfGTpnEAZ6uJlkZ6QYgtIv2it1sdGtCKQPd1UMa8p4V9vnEeBgCr6t0bYVTJcHk8qZ38fqCBW5MB75YeVxOiQLCe/zF60HP/wTHmL65D2P7EoUu+Dm1ROR3mRhYhPPaJ6z1ekxvv5zVcrfZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZVBNZW1SdS8wNzRORDVTczJOWGVzZEpFUTA2bDFFQUVuKzJHcDlYVXNHUmNH?= =?utf-8?B?aGZnSUZsc2FRVEw0cWZYMTZuRmR6NlpjQWVrSW5iei9oWm1pRWlldzhQWm5T?= =?utf-8?B?LzlScWtsVDJOODV3eW80UHRzbUhvMVNyS2xPekJ4SnNKVDZHckZEZTBURExE?= =?utf-8?B?VzZDSFo5RWx2ekQyOFpOK2Y3YkYxNWNXSlMxV2pWdjU1eThGcW96NTNHcW80?= =?utf-8?B?MG14QVNCUXpwMGM0WjV6ZjluRzlsUTNydS92Znp5aWZmMGhMem5QZFB2dDJV?= =?utf-8?B?ZTQvN0FEeVJwdmVyS0tlMWxnS3dDYmJwSnVzK2VjM0d6b0RhUjVpVFlERits?= =?utf-8?B?UytnTVRjdUVLYXFyN2RnOW0zaU10Nkt3bjJ4TkNyWi9tR000VUYvVXZXSWg2?= =?utf-8?B?dzNwWXB3djRtdDRrRWNkeThPUHFiR04xQ0Z5Yi9zYTB5aGZGV0llYTdUejMx?= =?utf-8?B?b1B4blczekd3RWpTTysrQXJUd1FDVEF2UmlHbCtVdVdVVldaWXJzWS8vOHd3?= =?utf-8?B?ZWQ5NFRzNmxDTW42L3h2NG9QMHRFR1lwdzJrRkNZaEpJTmZLZmpSRTNaV2xP?= =?utf-8?B?NWFmM090aTI0ZDFXY3BMRVVreWt2VTljcm53UHlPemhKTDZtb04xcnFSUmZK?= =?utf-8?B?QUtCYmkvc0V4WTBCNmJvSG91bjJEMEZwaHU4c0lOcDd0Z2NYeGxyanFYWWhn?= =?utf-8?B?MDgzRERBeE95VEZOOU55Qk50TGhlbllBR3BXUk1pMG5hQ3N3aFVkbTFid1B5?= =?utf-8?B?elhxSXp2endnVzd4emh2elRZNWJKYW1vS2g0ZHpCM2xVZWFRMWFobCtGbGkz?= =?utf-8?B?OWR2ZjNtcmhNcEM2d2NJemlLMTF1T3JqaGR5dFp6dERjQWd5NTNaMExsVzI0?= =?utf-8?B?NXcrWDhJUlF0R2VkTXRWb0pSRittWHBSRjdYbjk1Z1FFQnRLTUJrOFhMdWpH?= =?utf-8?B?YUlLWDR0R285UjhwK3Ayd1FYWFQyR1VwYXVMc2lWOXFML3cwZmg4RW9acFFn?= =?utf-8?B?S3lqU0pZT0FFNm15N3RaeUJCb2NDY1dzeGhRSHdROGhBR2NTUndmcWt2am1t?= =?utf-8?B?SVUweWxhejNHeStVZmZhWFdYQ2FoSDh0WnBMZnEwUHdsWFo5dzRhOG52dTdY?= =?utf-8?B?TEc4a0V3UmZTaDVlWXRaVnF1bkNwOTdGQmdhalEyMVFEWDcxY2M2cU1Ndjcx?= =?utf-8?B?Q080dE53MGZtRFNnNUdESm1IbU1EN2dGUmZUK3VNTnRlSGtWMmNJQnVKRUVC?= =?utf-8?B?VGszeHFma1pLUXlYYWMwcEc4cjVmMGM2MzJFTThXZ0N0a0dhcW5iZ2Y2WU5v?= =?utf-8?B?aFZaQ2crSHU0MEV1dW9zd1M5WGFtYUloNHplRHA3YVZyN3Q0NHdKdXc2dGp2?= =?utf-8?B?QjFFekR3RXR1cG5wV3NzYWJjU2ZVa1l5QmgzV2lOb2N3TXpiOUpGSjhNc21m?= =?utf-8?B?V3JlZEo4V2xUT29wQW9kMU52RjVFa0l6d2g5bExiN1RSaFBRSDgrOVhyZmx5?= =?utf-8?B?anREb05GSEY0WDBSOG51ZGd2RUdsbnNIUkE1S0x4SnNWdWQxR0dwZnB4Z3ZG?= =?utf-8?B?SlJSS1YweGFMelhxRWpqTURtRE91UFZpaW8vb0VyVFBaMXNzUGZoMUFmR3Z6?= =?utf-8?B?RnhZT0dxck9RSFhIamwzT0h2QzdwaTV6S2kyeDM1TG9MUzEwZXFvTHFhaEZq?= =?utf-8?B?SlV3VE1UYlJVMGlRSnY2UTRwM01BUmVBR1JOMndmaHRGVzU1TUYvZFFnalFn?= =?utf-8?B?NFdVRUJBQjVVanFNS0VnaVdJWGFkKzBsdFBWU0lWcGpycU8xbE54WGoyRFpF?= =?utf-8?B?MngwR2FZWGlZNHpCWUYrMFhFelVFL0RDQ01EVUZBdUhxNjUyd01Icy9ka1BE?= =?utf-8?B?N0JRbTNFVWkwNmxJc1hJWVZLRTlLTnJ6bmFKNUh6WGlSMzIxQ1UzRW51Z25I?= =?utf-8?Q?N1ZvU+HWUoL/zs6SARZCS4pK+jOQIWJw?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 079b5790-8251-4496-4ff8-08da1d6667fa X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 15:58:09.7173 (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: PA4PR01MB10277 Subject: Re: [FFmpeg-devel] [PATCH 3/4] avcodec/avcodec: Don't reset decoder-fields for encoders when flushing 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 (2022-04-13 16:49:51) >> Signed-off-by: Andreas Rheinhardt >> --- >> Needs to be applied before >> https://ffmpeg.org/pipermail/ffmpeg-devel/2022-March/294507.html >> or flushing an encoder will segfault. >> Btw: All this stuff is unused by subtitle decoders, >> so one could condition the else on that and avoid the allocations. >> >> libavcodec/avcodec.c | 23 +++++++++++------------ >> 1 file changed, 11 insertions(+), 12 deletions(-) >> >> diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c >> index ded6b5b307..0d971a61d4 100644 >> --- a/libavcodec/avcodec.c >> +++ b/libavcodec/avcodec.c >> @@ -422,6 +422,17 @@ void avcodec_flush_buffers(AVCodecContext *avctx) >> } >> if (avci->in_frame) >> av_frame_unref(avci->in_frame); >> + } else { >> + av_packet_unref(avci->last_pkt_props); >> + while (av_fifo_read(avci->pkt_props, avci->last_pkt_props, 1) >= 0) >> + av_packet_unref(avci->last_pkt_props); >> + >> + av_packet_unref(avci->in_pkt); >> + >> + avctx->pts_correction_last_pts = >> + avctx->pts_correction_last_dts = INT64_MIN; >> + >> + av_bsf_flush(avci->bsf); >> } >> >> avci->draining = 0; >> @@ -430,22 +441,10 @@ void avcodec_flush_buffers(AVCodecContext *avctx) >> av_frame_unref(avci->buffer_frame); >> av_packet_unref(avci->buffer_pkt); >> >> - av_packet_unref(avci->last_pkt_props); >> - while (av_fifo_read(avci->pkt_props, avci->last_pkt_props, 1) >= 0) >> - av_packet_unref(avci->last_pkt_props); >> - >> - av_packet_unref(avci->in_pkt); >> - >> if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME) >> ff_thread_flush(avctx); >> else if (ffcodec(avctx->codec)->flush) >> ffcodec(avctx->codec)->flush(avctx); >> - >> - avctx->pts_correction_last_pts = >> - avctx->pts_correction_last_dts = INT64_MIN; >> - >> - if (avci->bsf) > > did you drop this check on purpose? > Yes. We currently open bsfs for all decoders (even if it is a null-bsf). - 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".