From patchwork Mon Dec 5 13:39:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 39617 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp3246172pzb; Mon, 5 Dec 2022 05:39:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf5UaOa4ucdUWuqzbpacNq6ERKWKJGeqO4NyFjWS1RPTPxQig8/tc03EIZ8Zjl1onChNl+I0 X-Received: by 2002:a05:6402:1684:b0:46b:1396:e132 with SMTP id a4-20020a056402168400b0046b1396e132mr33863003edv.421.1670247595399; Mon, 05 Dec 2022 05:39:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670247595; cv=none; d=google.com; s=arc-20160816; b=fR9UCMu3XZ9e29rw/gsg9xE28221rVKa6IiAwWA0fcyeq0hLOdGw1hqTCUJZeaeV0X YpsqmboDhcrkzJhS5A/maXvdEAgadKLidHpoB9EZ5CjjgXPTJhADLf0YBkh9XM5Qpwa8 WMNgzSCocO73J138f7xBeM3daFTRiAM+o8Ib8UIqJFA17aK9a/Svk2SP9wiynKIIKUGb ttFEaFkv9aaHtUBJt5JuDgKPGjzfK2BSwY/mjlXV8PDMtgPMZhQvdZ2gvsjUCCrTfAYA BFE62ayVKwebDEzbesbwTblYPGWC3T+pZG/2O91jz8tJl0MRbYrAtyhMfyZK54Rc5yGF 9r5A== 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=xlRnq9WNHkG2rn68qNHeXwkqiavT4XP96jeAdWWmzC0=; b=WW5jkHdfNYXXCW3ubQiMIB6lwg19c4GRgHxazJwm0a8fUhWiYJ1O2COfKeSFntNjio 4y+/xxbDjS7QhnRAb8xqMl7kzfPiJLUhCp1Pqzk0mRmtt9Gs2ph48fCYc6jNMNENY9sG FO63AlxbVRNveYeS+n7Q9a5Jbu6XN9ZhIdHN1iUCwXJ72JCsFgOqczzSLo+gZ8s8pUpG 3u7DQTKui44NcoBnlWxdBhYkDa8jsQ8fMvvlDWs9pjSiPOGeO/goaZBgIDmeZUtNMDym 4hmnE7dzlkLZNNvDaggMxkQZWYtHMURdkS46ZtZHaSKZzkh8cJp9lq8wkas7cucB6WtV L0ZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=jq0sBn4U; 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 nd12-20020a170907628c00b007ae78152269si11912217ejc.348.2022.12.05.05.39.54; Mon, 05 Dec 2022 05:39:55 -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=jq0sBn4U; 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 D19FD68BCA9; Mon, 5 Dec 2022 15:39:43 +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 18AE668BC91 for ; Mon, 5 Dec 2022 15:39:37 +0200 (EET) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id 98A563A5BF8; Mon, 5 Dec 2022 14:39:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1670247576; 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=mYaSJE3XOsLBNn9bYMceGdYzUvXE42RMggE944CCoug=; b=jq0sBn4Ut6Zfn85mgd4OJJxUjBW38Od/41pT4FjRUKAFEnuK298SEW6pnSRA2gY1OrosLH Nxpw58H/gZwIHFolTROaV6SOe9LGeePsxMHM7Bsv+Ur9k0dmPsqdQp8+OrQ6khtc6o9HEo QgvuSk8c0FoTwN7l+S7M0PlPvptVhXcz8JU6REq/4BY17XPvxlJvF7wl6I93yB90TZ2xCW PXN00an+TmCmhfRJOdUafHtV2L5iBikVTyH2kv1Yb1Sia6OGJa6kZyu21Wfvu3DW6Vj05l 1mfO1/I6VQ2uCXvXpWp9f4KIY8XNQht7obXRgln7SOv4tu1gklHFxx5qaavy2w== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Dec 2022 14:39:38 +0100 Message-Id: <20221205133938.505-2-timo@rothenpieler.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205133938.505-1-timo@rothenpieler.org> References: <20221205133938.505-1-timo@rothenpieler.org> MIME-Version: 1.0 Subject: [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 Cc: Timo Rothenpieler Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: VOsGd15N/xZz 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, };