From patchwork Tue May 31 09:17:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Tomas_H=C3=A4rdin?= X-Patchwork-Id: 36001 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp2718582pzj; Tue, 31 May 2022 02:17:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsV/1CwUObao/y6QEEu+tBbIqsE4TaZlVqVBsHvorHmSpQz9sjYEnDDoyW0e9wU2eiaT/i X-Received: by 2002:a17:907:3e96:b0:6fe:b339:2e39 with SMTP id hs22-20020a1709073e9600b006feb3392e39mr44941109ejc.271.1653988668407; Tue, 31 May 2022 02:17:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653988668; cv=none; d=google.com; s=arc-20160816; b=VHfaW08p1W6ebDz43zLkMUOl7m03ePzWfM/7K34oQcpGG9JPS29SXrLnSy/PLI+xW6 p1fKVS/caojnxn00r/spo3EO+R7mlBn4Jga6sa4P9c7ZeN8LUNgNIH/h+Crj0T+acBSb KsW9BBrfMeIqbRvYbXOH7Lc48alLMueaKWfdeGbtupoUgXYzJwJEhpgtqx6uauOEfudC sUt04plV4VTqmwA3yKb7oqmQrP7xBKkFjJQ27hzFLZHRuyysEYQD+5ADjYKPw9hK6nBX cvBzTdr7dB2qaID7K72WqH5NUOZCw7IognCRYEXyGXb4vDvRqSI1y/3yAfHeeKGDlapx J58Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:user-agent:date:to:from:message-id:dkim-signature :dkim-signature:delivered-to; bh=xB8aN81Vx708NcTxQMY13rGdW7wSh6UXO+8Ku/HaPU4=; b=HZdeS4oDVqGeLGhw/vnvLh/7tWZq0Izbs/20wxe/itJerhf+Z3r4w0s9COfEO6Vcex ViCpW03JLi9pwZZTBtKyMM4nlg9Xx02mJlALwRFjeiQlivHYaFLEIA+DZH2ucfQVznfo +oVRovXgXO6DV4GvyFSCH4ai0yXcV501Adw6+cwT+xhkyxFPRVrU/XQFffGLeh4umROr YeCsu0s3QotyhUx5b+bR/DXnZfkmJfWsrARFXuc5N2bYycRpNVDt8KLARx97XiMl+iGv yQ0VEVDODtInfCyife10E/t8IeDt4U5fx109Psh+qpF8Eozuc77AWfRypfuR3xAQBHj9 qILA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@acc.umu.se header.s=mail1 header.b=uVvBo05n; dkim=neutral (body hash did not verify) header.i=@acc.umu.se header.s=mail1 header.b=gqr+OfIh; 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=acc.umu.se Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id di6-20020a170906730600b006feb72b4371si16143250ejc.936.2022.05.31.02.17.47; Tue, 31 May 2022 02:17:48 -0700 (PDT) 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=@acc.umu.se header.s=mail1 header.b=uVvBo05n; dkim=neutral (body hash did not verify) header.i=@acc.umu.se header.s=mail1 header.b=gqr+OfIh; 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=acc.umu.se Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0EB7268A5E1; Tue, 31 May 2022 12:17:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.acc.umu.se (mail.acc.umu.se [130.239.18.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD99768A5E1 for ; Tue, 31 May 2022 12:17:36 +0300 (EEST) Received: from localhost (localhost.localdomain [127.0.0.1]) by amavisd-new (Postfix) with ESMTP id A2FAB44B93 for ; Tue, 31 May 2022 11:17:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1653988655; bh=AjfJpRmH2V/qLrel+J0dHGzRD555yvi/kyTxmcdnm4A=; h=Subject:From:To:Date:From; b=uVvBo05nsl/Mf4x2PEwvEPRg4FJ6xPBXg9Bx1JlZdj66cJvnCen9+2M/A5kiyDnEJ iH4QEVC0etZIUjYzTBg6Hapj5Guymy4Dw1rNb+hXMN4qONLa1ZQXed1CoYUqAVtk1q 70d8E77EBpiNWk4ioFw/G6iJIN22uoOE0C3nFZqsqDs+LIqPfEe/E5hWuCAqDZepUS KkfmRiDwfgGVw+YIzy7Gl8M5Uwh3SaQR/KO4p7tPwbHKV97iFB5sFn/s2p9nibLKei DnL8YTEp5nz4TxPOtwXG3Uf0rTqFKsaLc8Pyrk0lNNACJqu7dQW+yemARHSA+vjPpB skPnMrAutKgKA== Received: from [192.168.43.169] (host-95-195-143-122.mobileonline.telia.com [95.195.143.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: tjoppen) by mail.acc.umu.se (Postfix) with ESMTPSA id 7F7C444B90 for ; Tue, 31 May 2022 11:17:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1653988654; bh=AjfJpRmH2V/qLrel+J0dHGzRD555yvi/kyTxmcdnm4A=; h=Subject:From:To:Date:From; b=gqr+OfIh95OoqLkj6WtczAlYmzx3tDRWNjzMmr7i0r3LDn3S+uHZ9fLhtfiMDQ0A+ 7qoMywPQuxj74R1y95xYkwG6r/Hi9L7ZeIUc8H3f1JZ7PCELsCevtNcX8NJeuoVGP7 p7NYwtk97+A5O96vFxe14vAuQ7PD1USYaJcfTvOZnNGOFdb4rTnt8GM1aFLvv1ArLH O+RzJUEccMSE2H2WBz+FOMe8gkMRcIYKl55C9vMSkGFjtNB3DyIDkY/z0/cBppDE5S Io1EJsLWwWG/RQwo5KC1U4DPG193cWitYZ0DOWi/kQkHmjrgDjw1GVbVrPHmmmgMj3 D4aFrDnp1cB8g== Message-ID: <322cd4ca4823f4d20a8ff0f3b2c668f129910981.camel@acc.umu.se> From: Tomas =?iso-8859-1?q?H=E4rdin?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 May 2022 11:17:33 +0200 User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Subject: [FFmpeg-devel] lavc/libopenjpegdec: Enable slice 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: i9YAqAYAeL1c From 230f9e23072d971f184b90a8f108517fc866461f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= Date: Tue, 31 May 2022 10:54:08 +0200 Subject: [PATCH] lavc/libopenjpegdec: Enable slice threading --- libavcodec/libopenjpegdec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 58715b43ee..649aadad42 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -369,6 +369,10 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, AVFrame *picture, // Tie decoder with decoding parameters opj_setup_decoder(dec, &ctx->dec_params); + if (avctx->active_thread_type == FF_THREAD_SLICE) { + opj_codec_set_threads(dec, avctx->thread_count); + } + stream = opj_stream_default_create(OPJ_STREAM_READ); if (!stream) { @@ -505,7 +509,7 @@ const FFCodec ff_libopenjpeg_decoder = { .p.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_JPEG2000, - .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, .p.max_lowres = 31, .p.priv_class = &openjpeg_class, .p.wrapper_name = "libopenjpeg", -- 2.30.2