From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6BC2C4A477 for ; Thu, 28 Mar 2024 11:41:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DDD0568D6F6; Thu, 28 Mar 2024 13:41:44 +0200 (EET) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BC4168D501 for ; Thu, 28 Mar 2024 13:41:39 +0200 (EET) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1e034607879so7227485ad.0 for ; Thu, 28 Mar 2024 04:41:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711626097; x=1712230897; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=+Qvfazte7odN3go+4RxJQtur7guIFIts6dbCnpEg7ts=; b=B+HeS2MIb8egIgWh2e4cDMGNoSlC89FTzrmrovh256gO38p2OKMSql9liMYQ2sf/XP DnbwNn665j1c/K0b6x1G5OU1B8buUSRQWdjA5XMr3MpAjqpqGAlWPbOmt5N7K1RZGnu2 y13it+EDDQ4tlmINzCvwU8C5yOLouaBlKA/BG1C91WMJZxxPIPgVDHO0YnktUYDFei9L SccaQZ84husGKd/93kE8uqm0uzotV2jeIs7xEpMxLSPXxj0LTNwZzJKCBCrBqoUe1hcj vzQROZm1MIRRfHZbZtrLdl4HL4zoCviU2o9R0J8XHU+luvNC2IrgM1FMJ1pJ3Sw36jCt r6Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711626097; x=1712230897; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+Qvfazte7odN3go+4RxJQtur7guIFIts6dbCnpEg7ts=; b=spJeEJhy8/suQnFYXXUjErcLuwwUQcCfT4kMqdSJ+w4Awb+rbLuidtwjD+uo8tzlcR 0YaptmSbnyO4CU9yv7wlGFU2kDL73WwGLU7V5i3N4quE03shChyPuCBu44icXhVmQjY8 BDSn7pedOmXptSQLisv988IDOAe5qFpPiKDgpOrMRY0/JScnNlaCSXielvrAc90YPI0j 3h0KR/czml/ZLI5kTBznjN2n8CM/0dqfJwTFF1pLIgLpRXfFeDb+MJp+R0hk7my7S8/W A1qUl0946qCtWduK9SBN0rGbSDqH5d7OPUoaNI5fCjAbjkPKuHbrw6gew5lip8uFQ79p +FOw== X-Gm-Message-State: AOJu0YwIRE/MCdzcJrpg8exVkWUKQ05T++S1COMp8OdhR/lhFMY7iTAM a30QMLwhtKKt8kxrwvybtWdK7vjVeVoqdxmYrb/Z/g0MKs+dpzDJa32ruyBi X-Google-Smtp-Source: AGHT+IHANj8O40CiSb8TeK4KkQ0gj2kB/utElEvPCHdjJiD9PIL8BFsiEK/IqRbMKUhKz8my8Tk1PQ== X-Received: by 2002:a17:902:e549:b0:1e0:b759:fe07 with SMTP id n9-20020a170902e54900b001e0b759fe07mr2968781plf.23.1711626096787; Thu, 28 Mar 2024 04:41:36 -0700 (PDT) Received: from [192.168.0.15] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id k9-20020a170902c40900b001e223c7d8absm256453plk.174.2024.03.28.04.41.35 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 28 Mar 2024 04:41:36 -0700 (PDT) Message-ID: <3b04e51c-29d1-4105-bd40-c32805afa301@gmail.com> Date: Thu, 28 Mar 2024 08:41:40 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240328031210.21407-1-jamrial@gmail.com> <171162501860.7287.7383716984700357542@lain.khirnov.net> Content-Language: en-US From: James Almer In-Reply-To: <171162501860.7287.7383716984700357542@lain.khirnov.net> Subject: Re: [FFmpeg-devel] [PATCH 1/7 v4] avutil/frame: add a flag to allow overwritting existing entries 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 3/28/2024 8:23 AM, Anton Khirnov wrote: > Quoting James Almer (2024-03-28 04:12:04) >> Enable it only for side data types that don't allow more than one entry. >> >> Signed-off-by: James Almer >> --- >> libavutil/frame.c | 59 ++++++++++++++++++++++++++++--- >> libavutil/frame.h | 27 +++++++++----- >> libavutil/tests/side_data_array.c | 52 +++++++++++++++------------ >> tests/ref/fate/side_data_array | 22 ++++++------ >> 4 files changed, 115 insertions(+), 45 deletions(-) >> >> diff --git a/libavutil/frame.c b/libavutil/frame.c >> index ef1613c344..d9bd19b2aa 100644 >> --- a/libavutil/frame.c >> +++ b/libavutil/frame.c >> @@ -799,12 +799,34 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, >> enum AVFrameSideDataType type, >> size_t size, unsigned int flags) >> { >> - AVBufferRef *buf = av_buffer_alloc(size); >> + const AVSideDataDescriptor *desc = av_frame_side_data_desc(type); >> + AVBufferRef *buf; >> AVFrameSideData *ret = NULL; >> >> if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) >> remove_side_data(sd, nb_sd, type); >> + if (!desc || !(desc->props & AV_SIDE_DATA_PROP_MULTI)) { > > desc == NULL means type is invalid This being a generic alloc function, it should IMO not be limited to currently defined types. And I chose to treat them as non multi, as that's the most common scenario. > >> + for (int i = 0; i < *nb_sd; i++) { >> + AVFrameSideData *entry = ((*sd)[i]); >> + if (entry->type != type) >> + continue; > > Why are you not calling av_frame_side_data_get()? An oversight i guess :p > >> @@ -822,13 +845,41 @@ int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, >> if (!sd || !src || !nb_sd || (*nb_sd && !*sd)) >> return AVERROR(EINVAL); >> >> + desc = av_frame_side_data_desc(src->type); >> + if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) >> + remove_side_data(sd, nb_sd, src->type); >> + if (!desc || !(desc->props & AV_SIDE_DATA_PROP_MULTI)) { >> + for (int i = 0; i < *nb_sd; i++) { >> + AVFrameSideData *entry = ((*sd)[i]); >> + AVDictionary *dict = NULL; >> + >> + if (entry->type != src->type) >> + continue; >> + if (!(flags & AV_FRAME_SIDE_DATA_FLAG_REPLACE)) >> + return AVERROR(EEXIST); >> + >> + ret = av_dict_copy(&dict, src->metadata, 0); >> + if (ret < 0) >> + return ret; >> + >> + ret = av_buffer_replace(&entry->buf, src->buf); >> + if (ret < 0) { >> + av_dict_free(&dict); >> + return ret; >> + } >> + >> + av_dict_free(&entry->metadata); >> + entry->metadata = dict; >> + entry->data = src->data; >> + entry->size = src->size; >> + return 0; >> + } > > This whole block looks very similar to the one you're adding to > av_frame_side_data_new(). I can try to factorize it. > >> + } >> + >> buf = av_buffer_ref(src->buf); >> if (!buf) >> return AVERROR(ENOMEM); >> >> - if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) >> - remove_side_data(sd, nb_sd, src->type); >> - >> sd_dst = add_side_data_from_buf(sd, nb_sd, src->type, buf); >> if (!sd_dst) { >> av_buffer_unref(&buf); >> diff --git a/libavutil/frame.h b/libavutil/frame.h >> index 3b6d746a16..2ea129888e 100644 >> --- a/libavutil/frame.h >> +++ b/libavutil/frame.h >> @@ -1040,7 +1040,14 @@ const AVSideDataDescriptor *av_frame_side_data_desc(enum AVFrameSideDataType typ >> */ >> 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. > > This should mention that it only applies to MULTI side data types. Ok. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".