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 0AD88449C8 for ; Mon, 5 Dec 2022 14:28:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 585556806D7; Mon, 5 Dec 2022 16:28:16 +0200 (EET) Received: from mail-vk1-f173.google.com (mail-vk1-f173.google.com [209.85.221.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D996A68BA49 for ; Mon, 5 Dec 2022 16:28:09 +0200 (EET) Received: by mail-vk1-f173.google.com with SMTP id 6so3303232vkz.0 for ; Mon, 05 Dec 2022 06:28:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:references:in-reply-to:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=nAxmujbhrO46qEJgWexXPqwWoQ7mrxawJaKo/AHC+UA=; b=gsyH546IDbw9Ex19X9T8Exz1tIoBDYO4vka+fdVWfnBvfwpZTKJOT8YKyuX2nM0AgB s9+wQrDShCTApyhidcQQvEdPtJ7HGLY41+elbcVF6rmc19r1vzOnEbC1v2JmtWbNDv5I cy6XTyUmU3Wiqqe2bpEPv9q5HBiWoyR5qBgPAUdQ3ZOBHnZDFYay0J1XjQGw8/n1moab 5HUdTFPB8Nm6fsbTX+R6INbJEw3Zo8pZFAmfGaYWEX8z9xdibJjU2K7NlBsmd2Nb2uAl gHJv8WBY3AtdpzKSJdKF6fk7lNGz7l8FzRGICBxL9DA+T3yOGxi+QwJRBN4eM11fFLKw YfXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:references:in-reply-to:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nAxmujbhrO46qEJgWexXPqwWoQ7mrxawJaKo/AHC+UA=; b=6ClfhvaaxfWSIj6KNL+pnsM4V1hs21KkyDwdGBA1eulfRUVtIn/oYJQrF3sktIrWTm aSfsN3m0Ccx+T4vE0PXYhhSDwvOq8N0Mkep3n+V6ZVwVxNDdMV6ucMvNkA3gLPZFAE8J WNVIV6mP4qsdYdUk+hr07zV2zJcnGMszVyTEmMclBpO1ECyIVYrfCbbln9qSBzu+Dqrk 4hBxGxCLQOy/Jl831tpOf5YM5/mMmJvbDESAAgFikGK+qMbIdcaDuRxuX8xRRa9+I8sM CzgQXhiu6+dqrGxHVJ7eZz80+2FmRIGcLnn7fbUDy6sq6dZWU4DCElBpEPO4GnihdQCk 8VkA== X-Gm-Message-State: ANoB5pmEUr0DviMffgIVyABWbFII2TZifGkOZRQKzg1kyWYVDIoeCjIw hMRyEhyXKX0FUdGPDdvdINUrvigO6pEJ81AsCsJX4U8P X-Google-Smtp-Source: AA0mqf6DJ5kP1+ar1i7Y+lA1D5cLTANXSSZk3arxL325l3mO162woNazPxLzhTVI1hA49YSlUwHOOmU7ova4Znpa/P0= X-Received: by 2002:a1f:9e08:0:b0:3b7:82e4:f3a1 with SMTP id h8-20020a1f9e08000000b003b782e4f3a1mr45214363vke.17.1670250487867; Mon, 05 Dec 2022 06:28:07 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a05:612c:2428:b0:32a:5eaa:92e4 with HTTP; Mon, 5 Dec 2022 06:28:06 -0800 (PST) In-Reply-To: References: <20221205133938.505-1-timo@rothenpieler.org> <20221205133938.505-2-timo@rothenpieler.org> From: Paul B Mahol Date: Mon, 5 Dec 2022 15:28:06 +0100 Message-ID: To: FFmpeg development discussions and patches 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: On 12/5/22, Andreas Rheinhardt wrote: > 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.) That is full FUD. > > - 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". > _______________________________________________ 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".