From patchwork Fri Oct 25 02:26:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52487 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:be6b:0:b0:48e:c0f8:d0de with SMTP id bd11csp48670vqb; Thu, 24 Oct 2024 19:27:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXW7lN3VMkvPGD67ivVjfiS9poLNfG+dTqfAhS//lot0h43ZnCHsaOAc12nnzjir5P/NwC2tQDS4jYtbeJAn/VJ@gmail.com X-Google-Smtp-Source: AGHT+IFQ+8iH8d4NYGP2RmA4CVC3AyRkK3CnpC9zNfeQw0iZtbgEa5j8ag5Eh2yukhb9vEwPtysX X-Received: by 2002:a05:6512:3510:b0:53b:205c:e97e with SMTP id 2adb3069b0e04-53b205ceb02mr750631e87.1.1729823249334; Thu, 24 Oct 2024 19:27:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729823249; cv=none; d=google.com; s=arc-20240605; b=RPU3NtgVLb0+nIduqMqdk5OtpBn1vGE7xcal6zkg2heogJH+wyXiECm9c3n3KUiNMB 0FBlBKH5roQ0SMpg5MtiogXc0/yvw2fIaeXGMJYPuHSzA9JI09Y0TJVTYjBOvSyJicB/ qh1dyJa6e2kM8DwJw9pRDFMC8qcR06Kg7l68lMvqRyx6kk7u7INDU6vjqsjR8T7t0MpI s+K2KLlv1gqJHqAwuMt+Y+gZKT0wuUnSVXZfV++eQ9pmqaGoaOiIZmsTQeE2xzzvUdUl Y2DyrGj1ZqQe16u0sfEDzZHHztqc3234UHD5Pg8lFr+1z9eJxB3EOvq+0zioVzWHtKu4 RNgg== 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=27FIEf6sCR6auJnNT6RU+h2qJU8V5wa/ThlmKwT2Owg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=YWSUNuBKGCJFEkVww4sOU4ek8wezQbbjPRn0CljXnxkOCcUev2YVbKGASaHs2BBliL 9WqQhjFyC4KqrHHjmDNRkDrkRSLmH2FjYmylg7qH3nE+Y0dimPtiTZVdL6HapnWEsqmg ClbRCrgxvY/lCxVIZvU62SL9ghrtst6rSADI6SMmltX2jseKkAQ27XXRG73DoxN5KfX1 /OrXtKK7lctDlwyby9+vEmbngSowkceLf7XiXrvjeu/hthMpXO2M5wqFn5fWdKlJJFoL ld2i00jNs+sUsSRFKM2RtngiuOzXtOptmKioWo3YsrAmFXFscUNwmN4eBAkfMjLkFA8c oqCA==; 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=JPT+hkvP; 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 2adb3069b0e04-53b2e1245bdsi76445e87.135.2024.10.24.19.27.29; Thu, 24 Oct 2024 19:27:29 -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=JPT+hkvP; 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 1563368DD4D; Fri, 25 Oct 2024 05:27:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 127A168D79B for ; Fri, 25 Oct 2024 05:27:04 +0300 (EEST) Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2e56750bb0dso1137460a91.0 for ; Thu, 24 Oct 2024 19:27:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729823221; x=1730428021; 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=Y/rYxu2M95JJX/1LomMrj8ZoZBtH6Y0H3XVubSIA/Eg=; b=JPT+hkvPPRvH9+i/K1TzXF5wf1S7XGSiLrRbzeN+TFZagYEgGfSzhfsJR1Nd+LuCxV 7KomHdDZ5X94CnLEHIT+FcSmBI1XwBkaFyHmLFjzJ8Lppjw7H7CjpeDEVMgAlRWRe+Jh lFrvSAzKo1hMmJTZR5zZ5qIReykWLj/0IgnvKmrWvh+NiiMgu4kf4uCgH2oxAQZKFEIj NiiC9PQ/tcqBb6z9JPa5hghjFKRMbXzlI/hdnzAHrGqJRfWZjBqwxzfIviBj3axRWluT Wj6gcxdNnjeP4GeVt+pkWHpxEItF7o5nWQnQKKq1kk622XrY4ADHXipkRvELRo9tYS32 TEOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729823221; x=1730428021; 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=Y/rYxu2M95JJX/1LomMrj8ZoZBtH6Y0H3XVubSIA/Eg=; b=cz8cN7sJl3Rc/uNE8fjhMCjIKfLJxgYtpkNiWMzS7eCuQIg0Vxs8vCVcCYGrwEFtXf SJsg5uizM2h5dmPd1TaxTYnBYh3abcFO5vfHcM8YeM+bQcZlmfD4Odo35mi2U6dV1fRF 3C4DMMRQXoXgvwAqiMohaadYOX76FnztcjwaN9iS5+Thj3V+pLGt1h9cR2JxhLnrGTY/ DsCvOkRnPem3+zOM4QXpenvxXzkOcOmBhWILazsmX+ts6rDhTL/5bT2KPMcuHvxOAWPg f/wfmYYe2MH73gUA2JXGDhtfWYe5c83F/ulzZcUvbsNUZp+Y5ccP2f91kVlUBLsqz23x xIrg== X-Gm-Message-State: AOJu0YygTy7tgvqGxbBCKbhV1WiKuV+9JWJf0QlI6+kk2Qb8TLhvpZG1 INRBC7+iRGuwKAq4S241OKXWrTuCm42p2EbHkOEsVAme7UDQQP83ONoczA== X-Received: by 2002:a17:90b:4ac9:b0:2e7:6e84:a854 with SMTP id 98e67ed59e1d1-2e76e84ab6emr8802105a91.1.1729823221462; Thu, 24 Oct 2024 19:27:01 -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.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 19:27:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Oct 2024 23:26:11 -0300 Message-ID: <20241025022613.3921-3-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 3/5] avcodec/h2645_sei: use the RefStruct API for film_grain_characteristics 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: vsPRezGSKr2K And ensure the buffer is synced between threads. Signed-off-by: James Almer --- libavcodec/h2645_sei.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index 33390d389d..9ed2fc5596 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -42,6 +42,7 @@ #include "golomb.h" #include "h2645_sei.h" #include "itut35.h" +#include "refstruct.h" #define IS_H264(codec_id) (CONFIG_H264_SEI && CONFIG_HEVC_SEI ? codec_id == AV_CODEC_ID_H264 : CONFIG_H264_SEI) #define IS_HEVC(codec_id) (CONFIG_H264_SEI && CONFIG_HEVC_SEI ? codec_id == AV_CODEC_ID_HEVC : CONFIG_HEVC_SEI) @@ -495,11 +496,10 @@ int ff_h2645_sei_message_decode(H2645SEI *h, enum SEIType type, case SEI_TYPE_DISPLAY_ORIENTATION: return decode_display_orientation(&h->display_orientation, gb); case SEI_TYPE_FILM_GRAIN_CHARACTERISTICS: - if (!h->film_grain_characteristics) { - h->film_grain_characteristics = av_mallocz(sizeof(*h->film_grain_characteristics)); - if (!h->film_grain_characteristics) - return AVERROR(ENOMEM); - } + ff_refstruct_unref(&h->film_grain_characteristics); + h->film_grain_characteristics = ff_refstruct_allocz(sizeof(*h->film_grain_characteristics)); + if (!h->film_grain_characteristics) + return AVERROR(ENOMEM); return decode_film_grain_characteristics(h->film_grain_characteristics, codec_id, gb); case SEI_TYPE_FRAME_PACKING_ARRANGEMENT: return decode_frame_packing_arrangement(&h->frame_packing, gb, codec_id); @@ -556,6 +556,9 @@ int ff_h2645_sei_ctx_replace(H2645SEI *dst, const H2645SEI *src) } dst->aom_film_grain.enable = src->aom_film_grain.enable; + ff_refstruct_replace(&dst->film_grain_characteristics, + src->film_grain_characteristics); + return 0; } @@ -930,5 +933,5 @@ void ff_h2645_sei_reset(H2645SEI *s) ff_aom_film_grain_uninit_params(&s->aom_film_grain); - av_freep(&s->film_grain_characteristics); + ff_refstruct_unref(&s->film_grain_characteristics); }