From patchwork Thu Sep 22 02:02:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 38138 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1e65:b0:96:9b22:e02b with SMTP id cy37csp3228204pzb; Wed, 21 Sep 2022 19:02:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Q8e6zTQCAkzaybgPudr8VNwHHDjLC3WQkOH26aYFwfi5osrzQ0GmAr5miyy84w+c+8M02 X-Received: by 2002:a17:906:770d:b0:73c:a08f:593c with SMTP id q13-20020a170906770d00b0073ca08f593cmr937170ejm.182.1663812176754; Wed, 21 Sep 2022 19:02:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663812176; cv=none; d=google.com; s=arc-20160816; b=Jh/ziB/WPrBfvpaIDjedGAEE631y1YbyCgMPXOSjUFfIHi4jUgDon56SxvlMdMq8su 0Kb4TMSafzgu6/aPuhoT2jt5Mk0nHvkG6kV0sIec+Ool7G5UNLuk1HtTKnS0U6Go9w9Y aZqfNd5wharAPAGbXCaNPVm7VSJ7h019wkae/UIjhVHiMuX26Rex0SCpzj4iQOl4vcs0 QZqXjAzVpulmz0Ejg75OBHhQ38CPpyWhJsTougvu+Lh4+/+MRi/g4JW89MV/ViTyBDHR hEKJMUKVLsiUpVaO5a1LNOXWfMuTaOlYYlEzLFIOhJlaqzGbtBQ7d/OSr6jUvkVG8F0l whew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=kTmsOPYHJPd80e9QnT142UEdShF65W1MsR4XzKqb50E=; b=nUnkB7PTbMBcf0VTieOj/la60B7vc93hhku7SIWKngWEm4z3J5KpCeACGfcH/TqjuG WJAvEojDW98Tka7VzuBP8VK1XYz393iC+i8E3vJ02EXcdZ8xsgJs9WIdkHS1qkMZCfIg 8JPhcFt4CWjB3MhBbJEk38+VAYnhuYEsN16Q+OzWyjW+bnIwJiEkI2k4wBmCyZxuG8Mv YPjgkXSTmFV/JjwgkikOBU6lQs9mORn2bNpxyvLbPrCVA0H6P06L1QRJhJSvlaCAgvMl 0rTHDjvstrswGg1+nxkgiqUghDeQ1jJU2WtPb0vZ+FuFmV1CqkZNziuRkh10PkcyQOa7 MW6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=kUhdiZNE; 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 oq12-20020a170906cc8c00b0077547abf08fsi3381374ejb.169.2022.09.21.19.02.32; Wed, 21 Sep 2022 19:02:56 -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=20210112 header.b=kUhdiZNE; 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 B2C3F68BB19; Thu, 22 Sep 2022 05:02:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D091968B64C for ; Thu, 22 Sep 2022 05:02:22 +0300 (EEST) Received: by mail-ej1-f45.google.com with SMTP id bj12so17779440ejb.13 for ; Wed, 21 Sep 2022 19:02:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=iw3GnKUXOMqxpFtm09k+F6RSLHvwCpkNTZhJYpkISu8=; b=kUhdiZNE9fKfVTh/adGnYKfHvdhOWTn5Hg3B3UDhQXSWSwHI/Zt6Q0Gk5mQtj05aT8 mX1XO6iN++joL7CL0w+fWKcseIXdkwDxe7HZAXzd+H10kV2rZBZAHM4arSMeALPHj+4H FYcrCgMshstPPZtcLmHuiJUxh8/Wn4XXstSttGz6k0kCpUHoEjaCMUSfncuQKQqo3eog ejp+JZA7W+VG5CH+sZGhNjVQAt+fe1c4FOZa7ma5ksOTL3E1UMWB6P6SN8gx+75IErsb f9pRGNYMW6Ai0LfnH0iyYOm3KrDJL8Kjkn//NVzsNFfFrFmazks1l6CsDkECTBSyQUy+ SA6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=iw3GnKUXOMqxpFtm09k+F6RSLHvwCpkNTZhJYpkISu8=; b=5NRaQTr3ckdEym29uQJ9LknW7mjJNZoOq6V53xSTb7mKbWcCphaaSHMBVBMBRCQsTj Dt9M80edkvQfvH+2gO/tTR3s2U0Vat0bzJ1LsqmFS5GNfHquaY3uJ63mM/P2l9uwHmvK mwEDslmrykKIo+178K7pZ8wUhrz9YO8phvjlgP1qsna9jPGmYeY9/Nu3e8bwUR9SZ94z ObyMR8xWKwqMGzCOCBy3pMKraOnwFsOIzptJdVxBtl60t9r5gRayHsOqRKMGai3NGEBy tmEK9fbUezmNBSBG1rEAmgWaTsppVcdozcqbqjI4VA+xeTZNyeAnkTef0IcjrCA8xUT1 06TQ== X-Gm-Message-State: ACrzQf3qR08dy5VAfboBIDqy6tR73gngP5C1ZdU/FUsT7aYAznj4CtyF o6uko1wq3iDnjcdHm/Ype8J57im61D4= X-Received: by 2002:a17:907:1ded:b0:76f:af8f:942e with SMTP id og45-20020a1709071ded00b0076faf8f942emr896036ejc.120.1663812142119; Wed, 21 Sep 2022 19:02:22 -0700 (PDT) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id e4-20020aa7d7c4000000b0044ec76521a1sm2792794eds.55.2022.09.21.19.02.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Sep 2022 19:02:21 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Sep 2022 04:02:15 +0200 Message-Id: <20220922020216.46589-1-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IUNhTmCAZ0YR 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 | 27 +++++++++++++++++++++++++++ libavutil/version.h | 2 +- 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/libavutil/dict.c b/libavutil/dict.c index 14ad780a79..2f690a5b8e 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; } +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..b42b3f07fd 100644 --- a/libavutil/dict.h +++ b/libavutil/dict.h @@ -32,6 +32,8 @@ #include +#include "attributes.h" + /** * @addtogroup lavu_dict AVDictionary * @ingroup lavu_data @@ -101,6 +103,31 @@ 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. + * + * @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 + * + * Typical usage: + * @code + * AVDictionaryEntry *e = NULL; + * while (e = av_dict_iterate(m, e)) { + * // ... + * } + * @endcode + */ +av_warn_unused_result +AVDictionaryEntry *av_dict_iterate(const AVDictionary *m, + const AVDictionaryEntry *prev); + /** * Get number of entries in dictionary. * diff --git a/libavutil/version.h b/libavutil/version.h index 0585fa7b80..6fd07ed2a4 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -80,7 +80,7 @@ #define LIBAVUTIL_VERSION_MAJOR 57 #define LIBAVUTIL_VERSION_MINOR 36 -#define LIBAVUTIL_VERSION_MICRO 102 +#define LIBAVUTIL_VERSION_MICRO 103 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ From patchwork Thu Sep 22 02:02:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 38139 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1e65:b0:96:9b22:e02b with SMTP id cy37csp3228285pzb; Wed, 21 Sep 2022 19:03:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4cE/4j3wp1rC/5lxILmo1wqaUoFRaDnsCLoy7KORQo26UET4jxidtqA5TZjS9DTtwiVWQz X-Received: by 2002:a17:907:3da3:b0:780:3d46:cbe3 with SMTP id he35-20020a1709073da300b007803d46cbe3mr881546ejc.175.1663812185218; Wed, 21 Sep 2022 19:03:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663812185; cv=none; d=google.com; s=arc-20160816; b=pPSa82FRGEloQj2oRapL4bHC7uoJ74OBSaGwxRr2M38NV9z6Zb1JI3OMKCmYpabHZ4 RV1syNt7f8AmL+fDejM6eFqwtDqz6NqjlmvlqTA2JymTeY/cBFRGbTnFT+OZofrxp/kV HTCb+9y9G1r8Yy4BcQK3FtMGnurLuOo0f/+oje7C2xLGcpyZi/vzaXW8QIBs6yaVNQdA TiPGUgOujFM4gQ8Yw/mHQ3Ft3/LRXTS2ivEaJKzyYzrmYi4G/IYWt6TITPnItMJCZWw5 EGqU0aLpcWba3kSSBa6JmXUh+nbAeLJzgZ4nOzTJj+/YbeAvzPZ0qC/OkRvcAE+z7BdC PyJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=jsa9YZP6YSneniLRPdm/anF2PXc943Wql3LK/g1ghj4=; b=fE/coYR0YThYZXu4IybjaxvFneiprT0HRVXIDjZVXSUFKr5L9h8VMCC70RxCSQOhDZ t3YbXjwt3j2HDI8yODJ7fqvULlK9UTs27xbLtoY37W28ZHdvBPSXLQ5iBlBK8zSQC4cA 1SpvNq5xxVBL1M37ktwcQE90LsWb8HjjxJJzoDBF60HSRLvXJdS5tdrF4k//zyOsogoD /aAFSktvX9Sjvlr3mSGZa+DoGJopo2bpdn+g6OQdn4EnmLECQtWNqrnxIB9mF2idg963 McDONHrpHJiazHJCd6LacJXzTH9nQgi0bWlk0PYA7qgnujgIM3MVqI4WqFdYB3glD9bk MU+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=f54A2J8G; 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 qb42-20020a1709077eaa00b0077083e6dde7si4270944ejc.183.2022.09.21.19.02.42; Wed, 21 Sep 2022 19:03:05 -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=20210112 header.b=f54A2J8G; 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 CAAFE68BB56; Thu, 22 Sep 2022 05:02:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A01268BB37 for ; Thu, 22 Sep 2022 05:02:29 +0300 (EEST) Received: by mail-ej1-f51.google.com with SMTP id r18so17800148eja.11 for ; Wed, 21 Sep 2022 19:02:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=rfUeWQ8u2MBBR2SdnOLSMNnBIKtxl9XpwaTWhlqiek4=; b=f54A2J8Gk8Z3wWWblKLHJEL45UAb9ygq5XstgmXcRfnmy1INsX4qAHNM/J5s2Af6ci pmj4trm5BgRwhgqOV8ynJCKagZ12DjL2CwqoZOogJ8b1R/2/aOm/LSPZ3hGdyW1PdYy+ ajfB+46OF/Ap/3W/IR2lMEgzFdCooyzVzsIHIyRTjPvcPlXaAQC/UOxOehIWJQZqjMtx h3cbWiXSL7kfvc3baqNSymUUiO8zxfW8AL8nKZcB7biFTPEtvk5I5K2rtgdj2KpF0YlV W+9tyEyd0RFciA7JQUGsx2kkbzq6PhXrShNZbXdDdrBHmF8OTjJOjly3CqY3ahSUfUL1 TV7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=rfUeWQ8u2MBBR2SdnOLSMNnBIKtxl9XpwaTWhlqiek4=; b=5G1bzXC54p3jx23GKAIJxCyTmM3T1/r+BpCW1tMRefY7tLGKBKe6E0O/aKCFnTNaiZ A/GTdYH2IOyC+MbOHYb04tnQ3npff4t+v0S9qxB1g6tFVZ6cLxa6Sgiouh+Z2gblQMyf KcV16fzvJCYMARdxOmeXc4Ng5V77mcZiiSerrmdFFBVTcVXaxCLKdgsh1PX0VG7aBbc8 J/jEmcF22t3blHiK/Wdl7tOjLQEjzNgkoxZoGrmAILM56pKahsmRmr5ysKX5b7v25aHV cpic33B2RTvzZb6puCHPoJfjUgTvuQDQj2yNW6ODXrbm3uy1h6ia04XZedOBChnfaZCF anTw== X-Gm-Message-State: ACrzQf39gw4d+4NLEPQu/OOWbVS0SS0XJ1RTDJcCBFvf/A3HqWld2LDt G7rWt8ZQisZFKI0O2kgNCWID6Aa5K5A= X-Received: by 2002:a17:907:6d02:b0:781:c741:ce0f with SMTP id sa2-20020a1709076d0200b00781c741ce0fmr897020ejc.762.1663812148986; Wed, 21 Sep 2022 19:02:28 -0700 (PDT) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id e4-20020aa7d7c4000000b0044ec76521a1sm2792794eds.55.2022.09.21.19.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Sep 2022 19:02:28 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Sep 2022 04:02:16 +0200 Message-Id: <20220922020216.46589-2-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20220922020216.46589-1-epirat07@gmail.com> References: <20220922020216.46589-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avutil/dict: Use av_dict_iterate in av_dict_get 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /+YlhU6eM/Ui --- libavutil/dict.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libavutil/dict.c b/libavutil/dict.c index 2f690a5b8e..1a348d6710 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -60,18 +60,14 @@ AVDictionaryEntry *av_dict_iterate(const AVDictionary *m, AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags) { - unsigned int i, j; + AVDictionaryEntry *entry = (AVDictionaryEntry *)prev; + unsigned int j; - if (!m || !key) + if (!key) return NULL; - if (prev) - i = prev - m->elems + 1; - else - i = 0; - - for (; i < m->count; i++) { - const char *s = m->elems[i].key; + while (entry = av_dict_iterate(m, entry)) { + const char *s = entry->key; if (flags & AV_DICT_MATCH_CASE) for (j = 0; s[j] == key[j] && key[j]; j++) ; @@ -82,7 +78,7 @@ AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key, continue; if (s[j] && !(flags & AV_DICT_IGNORE_SUFFIX)) continue; - return &m->elems[i]; + return entry; } return NULL; }