From patchwork Sun Aug 18 12:20:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Batlle_i_Rossell?= X-Patchwork-Id: 51068 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b6ca:0:b0:48e:c0f8:d0de with SMTP id s10csp1394305vqj; Sun, 18 Aug 2024 05:21:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUzgxbrMgwRgOOqx2rdZ/HDa+43VE+ANyAipLB/FYxNpUI/tt14E38unLwFzZpsVSpiV5Ie3C+yDwLPnQxK8cHb6ak4sc8B7tZZhg== X-Google-Smtp-Source: AGHT+IFThZbW/OLS6bslKSomVevuVnUCGWsP0fOhDDFJ4M6pP+oj2w4skqUG/XKYuCPPl/2Pulx1 X-Received: by 2002:a05:6402:3590:b0:5be:e887:c667 with SMTP id 4fb4d7f45d1cf-5bee887c7cdmr2466628a12.33.1723983669800; Sun, 18 Aug 2024 05:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723983669; cv=none; d=google.com; s=arc-20160816; b=n7Aq06yPXKyhKz20/VswoND5q3JszNvatUMXb5yYrcEhZzqeIfTDPw8mCmqzqlDZKU flhpFNcT34uC3ggRMU0T8WmSVf56ERTBT7A6ZEMnnCxAAILFkKLk9vEula8R+zwXnaUE ruxXNrr64F+FY0Ge2jrKYGAdq3dBGHbZz9osQXdk55bLXF/Vi7utJwenq+FtITN07xrl vidT1+/W4cf/o+OSbE7shyh5i19ZCM+T0OgligTipJiG49l8tPJQ6HChKHrkBAjgP7ar +4yNeoU706qtohGF+Sne4Kr9L6SJcVUHNzEfSjTGkhhvbIDsYTnm07ddyyN7voBV94RA qheA== 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 :content-disposition:mime-version:message-id:to:from:date :dkim-signature:delivered-to; bh=PD77MQgJLkVUi+60T6ZcFnl/34kOj8sY2Ktomzx0TyI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=BLex+Pf/g8BtV1iE/qdlqHjFeEQwpX5oDBd5fFveLp2Bxn3usJiSRj+JSqT3nHbLCe hfbl385903o8PHO5Vr8FcRDagb4tYZcoSmyh5NDIWDI2JserAOFWUoREH6TMDPi3VrGH CbPC8BEAqxk8zX6WFRByzompPcp03KVYmBKy1MubLZQljfu6kkwK2sMl4Djodb0x57sj e4UFY5oJGkpvyE2gshw0Cs7+GUSPjhNXlYbSELHBk5VVFqYRlSV5yJ53ChpJlxdaQJDV Q/mg6R+ZlbFlIy4bWjbZ5o8Fc6n7L+NNfIeqXmnPkQSSdgHDmHKoOxCIaAYEQDR16EM2 Zruw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@viric.name header.s=dkim1 header.b=ltwtsH6+; 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=viric.name Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5bebbdec4c4si4282610a12.205.2024.08.18.05.21.09; Sun, 18 Aug 2024 05:21:09 -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=@viric.name header.s=dkim1 header.b=ltwtsH6+; 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=viric.name Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 94ED968DDC2; Sun, 18 Aug 2024 15:21:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.viric.name (mail.viric.name [37.18.133.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 909EA68DD04 for ; Sun, 18 Aug 2024 15:20:58 +0300 (EEST) Received: by mail.viric.name (Postfix, from userid 1000) id E546212D7AEA; Sun, 18 Aug 2024 14:20:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=viric.name; s=dkim1; t=1723983656; bh=hs8oXtfeyo+ru8lR2bFsJVWyBThdiJ6MRW0GVDzBFjE=; h=Date:From:To:Subject; b=ltwtsH6+nyYhvJsyB/o1h22/umJ+w/f4zU+i8eZPM+4hCAo+JSZ8dN2WZc6xUwpGi YLuU8wJF9CcFH6IOQdCeFs6LEbT875TcH/U8f3GRgBmD2/OufiKl5ZJPMm5zyKL+KX O2/0wU1xlHi43A6YXAgv+8HAPimFRer475FOQKqc= Date: Sun, 18 Aug 2024 14:20:56 +0200 From: =?iso-8859-1?q?Llu=EDs?= Batlle i Rossell To: FFmpeg development discussions and patches Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Accept-Language: ca, es, eo, ru, en, jbo, tokipona Subject: [FFmpeg-devel] [PATCH] Skip parsing of hwaccel mjpeg after decoding 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: ieD6+wovfhQ3 Attached. Together with previous patch "Less CPU use in hwaccel MJPEG decoding" the hwaccel mjpeg decoding uses about 90% less cpu than before. From 5960e16ae7561c6c6ad982c90f4e6ea1d30df91b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 18 Aug 2024 14:14:50 +0200 Subject: [PATCH 2/2] Skip parsing of hwaccel mjpeg after decoding This avoids completely the heaviest cpu work, find_marker, in case of hwaccel. --- libavcodec/mjpegdec.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 43583c1ccf..b835162fcd 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1774,15 +1774,28 @@ next_field: if (s->avctx->hwaccel) { int bytes_to_start = get_bits_count(&s->gb) / 8; + int bytes_left = s->raw_scan_buffer_size - bytes_to_start; av_assert0(bytes_to_start >= 0 && s->raw_scan_buffer_size >= bytes_to_start); ret = FF_HW_CALL(s->avctx, decode_slice, s->raw_scan_buffer + bytes_to_start, - s->raw_scan_buffer_size - bytes_to_start); + bytes_left); if (ret < 0) return ret; + /* The raw_scan_buffer includes all until end of jfif, + * so we can skip until 0xFF EOI, to avoid find_markers. + * Due to alignment, there can be multiple padding 0x00 at the end. */ + for(int i = bytes_left - 9; i <= bytes_left - 2; ++i) { + const uint8_t *ptr = s->raw_scan_buffer + bytes_to_start + i; + if (i > 0 && ptr[0] == 0xff && ptr[1] == EOI) { + skip_bits(&s->gb, 8 * i); + av_log(s->avctx, AV_LOG_DEBUG, + "Skipping up to end EOI after hwaccel decode\n"); + break; + } + } } else if (s->lossless) { av_assert0(s->picture_ptr == s->picture); if (CONFIG_JPEGLS_DECODER && s->ls) {