From patchwork Mon Dec 12 21:42:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 39687 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp633259pzb; Mon, 12 Dec 2022 13:42:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf7FR/i4F1brEQuDQFAG0vpiKPp3KiI+OMCCtMPibb/GCz83zMIVkq1D5KsqDqKZoCB3oZ8Y X-Received: by 2002:a05:6402:34d4:b0:470:1f1:257a with SMTP id w20-20020a05640234d400b0047001f1257amr4174157edc.25.1670881365400; Mon, 12 Dec 2022 13:42:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670881365; cv=none; d=google.com; s=arc-20160816; b=kxobilN8b9KDytUxSyT0NeVbhY0d19LUG8zE+S1vUK8fcPM8GvApFYs/M6OnGBbj8n +PL0yg5F1fEjcsZZLyDzK7N09Nsr14LsPPjc0Lxt97am8sYAo/uw/gZ5AXxhZatBLJjJ Hf75Lk0mLFHbTeQQTQ7VTdisdhPMwS901SoxVkFqrHYIIfR5mJWUysMwrJawMuiRI+iC m03nR7+DZPcSdEKHw/BxX/ijhGxWfR0fSncRdj88SPTWWHPcHwBSi3tNrXpEJUytjWOa iBmn9hYH0FIhN1y9NTyVQOIsbDOPfa3TzN88/iFGhyYVVYfkinMIm2hqQfReAjjr9ke4 AzRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=Nyau8ndxx6iHbgcnJngh2kD6zOrZU8DJUm1Z+eU6Tiw=; b=VoczJ62WxoYFIGo7VHR5YxlOT0monerKtinOUplI+krUEjV4iv1HsDXYHsNhDFmZJU oQ2YN2kfF4gOcujr5Jw7Ow/i3T4c3zjneczpbjvpBaSIAM+vvPRoSE0CEasByuq85hKU 88eSnEGmtAmcqrWhyJTGG046R2O/ZKF0lHLvjf6dkji8hi+LI7dhSdvp/lPMYGy0rSrS JpccvtZqUV2aUZ0dG6Kvbh59ltW6pdQcmD2VyWvFf6K07FNcOGVkFYM2BSElVVg/N2s7 GwHKWICP8EePlC36SPKhMWBQIyaxk2kHrTWWd7Lu5fTxkhHpx4eY8snHhYNfx/aJ1717 bc7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=k6PX+y2q; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j15-20020a50ed0f000000b004637f0abb77si7841993eds.487.2022.12.12.13.42.45; Mon, 12 Dec 2022 13:42:45 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=k6PX+y2q; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E55C968BE2A; Mon, 12 Dec 2022 23:42:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [136.243.74.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EC4368BDC0 for ; Mon, 12 Dec 2022 23:42:26 +0200 (EET) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id DE4B22EC92C; Mon, 12 Dec 2022 22:42:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1670881345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=170J0lt5XCY1bZ0gMow+hltQutt4/p4+ZdzjjMNQHwk=; b=k6PX+y2q6yapgRI2o4KuRVUXW7TH3a60Cf2OJ7tWv1qVfrG6XKI0hByAOGwqG8ZcMtZQMT NNo+e4uaqrj6ChrY29+Papw//um6I4ZYlWcCcuXffBNF+0TB1G7zIBqG92DyseRIOS/sGc dYKDVwOUxRYngxLhI0zVlvExXCjuTnv/6HtnTtQB8wZByr2vmtaqSPx9ljKadMoUqyr9UH n6zLeTI+ZdQsuXXmnqRB7VKLzn8RzvfBcgeMf2I0zu/SOFJxTQcM+Ml6XuBbnATg8uGVVr BWyGJ4o2dCOjHtrvrANmuECSO9yzwr5htYBa4sj7e2RofbGocUCo6IFbxM5rSA== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Dec 2022 22:42:10 +0100 Message-Id: <20221212214210.2628-2-timo@rothenpieler.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221212214210.2628-1-timo@rothenpieler.org> References: <20221209234636.GH3806951@pb2> <20221212214210.2628-1-timo@rothenpieler.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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 Cc: Timo Rothenpieler Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HEibe3MEH+5Z 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 | 11 ++++++----- libavcodec/sp5xdec.c | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index ec163b8964..6e75c9b406 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -559,6 +559,6 @@ const FFCodec ff_jpegls_decoder = { .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, FF_CODEC_DECODE_CB(ff_mjpeg_decode_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, }; diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index f33911e1a8..41d3f36940 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) @@ -712,7 +713,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); @@ -728,7 +729,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; @@ -2954,7 +2955,7 @@ const FFCodec ff_mjpeg_decoder = { .close = ff_mjpeg_decode_end, FF_CODEC_DECODE_CB(ff_mjpeg_decode_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), @@ -2983,7 +2984,7 @@ const FFCodec ff_thp_decoder = { .close = ff_mjpeg_decode_end, FF_CODEC_DECODE_CB(ff_mjpeg_decode_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, }; @@ -3062,7 +3063,7 @@ const FFCodec ff_smvjpeg_decoder = { .close = ff_mjpeg_decode_end, FF_CODEC_RECEIVE_FRAME_CB(smvjpeg_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 dfed725500..af1b6400e1 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -103,7 +103,7 @@ const FFCodec ff_sp5x_decoder = { .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, FF_CODEC_DECODE_CB(sp5x_decode_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, }; @@ -119,7 +119,7 @@ const FFCodec ff_amv_decoder = { .close = ff_mjpeg_decode_end, FF_CODEC_DECODE_CB(sp5x_decode_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, }; #endif