From patchwork Fri Oct 25 02:26:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52489 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:be6b:0:b0:48e:c0f8:d0de with SMTP id bd11csp59835vqb; Thu, 24 Oct 2024 20:04:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU/YZQHVGsBklGsy3PTtj5YbXWCQSoMbcACRoeLoV3UqA6cHjGxO+smTDwhwXKFQDZAVvt9Nqbv1sn1O3jjWYiB@gmail.com X-Google-Smtp-Source: AGHT+IG8oAsUrLmLR3lQ0DoRk7bQrt0E5+zK8jOEjvzDOdPTtbHf68O3aH86ffdIUe6dx/KcaV2y X-Received: by 2002:a17:907:1c16:b0:a99:55ab:b666 with SMTP id a640c23a62f3a-a9abf8aa246mr720091566b.34.1729825446407; Thu, 24 Oct 2024 20:04:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729825446; cv=none; d=google.com; s=arc-20240605; b=P4skonoafDHry+4az2aoizSqcA79N5JMlRNEtac/L0wFLud/0OwIoXRNIRULopDU+P xvxTSGmx+vJd01S5XI2ercK5Cnxjt4Bzr6cMViEb2lW0XP7XK5hWUzCCMfJjA21lyNgg YCIUEYAWMVR9aAVYVzsua95pxV/LxWQ4z5KY9EMg/wz4Gl/k3Ykw3x3BkLoMGH/uJY1j RMOK44bcZky1eWA8mZylppVcJzlAE6mDau9C3BD38xzj/qXcmjaAOE08LkT165r2Mh0J S8cS19ftZpcvZ7gOuDGP2yFBrZYbTfORfFwK3o0ZiPTBwteVpVXTLVNXH0KHg0dVVU9F 6jrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=zaExw2U7uACYtzubpZfkIqUTHVGI0k3ICOVRBN+xkVY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=hYWF+YvBBYX2dfOWtDMvzBuV+IuaH1PjYzFI+D+IL2S/BouxqWDenJWPIF74gXWgG+ Aeak97VdvgnYc1o1ZdrsthxO5UY8+FfHseMqMhH10XlJV9gxN4+NO5psb6qkf1l3gtzF Vou0GKGH2ROSp5fD6cVGj8WnhJSo3DMjqV2wj/NFoXONh4YQSBFaQ7Czl/auvfMXxGi1 UVPQtyixcHrsh9aL3tQoracbgsOCjOuVdPRCWfzKU2Z0CcbGOFpXxWGJ0+fPodrkwmHA RgxF1lTkvfXmI0H4q3WgMyf7xRiTq8Nae7zEoOmPBd9/Fwmd5OF4G3NcJtC4Fa83S81U TIdg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=CzEWhTEL; 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; dara=fail header.i=@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 a640c23a62f3a-a9b30e644d3si22879666b.551.2024.10.24.20.04.06; Thu, 24 Oct 2024 20:04:06 -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=20230601 header.b=CzEWhTEL; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7EA3068DDB3; Fri, 25 Oct 2024 05:27:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADB1068DD4D for ; Fri, 25 Oct 2024 05:27:06 +0300 (EEST) Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-7cd8803fe0aso1053483a12.0 for ; Thu, 24 Oct 2024 19:27:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729823224; x=1730428024; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+85mu48qWMLBV5Wcui8Q8SAIknmOHPOzXmnLncThNkM=; b=CzEWhTELyhFWcQ2FSvi+iZDGVadyLMUm80CHLVmfTD0eDGXyJZNcmRugqUldePNaRX IgbaNe/LZDohdRdokGDx+d3AndyUs7iHJSuBiYiO1LRfbcPs1/Kvwp7q7JDmNzU2YoIz sqocniHWQ4U+UvPqtPzhDBREexpv2zC/wqhTepa9pQ79ozZguSN7Lg3LzFEzlDm3ApI9 75uD2uLWaiQwan9wRc5juai/Q0ke1ui6yQeBxSwYDGuz6Xjh2qI5Nk5oOssPerBOgp3A wbZUWKB4SWxv45efBFyNbYwisdHoYtXtV7h8Fe1mFrt8V7KvsBgiwjSdnuUAHIfw2e4o 9e7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729823224; x=1730428024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+85mu48qWMLBV5Wcui8Q8SAIknmOHPOzXmnLncThNkM=; b=ICOSOjc5B+lai0vj8gO6Zs0wzXlNyBX+PKRW8Nm30kTjy5CIzafc4q/t0hPcO/w5wu sQNZcvLotC5aHYuEhrA0Ea8QY7VbJ1sdXaoTeGc9MLrAdTj0TaUfDjgnr0xfNUT9LCWZ Tj0jQisUZrktGRxyN4/phKkofjLGR8QgdZu450S9wdMgHJQ6Uz7zOsIgM3kEIbEnz4jN 3Svz87KnuUTAeH1lv7/uPO4dw246A3OFyvSJqdp5zutdhxHPQUztVqE4j1cNkM6b6P5l bLkZjAbgvohlto0eQzgh2jHBJrHxWlkPcUcESUiG4vpX1N8LjcMxr1AVxbze230A+PH9 gB5Q== X-Gm-Message-State: AOJu0YxwAn3DvOpQLEfodywfmpSsT+blDGWZKEEI97RmrLadu+HnuME1 r7KjZDqDQRMPHEAby2gwZIHr+l1zm6ZvXzngP2u6thDqAIi7PJ9iO6rs3g== X-Received: by 2002:a05:6a21:107:b0:1d9:1f51:faeb with SMTP id adf61e73a8af0-1d978bae10cmr9738326637.39.1729823224453; Thu, 24 Oct 2024 19:27:04 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e77e48ed34sm2485491a91.9.2024.10.24.19.27.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 19:27:03 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Oct 2024 23:26:13 -0300 Message-ID: <20241025022613.3921-5-jamrial@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241025022613.3921-1-jamrial@gmail.com> References: <20241025022613.3921-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/hevc/hevcdec: use the RefStruct API for h264db 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: /KZZ1eSsz6R9 And ensure the buffer is synced between threads. Signed-off-by: James Almer --- libavcodec/hevc/hevcdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index f2bdf6134e..357d7d0f1d 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -3416,7 +3416,7 @@ static int hevc_frame_end(HEVCContext *s, HEVCLayerContext *l) return AVERROR_BUG; case AV_FILM_GRAIN_PARAMS_H274: if (!s->h274db) { - s->h274db = av_mallocz(sizeof(*s->h274db)); + s->h274db = ff_refstruct_allocz(sizeof(*s->h274db)); if (!s->h274db) return AVERROR(ENOMEM); } @@ -3849,7 +3849,7 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) av_buffer_unref(&s->rpu_buf); av_freep(&s->md5_ctx); - av_freep(&s->h274db); + ff_refstruct_unref(&s->h274db); ff_container_fifo_free(&s->output_fifo); @@ -3985,6 +3985,8 @@ static int hevc_update_thread_context(AVCodecContext *dst, } } + ff_refstruct_replace(&s->h274db, s0->h274db); + ret = ff_h2645_sei_ctx_replace(&s->sei.common, &s0->sei.common); if (ret < 0) return ret;