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 291B2449BD for ; Mon, 5 Dec 2022 14:15:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5BBE968BCA0; Mon, 5 Dec 2022 16:15:17 +0200 (EET) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2098.outbound.protection.outlook.com [40.92.49.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79DB06880B3 for ; Mon, 5 Dec 2022 16:15:11 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E/vKpaEiD5nAiez3BSJuYR8nZXJqUEJlyiZ5aV2WyQp295Ech9qsTsTsQJ2i8NvIUqBRUIsKWMJMVy0kqxSbayBTtjy8HKXaQCqCXHKLR0W6sYYST+Kqo7cWz5XRbJybNw16iC6u+kbGxtXgqRYo61AaG+N8Vt7O7ywPh+2KRPsZ2atrlT24RQtJo3K85TSrol2a9G09Q3BcWMEiOy63PxMUYoMqKv6RVo6NiqDDdMnxUrxO5iKBoraLifWK+FnNMxO+dXojrzlwqWQOUjSe8SM64LYnnBffr8Hm2vL3LoNV6fh/pOl9LdAw0/Yrl5eHCo8alP5+X+qz/11EXxtC2A== 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=zHQeZ83V7qmKH13LaoT1ZYemDA05A9K4w3OsUNctgRo=; b=cB1hXqsMe4yjmN0BEfHQuxRHwyvjb/qaq9jiIXNNltO8v+hPv8xPuUwGPC49RQpiRgaHCklJQ3FqwkCQbCZ8bB8wFiuA6eqy9vuoUiuvcM7+8H5J9tDX/IfdRpVvj/UHt1rTsCCj35nRMvl//yNm1Gs56N44clRs/mrnEO9spaih48fmUH5pprhqHOKf5fGC8d07ymzhqytxYKqr05xQWQBg+lFxR+sU31/cey0fpdQlgfruPugYzCgwV6RbFFFGEYmnN7kC1LuxeBgjr4l40ThI6aeIqKxeft567a2AyrQbYubc5WiNAPX1aYE34MVYg6Bd2TVdIjyCFHEQa6VZvA== 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=zHQeZ83V7qmKH13LaoT1ZYemDA05A9K4w3OsUNctgRo=; b=hymXvgMxb3TJ/RhzJJdkPZv1YpelHFMPC2MJ/nZHJeME7pN1Ik1DPybEaTXT++Rgy0WiCZKjWxmcqYmyKKY6Ay8sUvxVzlaC6bkXgUwAVCfXkRMliWesDQq/oALtvRkxpaO9TPAQbvlcy+/Kx0mHuQiL435MFILZVYq8gmmLYyW4Yzf2MPrXtq7mPaNLqo0z2miFtw0JFqcHHlzs4QpiP3SlEaplJsxai/llU4Czwbzm9ltq/buz9oaRpVcEin798/eaoNRBQLi7xEC1SiV1xWprtquV+zIJClqkMYmSGWzHVIC5UhtmoVb2eu/YgyP/kl/su1yb6B5z8MoLjfyjAg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0865.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3e8::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.14; Mon, 5 Dec 2022 14:15:09 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::da14:61e3:630a:70b5]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::da14:61e3:630a:70b5%6]) with mapi id 15.20.5880.010; Mon, 5 Dec 2022 14:15:09 +0000 Message-ID: Date: Mon, 5 Dec 2022 15:15:29 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20221205133938.505-1-timo@rothenpieler.org> <20221205133938.505-2-timo@rothenpieler.org> From: Andreas Rheinhardt In-Reply-To: <20221205133938.505-2-timo@rothenpieler.org> X-TMN: [qYl/5jAWTo+zXderSddhaukyRMvfecoq] X-ClientProxiedBy: ZR2P278CA0017.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::11) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0865:EE_ X-MS-Office365-Filtering-Correlation-Id: 89bbfc0f-9056-4217-e42e-08dad6cb1da6 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4BA+vmOwKcAMbj+Tll18Zbr2hNCg79B5jfcjWiVv+cMoirSMgKR/YrG4O5/wyzlgqKmhUuhxUuaaxSbiBor+DfA73aVHlOA4Byo07+8SzVLMRC93CxUDN7Zyb7uRHKOibr4i4wK2QldOoMOWO+fV1MVp/+OtxDgACwLQAbOV2Nmj9+zfOVO1zskQvFobZUK5qRc8HQ8KCZQQjxoptN7SomnHdJ4B1zNNJ3+5bEhd+JZRd5dbAFO/MVhQPMHjGWkORmCcGwXHZzzMOkNWYz8Yv+BOOABCg446P+ccm6p4UqmnH0CN8rFLWHFkYJuwO5+hYiE/nBIK+gXQshQMXmnloYZkLtzJLAuPn30Ic7NStno/JvgQ7iAAxRRpMjdSoXuFeqKbrQdWbTp3s6CCbd/jDGi8477MZPjruXJCoKDadvCSoqF8jTa/ZcpG4gFcB8gIls0mW18e23gwFL87mnUasazu7SnYMm8uc51NKMGMWpqew0gIVlXxCNmASVi5NRW16VYW8vlDRLCikrGc4pkHPp21DrCa14CsEQjIcfIzW6A9uT9hW3T0dtxMPJJuYQG9+qL+i40qB0U4A5r61S352lsohQJqob2dqx8zn40PqHNJWT0iidcmv+OqF3kmMnDYduMvFO3pOAmVTupKjaYCDA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZlpoNjRwWkhDaW9SNDMrRE1PWnFBb1JmbTRzc0VJRTE5OVpURzdzSzFHYVNh?= =?utf-8?B?U0g1clZ4dkNobjVuQ013cWxoeExWZnBOZm5rRVBMR1R0cTBnd21MbmNpSG12?= =?utf-8?B?QjFnQUxKTFlTM1Exem1zK1h1d1BnTldVMmVlaUphckt4cEFNenpKU0FSZ1hE?= =?utf-8?B?QVY1RkdhVnB0REd1STVxU2QvQ2UrMDBwSHFiMnJ6ZkZCalJIRExXd25FaGtK?= =?utf-8?B?cVNoNUYwY0RLaVc3UVkwb2Z3cVdPM2YxNkhrUkdBREtMN1JLRzZIb01CRGlH?= =?utf-8?B?enZBN1NBNmFGanBTbk1GRzJhNktneW9UeFJDdkxPTzF1NHdnYzNFWU5aN3RX?= =?utf-8?B?RmI0T091dU9ycnFwZVhGOXNNV0lJbjBYRFY1RWhYRGxDQW1EdzlDNWdxdnZj?= =?utf-8?B?anFDdEVmZ3ZaZkdiZ0E2dkI4dlN2b1hydUE5QUluaG5WL2ZhOVByWnVUT05Q?= =?utf-8?B?blBsTmRlT25mQmZNR1hpZERMd2lrMjJqdmVxbG93TUFURzQ1ZzFucE5VQmhk?= =?utf-8?B?OW1ZNDlxaUxVTmsvblpUa0l0WW10TnhaTWJVZC9ZbGtDU0t5cEZBNkJLNTZx?= =?utf-8?B?V3NYdXJKS1E4MEpkMzBadDNlRW16NElqSDZ6a3NyamtDM1lQVzZLc0tYOEQr?= =?utf-8?B?T1JPVkxwMjVHRmRNUGlPTFdWdXJJOG1pOTlicnBhd2RFaWZTM1hGUGNVUnBT?= =?utf-8?B?aDRjSS85OVUyQVByWmVyMHRlcFM3SjVlcTgxWGY5c09PeGx0cnl2YTJHMEts?= =?utf-8?B?TlN5eUp1ZFJjVWNUM3RWQTNWdFJnT0NDTTY4YzE3dWlLaXJhcDM1TWRodTh3?= =?utf-8?B?SlN2MVNyL0Rrb2x5aFJFbG1Ob2RXQ2RuVkVzVUtDNVNPKzlLZ0VKNW8yQWtV?= =?utf-8?B?SWtxanhLN25GTCt3eVBMQUkyQ3VReVdiV1gxMWRJTUsxT2FYbkVYYS9zWEo5?= =?utf-8?B?a1FIQ1MxdTlkc2NCWDFrRHlndXR2cklvOVlLeWRjQU5ONElHUFNqS0RjSmx6?= =?utf-8?B?cjNJalZVM0pHd0tPbnJpRXZwZzNSanJDM0V6OE94MUhHcmgwY0l4d2plYVdT?= =?utf-8?B?NzFZWnQwVXdvTmJ4M1gzVGtna3pweEZpRDVWeWQ3VVlPVC9SVXRycFB2ZEww?= =?utf-8?B?R1JNM21EV1JwVGNHYmVMSVA1QU1QTXNCQkJVeUQrZ1ZMRXJWWUFrcVc3bmVx?= =?utf-8?B?YkUrMnJWZjdSb0cvd25YU2RXQTMwdFF4KzQxOXZxcXZ4amplZVJ6UldKQlA2?= =?utf-8?B?VnBmRDlwMnp5UDdmNzZxYkVHbXlXNmx5Z1pyQURiWnBpSFdpMFBEVXptTytx?= =?utf-8?B?NHI5UkVhQ3Q2enNLeTNYODJmYlRYUnpCUXN3U1h1UkZ0MmVCVVd4NHNGeUVh?= =?utf-8?B?MUU4V2FHUDg5MFpGdUo4R2VONUlwZ21YSUs0bitXTzMveW41WGxHQlc5azdh?= =?utf-8?B?R3JhMzI2MXZ6NlJ1SG8zaFNVdlVtOUx1ZkFTMUsyM1N1SVV6QTVyTG9HTktS?= =?utf-8?B?aE8rTjdIWUlONVJPTVVZZG0xeGR4aksyNldlNFVscVR4Y05yVkVDUkVmNkhw?= =?utf-8?B?WElSRVoycHFnN04xV1RLYkNKUUVVbExCOHM0ZTk3THA3UlI0V0tmVExFY2Ry?= =?utf-8?B?TE1wT3ROdVN4SGtERUlzOW1wQk5tMjEzMTc1MVhwTk55VmZ6czVQbmNOMmFh?= =?utf-8?B?L0Z2KzFadFV1V3hyWXJOQjJ2UnVIQllQL0ZraGE2QXhaRjlWM3I4dXlqdFB5?= =?utf-8?Q?OZ1B/rrI4eKWOsW09o=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89bbfc0f-9056-4217-e42e-08dad6cb1da6 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Dec 2022 14:15:09.3507 (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: DU0P250MB0865 Subject: Re: [FFmpeg-devel] [PATCH 2/2] avcodec/mjpegdec: add support for frame threading 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: Timo Rothenpieler: > In my tests, this lead to a notable speed increase with the amount > of threads used. Decoding a 720p sample gave the following results: > > 1 Thread: 1428 FPS > 2 Threads: 2501 FPS > 8 Threads: 7575 FPS > Automatic: 11326 FPS (On a 16 Core/32 Threads system) > --- > libavcodec/jpeglsdec.c | 2 +- > libavcodec/mjpegdec.c | 13 +++++++------ > libavcodec/sp5xdec.c | 4 ++-- > 3 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c > index 2e6d018ea6..c0642e8e30 100644 > --- a/libavcodec/jpeglsdec.c > +++ b/libavcodec/jpeglsdec.c > @@ -559,7 +559,7 @@ const FFCodec ff_jpegls_decoder = { > .init = ff_mjpeg_decode_init, > .close = ff_mjpeg_decode_end, > FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), > - .p.capabilities = AV_CODEC_CAP_DR1, > + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, > .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | > FF_CODEC_CAP_SETS_PKT_DTS, > }; > diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c > index 9b7465abe7..d30d722398 100644 > --- a/libavcodec/mjpegdec.c > +++ b/libavcodec/mjpegdec.c > @@ -54,6 +54,7 @@ > #include "exif.h" > #include "bytestream.h" > #include "tiff_common.h" > +#include "thread.h" > > > static int init_default_huffman_tables(MJpegDecodeContext *s) > @@ -713,7 +714,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) > s->avctx->pix_fmt, > AV_PIX_FMT_NONE, > }; > - s->hwaccel_pix_fmt = ff_get_format(s->avctx, pix_fmts); > + s->hwaccel_pix_fmt = ff_thread_get_format(s->avctx, pix_fmts); > if (s->hwaccel_pix_fmt < 0) > return AVERROR(EINVAL); > > @@ -729,7 +730,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) > } > > av_frame_unref(s->picture_ptr); > - if (ff_get_buffer(s->avctx, s->picture_ptr, AV_GET_BUFFER_FLAG_REF) < 0) > + if (ff_thread_get_buffer(s->avctx, s->picture_ptr, AV_GET_BUFFER_FLAG_REF) < 0) > return -1; > s->picture_ptr->pict_type = AV_PICTURE_TYPE_I; > s->picture_ptr->key_frame = 1; > @@ -2388,7 +2389,7 @@ static int mjpeg_get_packet(AVCodecContext *avctx) > int ret; > > av_packet_unref(s->pkt); > - ret = ff_decode_get_packet(avctx, s->pkt); > + ret = ff_thread_decode_get_packet(avctx, s->pkt); > if (ret < 0) > return ret; > > @@ -3020,7 +3021,7 @@ const FFCodec ff_mjpeg_decoder = { > .close = ff_mjpeg_decode_end, > FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), > .flush = decode_flush, > - .p.capabilities = AV_CODEC_CAP_DR1, > + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, > .p.max_lowres = 3, > .p.priv_class = &mjpegdec_class, > .p.profiles = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles), > @@ -3050,7 +3051,7 @@ const FFCodec ff_thp_decoder = { > .close = ff_mjpeg_decode_end, > FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), > .flush = decode_flush, > - .p.capabilities = AV_CODEC_CAP_DR1, > + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, > .p.max_lowres = 3, > .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | > FF_CODEC_CAP_SETS_PKT_DTS, > @@ -3068,7 +3069,7 @@ const FFCodec ff_smvjpeg_decoder = { > .close = ff_mjpeg_decode_end, > FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), > .flush = decode_flush, > - .p.capabilities = AV_CODEC_CAP_DR1, > + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, > .caps_internal = FF_CODEC_CAP_EXPORTS_CROPPING | > FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_INIT_CLEANUP, > }; > diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c > index 394448c5a9..8b08dc672a 100644 > --- a/libavcodec/sp5xdec.c > +++ b/libavcodec/sp5xdec.c > @@ -101,7 +101,7 @@ const FFCodec ff_sp5x_decoder = { > .init = ff_mjpeg_decode_init, > .close = ff_mjpeg_decode_end, > FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), > - .p.capabilities = AV_CODEC_CAP_DR1, > + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, > .p.max_lowres = 3, > .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | > FF_CODEC_CAP_SETS_PKT_DTS, > @@ -118,7 +118,7 @@ const FFCodec ff_amv_decoder = { > .close = ff_mjpeg_decode_end, > FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), > .p.max_lowres = 3, > - .p.capabilities = AV_CODEC_CAP_DR1, > + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, > .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | > FF_CODEC_CAP_SETS_PKT_DTS, > }; Can you test the sample that Michael mentioned here: https://patchwork.ffmpeg.org/project/ffmpeg/patch/AS8PR01MB7944E105BE990A5D01EF89208FEF9@AS8PR01MB7944.eurprd01.prod.exchangelabs.com/? (I never got around to analyzing this, but if I am not mistaken, it shows that this decoder is not a simple one-in, one-out decoder, so that making it multithreaded will be more complicated than just adding the flag and using ff_thread_get_buffer/format.) - 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".