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 4DFE844448 for ; Tue, 11 Oct 2022 13:23:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3358668BCF2; Tue, 11 Oct 2022 16:23:30 +0300 (EEST) Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB2C168BB74 for ; Tue, 11 Oct 2022 16:23:23 +0300 (EEST) Received: by mail-ed1-f49.google.com with SMTP id z97so20098113ede.8 for ; Tue, 11 Oct 2022 06:23:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=aWldHBU7GALjB5ZWpmpkjSDYpPPvMWNFw19tmSXpOyY=; b=IPXGeUkIeMtTUUPcDRxHmN3XcqyErNHWffATK+phLQolFXnxxFyRPm0J7ynLLBsTY3 cIZcPgmD7+J0EOHugppS6jhK47/ElYHdc4qz5ftXEw/4lY2rhswvfm0NmC4XTuveA2hW f7y5VSZg8fvjwRXZ9Suc9YzjOLTetHEme2OwLjyOW8bJ5M+YP76rQM/RQt+AxIL0yfcY DO+lH6dmBsbHAo36Ljp6SXWX27yYf2CBszxpCgPUeuMdMv2O3nAZJ9wE7yX8Rd5wjp5H 4QolltZvAZLTqS+6zhMz+9RNIKhzG7IBhuYal1vTz97MxQRlBZdgMCTyS3kpNF8vpQZP k0/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aWldHBU7GALjB5ZWpmpkjSDYpPPvMWNFw19tmSXpOyY=; b=UVg7hZrsAUQ1LsRuAHEgCywbIGKHeRmwqI6IQsjxh1qMOsfN7778j16yLWlmjjrOym VvIgPd1jr70aD6IAGHhipa4NX59ZZrNejVH80CvQzPTIalvmwE6s3Hhna5O+XpAitHsd +T7eHXolP8APOG8xJ9h0nauScCb9oRR8y1w3iD7ZlCGTW/2iCYWOTZ+mWoS0A2gfdM6O Rp7ahofCIoCw9BbPhbpzeroZueHkcJRGGM4ld6UigLT2fbhc8Ljh9dqU1obenQu/Vqms 9RIYxtuUP5s/vjYBrDwp9fqj4H9vXoncwPk86G2ilumlqsKSn3Pylj5fr/ByvVbI3zGF 0hzg== X-Gm-Message-State: ACrzQf2ZX/5ll8m4hagON3f38MIO/AuFuFT+EfbeVDq9cQ1p/wqtvnVw iZurw4JVGho4X5CvkewDNNbvj3DD9QIlsA== X-Google-Smtp-Source: AMsMyM5l8PLKKGDQssBZYt5kWyJMbDbN7ip77InHoe3nzmwUkW3RV/KwvdXXIe9SqgYetnEDklo/Ww== X-Received: by 2002:aa7:dd45:0:b0:458:7474:1fbe with SMTP id o5-20020aa7dd45000000b0045874741fbemr22909594edw.334.1665494603241; Tue, 11 Oct 2022 06:23:23 -0700 (PDT) Received: from [192.168.64.1] (dynamic-2a01-0c22-ac39-a500-85d4-fd74-8da1-6a46.c22.pool.telefonica.de. [2a01:c22:ac39:a500:85d4:fd74:8da1:6a46]) by smtp.gmail.com with ESMTPSA id g5-20020a170906520500b0078258a26667sm7004465ejm.52.2022.10.11.06.23.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Oct 2022 06:23:22 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Oct 2022 15:23:21 +0200 X-Mailer: MailMate (1.14r5898) Message-ID: <869BE4D5-1290-4797-A61A-52DA4BBFF19C@gmail.com> In-Reply-To: <20220924143659.74756-1-epirat07@gmail.com> References: <20220922020216.46589-1-epirat07@gmail.com> <20220924143659.74756-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH v2 1/5] avutil/dict: Add av_dict_iterate 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 Cc: Marvin Scholz 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 24 Sep 2022, at 16:36, Marvin Scholz wrote: > This is a more explicit iteration API rather than using the "magic" > av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX) which is not really > trivial to grasp what it does when casually reading through code. > --- > libavutil/dict.c | 19 +++++++++++++++++++ > libavutil/dict.h | 46 +++++++++++++++++++++++++++++++++++---------- > libavutil/version.h | 4 ++-- > 3 files changed, 57 insertions(+), 12 deletions(-) > > diff --git a/libavutil/dict.c b/libavutil/dict.c > index 14ad780a79..ee059d712c 100644 > --- a/libavutil/dict.c > +++ b/libavutil/dict.c > @@ -20,6 +20,7 @@ > > #include > > +#include "avassert.h" > #include "avstring.h" > #include "dict.h" > #include "dict_internal.h" > @@ -38,6 +39,24 @@ int av_dict_count(const AVDictionary *m) > return m ? m->count : 0; > } > > +const AVDictionaryEntry *av_dict_iterate(const AVDictionary *m, > + const AVDictionaryEntry *prev) > +{ > + int i = 0; > + > + if (!m) > + return NULL; > + > + if (prev) > + i = prev - m->elems + 1; > + > + av_assert2(i >= 0); > + if (i >= m->count) > + return NULL; > + > + return &m->elems[i]; > +} > + > AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key, > const AVDictionaryEntry *prev, int flags) > { > diff --git a/libavutil/dict.h b/libavutil/dict.h > index 0d1afc6c64..344afb452b 100644 > --- a/libavutil/dict.h > +++ b/libavutil/dict.h > @@ -32,6 +32,8 @@ > > #include > > +#include "attributes.h" > + > /** > * @addtogroup lavu_dict AVDictionary > * @ingroup lavu_data > @@ -43,9 +45,9 @@ > * an AVDictionary, simply pass an address of a NULL pointer to > * av_dict_set(). NULL can be used as an empty dictionary wherever > * a pointer to an AVDictionary is required. > - * Use av_dict_get() to retrieve an entry or iterate over all > - * entries and finally av_dict_free() to free the dictionary > - * and all its contents. > + * Use av_dict_get() to retrieve an entry and av_dict_iterate() to > + * iterate over all entries and finally av_dict_free() to free the > + * dictionary and all its contents. > * > @code > AVDictionary *d = NULL; // "create" an empty dictionary > @@ -57,8 +59,8 @@ > char *v = av_strdup("value"); // you can avoid copying them like this > av_dict_set(&d, k, v, AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL); > > - while (t = av_dict_get(d, "", t, AV_DICT_IGNORE_SUFFIX)) { > - <....> // iterate over all entries in d > + while (t = av_dict_iterate(d, t)) { > + <....> // iterate over all entries in d > } > av_dict_free(&d); > @endcode > @@ -89,9 +91,6 @@ typedef struct AVDictionary AVDictionary; > * The returned entry key or value must not be changed, or it will > * cause undefined behavior. > * > - * To iterate through all the dictionary entries, you can set the matching key > - * to the null string "" and set the AV_DICT_IGNORE_SUFFIX flag. > - * > * @param prev Set to the previous matching element to find the next. > * If set to NULL the first matching element is returned. > * @param key matching key > @@ -101,6 +100,33 @@ typedef struct AVDictionary AVDictionary; > AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key, > const AVDictionaryEntry *prev, int flags); > > +/** > + * Iterate over a dictionary > + * > + * Iterates through all entries in the dictionary. > + * > + * @warning The returned AVDictionaryEntry key/value must not be changed. > + * > + * @warning As av_dict_set() invalidates all previous entries returned > + * by this function, it must not be called while iterating over the dict. > + * > + * Typical usage: > + * @code > + * const AVDictionaryEntry *e = NULL; > + * while ((e = av_dict_iterate(m, e))) { > + * // ... > + * } > + * @endcode > + * > + * @param m The dictionary to iterate over > + * @param prev Pointer to the previous AVDictionaryEntry, NULL initially > + * > + * @retval AVDictionaryEntry* The next element in the dictionary > + * @retval NULL No more elements in the dictionary > + */ > +const AVDictionaryEntry *av_dict_iterate(const AVDictionary *m, > + const AVDictionaryEntry *prev); > + > /** > * Get number of entries in dictionary. > * > @@ -115,8 +141,8 @@ int av_dict_count(const AVDictionary *m); > * Note: If AV_DICT_DONT_STRDUP_KEY or AV_DICT_DONT_STRDUP_VAL is set, > * these arguments will be freed on error. > * > - * Warning: Adding a new entry to a dictionary invalidates all existing entries > - * previously returned with av_dict_get. > + * @warning Adding a new entry to a dictionary invalidates all existing entries > + * previously returned with av_dict_get() or av_dict_iterate(). > * > * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL > * a dictionary struct is allocated and put in *pm. > diff --git a/libavutil/version.h b/libavutil/version.h > index 0585fa7b80..9c44cef6aa 100644 > --- a/libavutil/version.h > +++ b/libavutil/version.h > @@ -79,8 +79,8 @@ > */ > > #define LIBAVUTIL_VERSION_MAJOR 57 > -#define LIBAVUTIL_VERSION_MINOR 36 > -#define LIBAVUTIL_VERSION_MICRO 102 > +#define LIBAVUTIL_VERSION_MINOR 37 > +#define LIBAVUTIL_VERSION_MICRO 100 > > #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ > LIBAVUTIL_VERSION_MINOR, \ > -- > 2.37.0 (Apple Git-136) Ping for review/merge, please. _______________________________________________ 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".