From patchwork Mon Jun 24 04:47:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 50108 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1785407vqz; Sun, 23 Jun 2024 21:48:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUvtjDSzskMJvydqSK7Rkna/IRyW57M1ljUseC+zemqpN64pg6UYnsoqQXyNvJ+ZbB3rwELzktPE+IYOalHYTMCG9KXDHYvzT3+yg== X-Google-Smtp-Source: AGHT+IEbGKyilNSDSHXqjOQvcVTIQnwt4AL/GUfDK7W/ccBmLRjyznl44B6eoWfAWSY/HCuY7R7u X-Received: by 2002:a2e:7d11:0:b0:2ec:f68:51e0 with SMTP id 38308e7fff4ca-2ec59526da8mr21531471fa.44.1719204492505; Sun, 23 Jun 2024 21:48:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719204492; cv=none; d=google.com; s=arc-20160816; b=teJxMG3aivGmYwNPO93fdn6WOoGqITO+f2QJIxxKpuCR65K9ZZD2rc1Fq1OHLxSkHU fLbdR80mfjzvoRZ3ayRufPJP3Jtsl0XLBXycfQhAxUYRfGtgsG2WVuFcBapPUJ1qOXvn 1C+87f4sakHJjaPQisO5QH9lVEsvLf4RTmiep4xnZDclanM22oLn3vtbLNOdQmNg7XXh Ag3BDuwR3FbkwM0TlGa3NF7ynDZbHF5UFoyFWVdPTe6hVXHOC2uIcZ3OSlt4ZjLmOAW7 qB4Hiei9m9jHBztxhZkjuCOx3mlPfeSCGRmd9DNV/e9bQ1sWGFVXwj+yuB06J9DJFMaK KgEg== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=Uwh5lj8ysOz4+PPBkspUH58JU/o93rixEf0BSJA8P+Y=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=vokprnLL4bKD8oeVHstDAsbvHbyjc/z66icd8OyYsfRuxgjnT7F8rsNHTR8tSp/XJN ge6jrLHdmOBkvAlMVjz1XTZ4+r0x/mvYcS3BO6dPQ37nhx3brR0LbYPoq5XzDt3i5//R VBdSm/26HkzPHhLa2UTxRhwhi8coEEHjJNtg1r5C0uzAvSffr80fwinQCEuy4GBDzrRn SxqEqY/bz6wVuM+zVU33UKICIZfcHhJdb8SjYW0szQJnFOdLVopn98KfzmJbkhkjojZS mEAxaODZ2RzgyqHtboedY0dO4sJ5THOVqr+d0BIb6K6pe2g3jU6ALeqKEkogjEofVEOV N0ow==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=Le4gRXTH; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57d30af47acsi3366256a12.595.2024.06.23.21.48.12; Sun, 23 Jun 2024 21:48:12 -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=@foxmail.com header.s=s201512 header.b=Le4gRXTH; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A908068D605; Mon, 24 Jun 2024 07:48:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-242.mail.qq.com (out203-205-221-242.mail.qq.com [203.205.221.242]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3624B68CB36 for ; Mon, 24 Jun 2024 07:47:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1719204468; bh=GJrjAhIw2FadhcbWuutDGT7F+62ONniwetoRAb0uQ2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Le4gRXTHuidhTyGQo6xn6192FSTYLlh6Uukp3Wz2DizU4T/IezQ4G3UU32StD8PuE UWTOzPjYHLBLhg/qe2gflqft54cHXF82p7hXXyVy6jZH2WJ/+n7cDQJEJvD2ydYhVH zfV0TOIwJPt3kTtPr1jYPLXOcPtDbIvSGVhLzetk= Received: from ZHILIZHAO-MB1.tencent.com ([113.108.77.64]) by newxmesmtplogicsvrszc13-0.qq.com (NewEsmtp) with SMTP id BEE9DC3E; Mon, 24 Jun 2024 12:47:46 +0800 X-QQ-mid: xmsmtpt1719204467toafuflm1 Message-ID: X-QQ-XMAILINFO: MR/iVh5QLeietqzEzbd63OdMphg2+ISJwDUmka163MWjXIjg/hJQXPStijMBWg gZU7AXx01cIrJUfx9QGEMKi/A1NWaKQRhU/8J0knCBR0sK50JmHIE/+maCI1utjQrvk+ThePDsuE LSLtrWHQ2JC4hYIr7xr6togou4ZuQN1oFLolbMUrRuOtIQw6PCoW0t3Si44Z/yy1WY667fSrdV/p gXlapgRdcROVfy1KMc+dcjKe2Mvzv2XKtoWK1lgif177a35mmpvxCzDnwIN+sd2tlQ3N1nvmZOlJ h/1L44hd939WVsV4ULaxoDTvg200lJzautKcoEuerGjHi2BHEk7gRdA7BPIG5d6sPGMi97w6CEdy DpN8dU5h6CTpmyJqi/GXXrg3cIOTl9S4UXJ5SrFo6ePTOfrNmd1vnYEw7m533hwnIBJIg6OfM7Gq 2r8MZNE9EanNVL3qWvbkLxTHtZTsx9SJR1GBCbmPKkuov6hYQgOY8jU3KqL7dNc7UfOjAR7Q5I1x J3stQShiPFvV2ZgIY8WEM2wlbiorkfAvVG9IYFwEH15v2HvoQ6GdOt4QgPB+lqTh9GM1fNij5O0u oo84yHAXeSJKJd4S/U14BiAr9WenAl8hf6F8EqFcxZE/YO5ccd4Glf4W72kWg9Q/dMSKSNP2kzKw gcULbHNq3FMnY3sWiMRJ4JT9uFmguqMZR+ygOh7wk+eq4kTDWjgsu1oZtyiEH3NuhC32f6pInCzX vKrOOsAV1TXIG0QbKCk/NZP3oLm5cmDXAvuzTii+blAfDtlvL/ju3gnfN0v2Rx2z2trdnTy2NQzh AzyFsVM0KspM908D/pRGOoNXL0IX58Ygu6rstxqLfXuaomTHqjeLH/ArVQGeZHMUAt/fV6fEAzIE maBpoSlBWeboFauD4EiW0agHWe47mhpQk2+QEOjGXJxzOPaMLEAb1SYUOjAq/AgzBg0GNn43PBf8 XZYtnvPYZyOlmEg22ZI2LsSeZAbzjiv2E5arf2RkcCKT3xCz62cw== X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 12:47:44 +0800 X-OQ-MSGID: <20240624044744.52915-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240624044744.52915-1-quinkblack@foxmail.com> References: <20240624044744.52915-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/vvc: Don't create new thread when thread_count is 1 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QMMFBH/2BjLN From: Zhao Zhili Make its behavior consistent with other decoders, e.g., H.264/H.265. Signed-off-by: Zhao Zhili --- libavcodec/vvc/dec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index f5603306f3..4ce2b1c6bd 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -1024,7 +1024,7 @@ static av_cold int vvc_decode_init(AVCodecContext *avctx) static AVOnce init_static_once = AV_ONCE_INIT; const int cpu_count = av_cpu_count(); const int delayed = FFMIN(cpu_count, VVC_MAX_DELAYED_FRAMES); - const int thread_count = avctx->thread_count ? avctx->thread_count : delayed; + int thread_count = avctx->thread_count ? avctx->thread_count : delayed; int ret; s->avctx = avctx; @@ -1051,6 +1051,8 @@ static av_cold int vvc_decode_init(AVCodecContext *avctx) return ret; } + if (thread_count == 1) + thread_count = 0; s->executor = ff_vvc_executor_alloc(s, thread_count); if (!s->executor) return AVERROR(ENOMEM);