From patchwork Wed Apr 10 13:31:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 47998 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c90a:b0:1a7:a0dc:8de5 with SMTP id gx10csp556719pzb; Wed, 10 Apr 2024 06:31:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWzcyJ32lHwarI5YEtkU/x4v0pqYdM52sWuaOFMw0g8esYfjp2evotkVZ0Y+f2ASm33KKrQLjOGceR/Y9svHVYGfJke6x762noK5w== X-Google-Smtp-Source: AGHT+IFM2ih5GLajNfg2tXmjuAt7SMIoGK2zELzeEzS/6HBkMzppvPHwWkSdEoBWPSZiv2QqnVhy X-Received: by 2002:a17:907:7e84:b0:a4e:24af:d8a4 with SMTP id qb4-20020a1709077e8400b00a4e24afd8a4mr291339ejc.28.1712755908859; Wed, 10 Apr 2024 06:31:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712755908; cv=none; d=google.com; s=arc-20160816; b=YrDuHgGfazTQDag2TXAMajUCgEqWQ3LVU8m/Uaui/hguxrdnBR0NG5vmU8pFpbRAZF 7DurKrDbxitf7yODVp56Ww8fnNX5NJ3921CQW2IjJkG3KxEsN7pMLDA4ne45Fkvuslqs S85nEUDUm/Ixe/2uL9U67Jr9eO2blWnPhsJxyJly2ud+E5ckHIo1juiv1xH7KPn2zaGO 5zNS0yiIcv4EMI9P3FUnH1msPW5nbrm35OOwgcSebb2AZZoiIESaROPQ2OPEFTRtpJsF GJUxBPacqD5TMWXcli0kbS3CMeYf8Z7t/ZPj4lfe7odKkUrSBMzPpHEuOWrGsmIYxDsu G0Gw== 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=GF0RdkFIFI9lSm1hdAjadvC0+HZdGOV+st9lgSXa6Lg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=PBnmldloeeu4M2wm2kkOpA4546xikd206a5r5wzYqBzGHwDdK0HiiCZMOrJl0M06jv uPktt058gVXPDjdKhGtWT4WoRGKSlXzkH5CDF7bDorjPQdDXBvGCOkRfyaI7V8QiMwQ1 F8XW52lsAbnu8F2j7X8rSwilwAAhsfSYNjiuvYMW0VYbnFwOmJ3hqVV9e4Lj9APgf5Iu YulvyZfV/ftqluaHH+ro4Pti4MPOeOfPl+KgtVE3BfYygwRdzo2zX29SgsYHITbmKGoK 7HqU9Oozjrwct/MHwPRf3LUNAZfTqlkYoAQgBi1KKpMuJDu95cscuiY+2/APB3NCm7cE Ckpg==; 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="W9s/F4+f"; 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 z18-20020a1709060ad200b00a51f5ac8bc8si1865798ejf.118.2024.04.10.06.31.47; Wed, 10 Apr 2024 06:31: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=@khirnov.net header.s=mail header.b="W9s/F4+f"; 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 59E0268D0B1; Wed, 10 Apr 2024 16:31:35 +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 4944168C788 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=W9s/F4+f; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 941DE4D72 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 FJGD-vCcKE0h for ; Wed, 10 Apr 2024 15:31:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1712755884; bh=SG5LCi6nAgTMVl6e13oL/zc9WyLc+RwCqLeAk80aGOM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=W9s/F4+fXbKFiSn7Iv0YQetDbZ2EkIFJMz1S+QhguAJevAjTdw6f4uyUnwLfdWMlH mu2Mojow8S8TtDcmOuG8mK70DNRPWVpP0mbOkI7uKH2w5LT+ESgTMpbc8uuLFgLCA/ OGqJJFtGjqVS7AXVBte6NohLAZqCvJFvY2DvXeFpiDM9MWLWmVXiDRiCinoosiMJlc p9lUMQikVIJZwHO+78FUjl1tN6RE2XTahBlLzNfxyt6kdV60Kjxn6dwp1Mm0BN5dGs KorVNc6ko7gmGoI1ChSKSZ/VZOoK5q2Fk9TrO4XCBUcUmyYndJTLtTlbjf8o07wfdh 1knYr4QmKtbEQ== 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 A98281D2E 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 908D03A0379 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:10 +0200 Message-ID: <20240410133118.28144-2-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 02/10] lavc/hevcdec: track local context count separately from WPP thread count 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: cli15e49+KQs The latter can be lowered while decoding, which would lead to memleaks. --- libavcodec/hevcdec.c | 7 +++++-- libavcodec/hevcdec.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index c70937a756..55f72af972 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2697,11 +2697,13 @@ static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal) } for (i = 1; i < s->threads_number; i++) { - if (s->local_ctx[i]) + if (i < s->nb_local_ctx) continue; s->local_ctx[i] = av_mallocz(sizeof(HEVCLocalContext)); if (!s->local_ctx[i]) return AVERROR(ENOMEM); + s->nb_local_ctx++; + s->local_ctx[i]->logctx = s->avctx; s->local_ctx[i]->parent = s; s->local_ctx[i]->common_cabac_state = &s->cabac; @@ -3475,7 +3477,7 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) av_freep(&s->sh.size); if (s->local_ctx) { - for (i = 1; i < s->threads_number; i++) { + for (i = 1; i < s->nb_local_ctx; i++) { av_freep(&s->local_ctx[i]); } } @@ -3504,6 +3506,7 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) s->HEVClc->logctx = avctx; s->HEVClc->common_cabac_state = &s->cabac; s->local_ctx[0] = s->HEVClc; + s->nb_local_ctx = 1; s->output_frame = av_frame_alloc(); if (!s->output_frame) diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 9e3e6a8cd7..a881eb9981 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -442,6 +442,8 @@ typedef struct HEVCContext { AVCodecContext *avctx; HEVCLocalContext **local_ctx; + unsigned nb_local_ctx; + HEVCLocalContext *HEVClc; uint8_t threads_type;