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 A7AA2465B9 for ; Mon, 22 May 2023 09:23:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A343C68BF43; Mon, 22 May 2023 12:23:33 +0300 (EEST) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAAAD68BA65 for ; Mon, 22 May 2023 12:23:26 +0300 (EEST) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-96f99222e80so413674866b.1 for ; Mon, 22 May 2023 02:23:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684747406; x=1687339406; 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=S861uGT4bQPYns9o5eoSupyYs2v1LDRRa/ljQOOEywA=; b=M0dah0HXq1lT3ga8FmlFQZVyF8CUUsFnftqRu6j/6S93xmdEw2SJ1HIV+kCWYUkfdh DC5/7VwvbZ0QnKRL1ikOXUzEGjVlezn7gRyOA4QY2VIYemIKEG7srje0L2Aj/iUNTYlZ TQrWFk+/21vVCuziJdJEhbPUgNfAlPA/qZDqArCYJjRHgonxSZZ50SeA2RY7/fjaq278 z9rOJboVXPy33lVwSqummocBoXrXtCjSSV0igJ7AJrS1q+gdh14GHs7IXJLusy7Uw8gf u42iJK+Z0G7ho+nmNLoAk/lWOvTp7AsebVNPMBz0JsQfc/CLljW25Tx8XuhHztmjz5/j J+fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684747406; x=1687339406; 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=S861uGT4bQPYns9o5eoSupyYs2v1LDRRa/ljQOOEywA=; b=dzqtMvyr9yz/x2LzXPruAAVE1r7zrOo870RZxaAioZ+mwjDY/hTJcc1d7fQaUTE1lN WtagU13pHK0iByiVHec4H7pSQj4nWHk9lWS04GnKpTPjXVIdKm/8fMYPVNomYEpVEsZe W5mdIxWiBNknyLp9LGI8SJmiJ22+mwGhigLS7Tm7q+oy4n91tK/EpWXNZNiUdMYR0Qsi Kjwjm76uD1zar8hElG+wjZcMlLJbfiHZSzHpcAh/mIkZutPtBnsYgz5WwiwLP9YGuEDz stGnHf10j/Kj3U67IfFc1lfwjRqhekR/JHuvhMa5ROcigMvbHCyh5KH9hOTG36Lbige5 bUmQ== X-Gm-Message-State: AC+VfDxYBEIgwyiAIPs4agX/ylQze/9yWyH8q7N0eUIHFEgvy3BK7MTQ gYFR4+NC9vqy/VmlWZhP5aWMEt4PoAc= X-Google-Smtp-Source: ACHHUZ5Bpn3y+Sk30BQmHY4Rjp/vF7+K7Xf5BEE6IlEZsoXoh3Fzqk2W9slPbR+hyFPipc18rhQX8Q== X-Received: by 2002:a17:907:8691:b0:96f:7636:65ca with SMTP id qa17-20020a170907869100b0096f763665camr8991437ejc.3.1684747406074; Mon, 22 May 2023 02:23:26 -0700 (PDT) Received: from [192.168.1.104] (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id cw13-20020a170906c78d00b00965e9b435dfsm2875597ejb.65.2023.05.22.02.23.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2023 02:23:25 -0700 (PDT) From: Marvin Scholz To: FFmpeg development discussions and patches Date: Mon, 22 May 2023 11:23:24 +0200 X-Mailer: MailMate (1.14r5964) Message-ID: <8CA999C7-1502-4FAB-ACD9-9BC02ED68058@gmail.com> In-Reply-To: <20230521235235.GC14958@mariano> References: <20230501114456.13898-1-epirat07@gmail.com> <20230521235235.GC14958@mariano> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 1/3] avutil/dict: add av_dict_pop 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 22 May 2023, at 1:52, Stefano Sabatini wrote: > On date Monday 2023-05-01 13:44:54 +0200, Marvin Scholz wrote: >> This new API allows to remove an entry and obtain ownership of the >> key/value that was associated with the removed entry. Thanks for the review! >> --- >> doc/APIchanges | 4 ++++ >> libavutil/dict.c | 27 +++++++++++++++++++++++++++ >> libavutil/dict.h | 20 ++++++++++++++++++++ >> libavutil/tests/dict.c | 34 ++++++++++++++++++++++++++++++++++ >> libavutil/version.h | 2 +- >> tests/ref/fate/dict | 12 ++++++++++++ >> 6 files changed, 98 insertions(+), 1 deletion(-) >> >> diff --git a/doc/APIchanges b/doc/APIchanges >> index 0b609e3d3b..5b807873b7 100644 >> --- a/doc/APIchanges >> +++ b/doc/APIchanges >> @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2023-02-09 >> >> API changes, most recent first: >> >> +2023-04-29 - xxxxxxxxxx - lavu 58.7.100 - dict.c >> + Add av_dict_pop() to remove an entry from a dict >> + and get ownership of the removed key/value. >> + >> 2023-04-10 - xxxxxxxxxx - lavu 58.6.100 - frame.h >> av_frame_get_plane_buffer() now accepts const AVFrame*. >> >> diff --git a/libavutil/dict.c b/libavutil/dict.c >> index f673977a98..ac41771994 100644 >> --- a/libavutil/dict.c >> +++ b/libavutil/dict.c >> @@ -173,6 +173,33 @@ int av_dict_set_int(AVDictionary **pm, const char *key, int64_t value, >> return av_dict_set(pm, key, valuestr, flags); >> } >> >> +int av_dict_pop(AVDictionary **pm, const char *key, >> + char **out_key, char **out_value, int flags) >> +{ >> + AVDictionary *m = *pm; >> + AVDictionaryEntry *entry = NULL; >> + entry = (AVDictionaryEntry *)av_dict_get(m, key, NULL, flags); >> + if (!entry) >> + return AVERROR(ENOENT); >> + >> + if (out_key) >> + *out_key = entry->key; >> + else >> + av_free(entry->key); >> + >> + if (out_value) >> + *out_value = entry->value; >> + else >> + av_free(entry->value); >> + >> + *entry = m->elems[--m->count]; > >> + if (m && !m->count) { >> + av_freep(&m->elems); >> + av_freep(pm); >> + } > > I'm not sure this is the right behavior. Should we clear the > dictionary when it is empty? What if you need to refill it later? > Thats the same behaviour as if you use av_dict_set to remove all items and IMO this should be consistent. Additionally NULL means an empty AVDictionary, suddenly having a non-NULL but empty dictionary seems like a very bad idea. >> + return 0; >> +} >> + >> static int parse_key_value_pair(AVDictionary **pm, const char **buf, >> const char *key_val_sep, const char *pairs_sep, >> int flags) >> diff --git a/libavutil/dict.h b/libavutil/dict.h >> index 713c9e361a..b2ab55a026 100644 >> --- a/libavutil/dict.h >> +++ b/libavutil/dict.h >> @@ -172,6 +172,26 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, int flags >> */ >> int av_dict_set_int(AVDictionary **pm, const char *key, int64_t value, int flags); >> >> +/** >> + * Remove the entry with the given key from the dictionary. >> + * > >> + * Search for an entry matching `key` and remove it, if found. Optionally > > Not sure the `foo` syntax is supported by doxygen (and probably we > should eschew it for consistency with the other doxys). > I tested it locally and it works fine and its much more readable than the alternatives. However if you feel it should be removed I am happy to do that, I have no strong opinions there. >> + * the found key and/or value can be returned using the `out_key`/`out_value` >> + * arguments. > > _______________________________________________ > 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". _______________________________________________ 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".