From patchwork Wed Apr 10 13:31:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 47999 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c90a:b0:1a7:a0dc:8de5 with SMTP id gx10csp556818pzb; Wed, 10 Apr 2024 06:31:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVuEl1BoeSKhazV0MpJGhSs9E1QHOFnERgeMM0eUU9j+oXnCL7OEyUU5p0u6PiLcQIVwZT02xrhhHtUl4DyKfCi5dwHKhKbdJaIAw== X-Google-Smtp-Source: AGHT+IHlGUSiHqXXEMJ3XxqEtWq/mE9eCfvQs5K/cfb82Lz4g60V06vNdBd5fKAowTkp5EvWsFfw X-Received: by 2002:a50:d795:0:b0:568:a9f3:b3fb with SMTP id w21-20020a50d795000000b00568a9f3b3fbmr1661641edi.8.1712755917337; Wed, 10 Apr 2024 06:31:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712755917; cv=none; d=google.com; s=arc-20160816; b=lFE4GWB/kh/FJ/4pBZ/uIz9Qg4UYmMnMAVglPnaFvM4CL4UoBkYiHlxte6ZwoDhU/Z HhQOTDJ50DV5TxeGPSXy8xdE3HNj2tQfEN2FPUVGDdzz8ZP06O12H/6W66Dje5Bl2SO9 Yh103pYv8k4dUvvoV9/WmOrTmnsLSh9hcAalclvWbdGhYsDVGYjyjA/FI4CMRNh9VfUv PfS0IXFNXHY0uwfx5mTE1LmDP7Vb1rsQXCrj+HSkzHCwLNltjJUdDLJ/7ywFi/MQVxLc Dke8KZdkdEm7KLydAMCMNOVan5h9GozZLDoEaK6Vs+5f2Nioh2fJzjCThZYgiD84fWS5 PReg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=m6LEcwW60/6J+TfZHlwe7eVPuVOqmd1n5l6JKvSgFTU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=bJFrzKynAsmwfim2yIo9YIOq6lHZBn1cthc/XKfAZHSioXylbrtCNo5YOLdpq7w4NL T9T3h8otJYqfl2SZznVXPnLS8ffqlwLntFlPrwliD8k9Oa3DoRSbY7Ijn4G4Wu1JW3Uy lDM6cUJEPaQqXGe+z93/E6fSsEeo16/xwVvz9/l2bhq5wjrlNvMs4EYVdLH2f3o176gG 83mHMDsmyOyjg2g48WsR/yX87wNdqxeNuZwTirUIsUHDExmYBIEmU12YiVZwrfi2wf8i dDOkbO0vZGOWFGOVfL0o7W29QhkT/gK3bWiY9Hkfqx197984/TULvniyaoyns44AOD/E p0PA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=OXjuAyqK; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w22-20020a50d796000000b0056e31aea633si5559964edi.367.2024.04.10.06.31.56; Wed, 10 Apr 2024 06:31:57 -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=@khirnov.net header.s=mail header.b=OXjuAyqK; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4DCD668CB46; Wed, 10 Apr 2024 16:31:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58CA168CE33 for ; Wed, 10 Apr 2024 16:31:27 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=OXjuAyqK; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id B54181D2E for ; Wed, 10 Apr 2024 15:31:26 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id CvLCEz-KW_E8 for ; Wed, 10 Apr 2024 15:31:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1712755884; bh=L4ldU7PiW1ElbEdxoyuPzkB/ulQbL6qSTONGs/hz95M=; h=From:To:Subject:Date:In-Reply-To:References:From; b=OXjuAyqKpS8jtB6vJXPbD+2xznBor54gvbTV2jqeB+BYcHOrVZvFCPWrxetFYTOCY jg2C3EkFxCNZdf5KQlhGpg55vne2i+MTNrIkdzCqO+SO/R0sFnTj6t3vRg475MiWg7 lyEIS83+ZRpRDfB/MfNWMPY6leJD/WqSWPT2mIYcghdNRv40Gw+Iw7+1JBpZWU5VV0 t/7nBAx7Z/Yv9YMSDzaOrwsl81HwAMb0HAb1x7s9BhuJIiXreivqWzOuwO4Eg+ePM+ DAT3axykaCP7o+K+HFI3V6Agw9nDrlFHst7493qVmSWh5c/QSOkDQidE2/IXj8G3WS 18XmyQzrFGs6A== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id BCCC14D74 for ; Wed, 10 Apr 2024 15:31:24 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A646D3A03CA for ; Wed, 10 Apr 2024 15:31:24 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Apr 2024 15:31:12 +0200 Message-ID: <20240410133118.28144-4-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240410133118.28144-1-anton@khirnov.net> References: <20240410133118.28144-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/10] lavc/hevcdec: drop a useless execute() call with 1 job 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: zrP+4mTBr97t --- libavcodec/hevcdec.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 47226ef0ab..6b2c0b75ee 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2526,9 +2526,8 @@ static void hls_decode_neighbour(HEVCLocalContext *lc, int x_ctb, int y_ctb, lc->ctb_up_left_flag = ((x_ctb > 0) && (y_ctb > 0) && (ctb_addr_in_slice-1 >= s->ps.sps->ctb_width) && (s->ps.pps->tile_id[ctb_addr_ts] == s->ps.pps->tile_id[s->ps.pps->ctb_addr_rs_to_ts[ctb_addr_rs-1 - s->ps.sps->ctb_width]])); } -static int hls_decode_entry(AVCodecContext *avctxt, void *arg) +static int hls_decode_entry(HEVCContext *s) { - HEVCContext *s = avctxt->priv_data; HEVCLocalContext *const lc = s->HEVClc; int ctb_size = 1 << s->ps.sps->log2_ctb_size; int more_data = 1; @@ -2588,13 +2587,6 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *arg) return ctb_addr_ts; } -static int hls_slice_data(HEVCContext *s) -{ - int ret = 0; - - s->avctx->execute(s->avctx, hls_decode_entry, NULL, &ret , 1, 0); - return ret; -} static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *hevc_lclist, int job, int self_id) { @@ -3133,7 +3125,7 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) if (s->threads_number > 1 && s->sh.num_entry_point_offsets > 0) ctb_addr_ts = hls_slice_data_wpp(s, nal); else - ctb_addr_ts = hls_slice_data(s); + ctb_addr_ts = hls_decode_entry(s); if (ctb_addr_ts >= (s->ps.sps->ctb_width * s->ps.sps->ctb_height)) { ret = hevc_frame_end(s); if (ret < 0)