From patchwork Thu Sep 7 16:44:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 43641 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp724089pzh; Thu, 7 Sep 2023 09:37:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE18yylVKH0meTPX6B5zXxiO3l57SGPWRirIKIRM4mfb5E48A54LXdYxudjN1x4fPBuA9xU X-Received: by 2002:a17:907:7795:b0:9a2:24f9:fabe with SMTP id ky21-20020a170907779500b009a224f9fabemr5479906ejc.66.1694104669742; Thu, 07 Sep 2023 09:37:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694104669; cv=none; d=google.com; s=arc-20160816; b=CP1DDEpbgGyrFXvqvv7DXJeafkxgC/GdXlXhUqN08FxKYHmG66TwL6t5oXH15Bqym6 15m6vAmchtmRXxCzJEsRyNeGIoU1NTUBAVbdfDWB9aSvCwpyQChVcxtf0r/ZAYW/vk3l a1kcBsrYKhFp7UZyBeDUCMBzKVPYBKfpllq9S5r6WJzSPbINSZPLBA0DoM2wpDTgN7Ij SjD6u9SylnIyH8wAhS/B3fo5rw3lVpM4a63w/RHOd99vcH8ZoD+QHJulQiAvkcMoWoVG w5T62HWrpKtrCUY1PmRQbnOXSmvNzewIVeaNktFf1+blhEjgc4ysK5g0UqABCtgRk6K9 /NKw== 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:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=SwJIVjsmJ/66j3sDfoAimij7MgoYjuVgmAekwE3m5VY=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=jEu3jR+uNJS4Ku0KFbmL1eqLstpB0hoQYpEpUdhC6UK4KRGzueJKvI1c1FrEfrUK67 u0y2vcloQuaNQxqTyDsM1IidjyTW198XV5B+FvNRcsRwlhclJarN5K82cGwWOmPX/e6V a8hJcYWfl+8t4Vhkh/t52oYm5BugnXQtwEcqtrG10r2bFax0gVMtKvsjdxs6Pr3LOuVr KUUTNF9sBkj6iqm9Oj9LtNf5zkB4GPng5LNuam1cXVS7ftHpAgjiHZhzuMGDOa0WOpQL sL0hOkddECjsXxWGNr6wAGGsI7Yd8lIzp2X3EuBnrQdtrCwHob9IffGdtFHTgtqU5BAr mPgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=LRMZJ+xn; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r12-20020a170906c28c00b0099d974b86eesi11020412ejz.379.2023.09.07.09.37.26; Thu, 07 Sep 2023 09:37:49 -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=@gmail.com header.s=20221208 header.b=LRMZJ+xn; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7340568C86B; Thu, 7 Sep 2023 19:37:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f176.google.com (mail-vk1-f176.google.com [209.85.221.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 017B068C709 for ; Thu, 7 Sep 2023 19:37:15 +0300 (EEST) Received: by mail-vk1-f176.google.com with SMTP id 71dfb90a1353d-4908d8f7263so434834e0c.2 for ; Thu, 07 Sep 2023 09:37:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694104634; x=1694709434; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=K+P0Pt8ev4zq/vK0MLgbzBnVi7yAno6EOFNLigsbF1Q=; b=LRMZJ+xn095vMcEP74OqfSPyEtbKgOcFuAIravqlbZXWHHhixPmtx05SrC8DXF/79T 31My43Lk89W4Vsv+PzlEhxm67dNwLMY7nFP5AyjnUV423cor12ISgjmvElY+Q4odtBN2 HAEU9IPr7Xxv7uq66lpnni4mjRp/BfOcYK9UCpQccJuqXF0LTWyZsFcKilCxxrRx+4wk S8AQHdNTg+uPIpkkFZ2PSAyUh2RSKwLgGt8F2z12hZw+61deIe5ddU3Vh98QL9a2ZA92 t/DyouWH2dayE52KBOxGZOqz4BNDj6Qc6MF/CWm8NN5vDYhpVrLAi/IJmLYalMLUCGzC 02xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694104634; x=1694709434; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=K+P0Pt8ev4zq/vK0MLgbzBnVi7yAno6EOFNLigsbF1Q=; b=hbNi/pAaU+aUFulgYsX2J7W7Had2XoyUVaTDlyaMdUidRDm40tjbvPwkISyewGd5ly XWk2YNLRdSgNM8A4/+84dxWNDJTIuPefifw7KhUydvY6IJY8hecO5RqC1vyP+v8TuovI pxgkL1LctU3GW8nz2s58obE1x1StVJ6rYSEzGJw3s201kVnUBU6lOt+DlfDQHCjuyn9f Ad1VHEernU2/wE3S9G5ADKpnRXEcaBcjoA3LQI8pNZ3sL66VzaE6Tz9E/321dYCeqVuj D6GU92iCGLZ4MISDSxC7Jcpxj5XkEHDrP9JLgwbqoGfNnbFrI0K1aZtZTAXrF5PgLWL8 NTmA== X-Gm-Message-State: AOJu0Yy36fX0XwKec9SFQJgWmDdEZiJra/t73XX76mS9nIVr0p3l2c6L WMt5rEWoGkz/CoAqnDwMiq36/Wy95VhY/udVaIgR46OyWO0= X-Received: by 2002:a1f:cac7:0:b0:490:e790:a15a with SMTP id a190-20020a1fcac7000000b00490e790a15amr240232vkg.7.1694104634200; Thu, 07 Sep 2023 09:37:14 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Thu, 7 Sep 2023 18:44:40 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avcodec/mjpegdec: add frame threading for mjpeg decoder 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: 9JTIAA4JbRsC Attached. From 2cff86b07b56d2923f60923e7dd21a546c2cc6fa Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Thu, 7 Sep 2023 18:42:03 +0200 Subject: [PATCH] avcodec/mjpegdec: add frame threading for mjpeg decoder Signed-off-by: Paul B Mahol --- libavcodec/mjpegdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 29f281231c..cc38b6c4a9 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -52,12 +52,12 @@ #include "jpeglsdec.h" #include "profiles.h" #include "put_bits.h" +#include "thread.h" #include "tiff.h" #include "exif.h" #include "bytestream.h" #include "tiff_common.h" - static int init_default_huffman_tables(MJpegDecodeContext *s) { static const struct { @@ -753,8 +753,8 @@ 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) - return -1; + if ((ret = ff_thread_get_buffer(s->avctx, s->picture_ptr, AV_GET_BUFFER_FLAG_REF)) < 0) + return ret; s->picture_ptr->pict_type = AV_PICTURE_TYPE_I; s->picture_ptr->flags |= AV_FRAME_FLAG_KEY; s->got_picture = 1; @@ -3006,7 +3006,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), -- 2.39.1