[FFmpeg-devel] [PATCH 1/3] lavu/dict: add AV_DICT_DEDUP

* [FFmpeg-devel] [PATCH 1/3] lavu/dict: add AV_DICT_DEDUP
@ 2022-08-24 23:51 rcombs
  2022-08-24 23:51 ` [FFmpeg-devel] [PATCH 2/3] lavf/metadata: support duplicate keys in ff_metadata_conv rcombs
  2022-08-24 23:52 ` [FFmpeg-devel] [PATCH 3/3] lavf/id3v2dec: support multiple values and TIPL frames rcombs
  0 siblings, 2 replies; 6+ messages in thread
From: rcombs @ 2022-08-24 23:51 UTC (permalink / raw)
  To: ffmpeg-devel

This is useful when multiple metadata inputs may set the same value
(e.g. both a container-specific header and an ID3 tag).
---
 libavutil/dict.c | 11 +++++++++++
 libavutil/dict.h |  1 +
 2 files changed, 12 insertions(+)

diff --git a/libavutil/dict.c b/libavutil/dict.c
index 9d3d96c58b..d8b38cc71f 100644
--- a/libavutil/dict.c
+++ b/libavutil/dict.c
@@ -76,6 +76,17 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value,
 
     if (!(flags & AV_DICT_MULTIKEY)) {
         tag = av_dict_get(m, key, NULL, flags);
+    } else if (flags & AV_DICT_DEDUP) {
+        while ((tag = av_dict_get(m, key, NULL, flags))) {
+            if ((!value && !tag->value) ||
+                (value && tag->value && !strcmp(value, tag->value))) {
+                if (flags & AV_DICT_DONT_STRDUP_KEY)
+                    av_free(key);
+                if (flags & AV_DICT_DONT_STRDUP_VAL)
+                    av_free(value);
+                return 0;
+            }
+        }
     }
     if (flags & AV_DICT_DONT_STRDUP_KEY)
         copy_key = (void *)key;
diff --git a/libavutil/dict.h b/libavutil/dict.h
index 0d1afc6c64..a957b48bf3 100644
--- a/libavutil/dict.h
+++ b/libavutil/dict.h
@@ -75,6 +75,7 @@
 #define AV_DICT_APPEND         32   /**< If the entry already exists, append to it.  Note that no
                                       delimiter is added, the strings are simply concatenated. */
 #define AV_DICT_MULTIKEY       64   /**< Allow to store several equal keys in the dictionary */
+#define AV_DICT_DEDUP         128   /**< If inserting a value that already exists for a key, do nothing. Only relevant with AV_DICT_MULTIKEY. */
 
 typedef struct AVDictionaryEntry {
     char *key;
-- 
2.37.1

_______________________________________________
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".

^ permalink raw reply	[flat|nested] 6+ messages in thread