From patchwork Mon Mar 25 18:01:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47453 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp1353231pzb; Mon, 25 Mar 2024 11:02:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX5OJTrT4QjV2mUmRK5kuOltwbCm6bVz8FwWIAqkNGw6zBNoG3S+9XdrsyQWdSGYL8mJM7edNmfL4jMtVWhYKYQAFNdsiFwaBx2jw== X-Google-Smtp-Source: AGHT+IHtovsYaWawYiTOL2e8xA3oTNo32iMABTyxiCqJHMHyuP67SgQzZ0tc16Bw46h77hNp0t11 X-Received: by 2002:a19:5e59:0:b0:513:816e:5cae with SMTP id z25-20020a195e59000000b00513816e5caemr5264558lfi.3.1711389720583; Mon, 25 Mar 2024 11:02:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711389720; cv=none; d=google.com; s=arc-20160816; b=JaRPuvafydD5Weln/HrQ5R8o2j3CS0uKivvGKIf+CjwzDLkx3BYU3mo9qL85wVx1+K Fu38vrg1Vu/b1h1NC9kVV9F5rwjfzLS11o5Hmy3G4IGgf3ygg6e81pNLz7YN3GVd3B4Y rKYhBeojz6Dv30eTvZ9zi9hPGIVbX2ReVXk5c1pTVqBl2SNwSEQgHXbYruQqYglu9nKu C/EiHBkB1chcEwuPAvZvCwPeG8NA8OdVOVLB7zwpSS23xP2QJbSSKpLqaK0ROXCgnnYR a1FWJCFqcQA/IAQKt54O1eEfiaP43skBnZgB1J9RacQ01trr1i2N/ng5DC9b9d4mvW7K DxfA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=e1VZx9ryTeiEAlKDmwj0RzejNCP1M3Xgq7elvO11sTE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=qEdYJ6vPyiyrBWFH4S4nQ4H5b0Z+du0jmdxaC9OLFZ/xK1AoqXJjF76M9LZYO8owBX //vkuQr0mqAyzgD7/zE6YHs0nH5lbtc8PAeC/+T1b/vCPMk+E8BFftizY9uExTFYXXk/ FjL8eBZJ8aKU+DMo+Wl1okHSziwpBzXD4ffJzx/HpITYnFjhnCU2YTKKaThT3XFNKkxK SD1/czGAuwcZiEuaxG9J/WKzUXIV+iWwbTXfYD0RtfJj9VeVrWLl6V3Nj6D/TsehZ4hS w6qZ6+rHf102UsuhFLBT8yn7NPaeWAMlYLKhlczpOrhf0fjQ0gGzgskbYm2fM0M0Gmqn puqw==; 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=OLzB5nfl; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k4-20020a1709061c0400b00a466e738516si2632026ejg.802.2024.03.25.11.02.00; Mon, 25 Mar 2024 11:02:00 -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=OLzB5nfl; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD4F468D47C; Mon, 25 Mar 2024 20:01:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B523868D44F for ; Mon, 25 Mar 2024 20:01:50 +0200 (EET) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-6ea9a60f7f5so1658300b3a.3 for ; Mon, 25 Mar 2024 11:01:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711389708; x=1711994508; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=M0f4/Beh/W32e5ivz7IeFcECF54UMJBtPCVkk5P7VRQ=; b=OLzB5nflrrR34X8FqYsMhM9VOJJi4gnywiJbKEpTsQBJuOWb28eQUNqMumEKA3OBPG jV6oS062NHjqsCEMhQcjV+QzQtqgI617AZ6lG6OYK1oaxw/qUUTh8rj6IDwjdELdI0Z0 VNk/bdfOqSpYmrRrjiQh0SY9z+bB6pYW08TeUk/AT02g6PO/QAIwKLbLOAQQJAmnFUF6 biI99m+cXA5bzFHUTz27py9PZFkKzbW7fjmpLV38xcUZtcnwkFnBmbN7T2rE8mIig4rz JyYQ2xiyURFswAGdzBnfBeg45lFwbkE4QePzAbc9wuL6Tbm2wUjOk1hD9LZ+xkrixySw jReg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711389708; x=1711994508; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=M0f4/Beh/W32e5ivz7IeFcECF54UMJBtPCVkk5P7VRQ=; b=BjgKyrsthrCVgSSOJRpc0Dl0cdeKqdPs9B/MCgE1oXO0bbfBIhPAFoNg/GG3Ac80Hw J+ssCF18ckXpBQ0hkQhT7B53sPXmvG3/5Igxuzbv+H9tgbeCKv5e2jJ/KWh7SxtcGnpt 1Tgkd/Pr9jlEVbEEMV23mfaUechpbIDkLakqQxj0W/uY8AD9Jg1Ssu8nPdoRM+qXJi7A ReKlg7OjVZoNe8EhE7KmgyulAPLksL1UVOvsLr6xf8Tj+q3/K1dVJklUudu/Ioq10kYp ZhbFBfTGNn0j6SHK3jeGdUMlWKuCaVHXCwshmgcz57FhdasyJNLCMFjBIb7ShHyee241 1kqg== X-Gm-Message-State: AOJu0YxGvGZxgCIbNFhv/9MLI/s6tiMkc4crud52/kI/ixlt4/rRMqJt ck5jY0h6jQCKgjHPhIr1+eGJSk7g9e7yIM66zy9ZVpZG7nu8Y9G9tqEmryam X-Received: by 2002:a17:902:9888:b0:1de:e84b:74e1 with SMTP id s8-20020a170902988800b001dee84b74e1mr6097858plp.29.1711389708189; Mon, 25 Mar 2024 11:01:48 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id e10-20020a170902784a00b001e09b636cafsm5067192pln.287.2024.03.25.11.01.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 11:01:47 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Mar 2024 15:01:20 -0300 Message-ID: <20240325180120.1880-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/frame: add a flag to not create duplicate entries in a side data array 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: E+f+2Eres8RW Signed-off-by: James Almer --- libavutil/frame.c | 14 ++++++++++++++ libavutil/frame.h | 28 ++++++++++++++++++++-------- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index d7a32cdc92..a780e62fd0 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -774,6 +774,13 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) remove_side_data(sd, nb_sd, type); + if (flags & AV_FRAME_SIDE_DATA_FLAG_DONT_APPEND) { + for (int i = 0; i < *nb_sd; i++) { + AVFrameSideData *entry = ((*sd)[i]); + if (entry->type == type) + return entry; + } + } ret = add_side_data_from_buf(sd, nb_sd, type, buf); if (!ret) @@ -798,6 +805,13 @@ int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) remove_side_data(sd, nb_sd, src->type); + if (flags & AV_FRAME_SIDE_DATA_FLAG_DONT_APPEND) { + for (int i = 0; i < *nb_sd; i++) { + AVFrameSideData *entry = ((*sd)[i]); + if (entry->type == src->type) + return 0; + } + } sd_dst = add_side_data_from_buf(sd, nb_sd, src->type, buf); if (!sd_dst) { diff --git a/libavutil/frame.h b/libavutil/frame.h index 8aa05ec127..7cc55a455e 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1003,7 +1003,14 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type); */ void av_frame_side_data_free(AVFrameSideData ***sd, int *nb_sd); +/** + * Remove existing entries before adding new ones. + */ #define AV_FRAME_SIDE_DATA_FLAG_UNIQUE (1 << 0) +/** + * Don't add a new entry if another of the same type exists. + */ +#define AV_FRAME_SIDE_DATA_FLAG_DONT_APPEND (1 << 1) /** * Add new side data entry to an array. @@ -1016,10 +1023,12 @@ void av_frame_side_data_free(AVFrameSideData ***sd, int *nb_sd); * @param size size of the side data * @param flags Some combination of AV_FRAME_SIDE_DATA_FLAG_* flags, or 0. * - * @return newly added side data on success, NULL on error. In case of - * AV_FRAME_SIDE_DATA_FLAG_UNIQUE being set, entries of matching - * AVFrameSideDataType will be removed before the addition is - * attempted. + * @return newly added side data on success, NULL on error. + * @note In case of AV_FRAME_SIDE_DATA_FLAG_UNIQUE being set, entries of + * matching AVFrameSideDataType will be removed before the addition + * is attempted. + * @note In case of AV_FRAME_SIDE_DATA_FLAG_DONT_APPEND being set, if an + * entry of the same type already exists, it will be returned instead. */ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, enum AVFrameSideDataType type, @@ -1037,10 +1046,13 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, * for the buffer. * @param flags Some combination of AV_FRAME_SIDE_DATA_FLAG_* flags, or 0. * - * @return negative error code on failure, >=0 on success. In case of - * AV_FRAME_SIDE_DATA_FLAG_UNIQUE being set, entries of matching - * AVFrameSideDataType will be removed before the addition is - * attempted. + * @return negative error code on failure, >=0 on success. + * @note In case of AV_FRAME_SIDE_DATA_FLAG_UNIQUE being set, entries of + * matching AVFrameSideDataType will be removed before the addition + * is attempted. + * @note In case of AV_FRAME_SIDE_DATA_FLAG_DONT_APPEND being set, if an + * entry of the same type as the one from src already exists, this + * function will be a no-op. */ int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, const AVFrameSideData *src, unsigned int flags);