From patchwork Wed Aug 24 23:51:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 37458 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp12275pzh; Wed, 24 Aug 2022 16:52:18 -0700 (PDT) X-Google-Smtp-Source: AA6agR5PEKHvtk+lf73WdswZEsGAgDnQMSEQzGshZ7b76qzVov/ogltr8mB03xWwnzYOvuvAwfSn X-Received: by 2002:a17:907:2bd1:b0:73d:d154:8e42 with SMTP id gv17-20020a1709072bd100b0073dd1548e42mr243311ejc.585.1661385138040; Wed, 24 Aug 2022 16:52:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661385138; cv=none; d=google.com; s=arc-20160816; b=BfguSJK+Iy5vHTY1kKDgotgu755+YDu462ry7kWRMAtKEdTy5CO6XTsOYrrzPhhGo/ PkHBH9jKibvs/GlVJRQDjHDMfcJN/vO4SfeDESYJdDidfL9TJtobKOa59UhNAxcZO0uh +Lb+MlHYMxVEe28hOSb9sRBKxhUf27R9z4nZaBDrsdP4aTqfCMXY0GYqqkfczSdv5Fr3 AczdXMLm8aBXTRFcfUBdA3Vd9nb1NKEQDQ5ueYsZspvLi5NI7uN1Rhjahh1AiZ/xjvuO +Par/FJJEVlf8HO6z1hP5BL+EkHCkH2niPaph3rqpVXXvJZDgRE5nJ5jLYpQUj1lKDRV p8bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=gJS/Di9RqfctF5mNZaAdEo5BzuuWJNT1TP4RfJd5Bfk=; b=TwbuEW5kdYj9LyEL1X+OooX5gzSkYV0Bx3NNbrMXLffDuy41kniJvQ1RlAZ47Cfepo 79lBvE3DTqeaXGoW2fQ9jCDET8Gw5KVan/18v7damP6vXucMzWL2W002XOAB5CCM4QNB h5DRWR4E0mwbBAae3sTp7hunaRFkkEmvWl9IJLwA6K9odB4Sm7zjXonZ1bNqMBC08TDX TQeS3GDnmUKk8TbhYHPXagEw7p9l+8czc/bEOL1qHA1jtVH6d1GvVO9q04XGFuPF3NLv qZwUxOZdgJyXyW012NVjWYZk7i4xCalKyfVGAYSbtpX8A85mQvzz9vmNKRd8hEp1iTKm /SqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=boOwZCBv; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id di9-20020a170906730900b007315a1c65b8si3549789ejc.329.2022.08.24.16.52.17; Wed, 24 Aug 2022 16:52:18 -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=@rcombs.me header.s=google header.b=boOwZCBv; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 522FE68B915; Thu, 25 Aug 2022 02:52:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47F7A68B371 for ; Thu, 25 Aug 2022 02:52:06 +0300 (EEST) Received: by mail-qt1-f174.google.com with SMTP id cr9so14026030qtb.13 for ; Wed, 24 Aug 2022 16:52:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc; bh=F7803euBJZpJbHrP14TWj0cDSJNokMN1PCkQw9Eqk8Q=; b=boOwZCBvgUPw9ILeswyoAoNssnZx9xYIjPBU26KVBEmBRI33Gr+0MYvJFPEzxzoqB5 h643G0TvytQ89C/Rn773WFAIfvoyB1282iuFjfqb25p0jiilPSwZBxdjPmvyUq2WvUci UVeDO08zrhlenarFxGAen5lIgA8Vi1dX2l274tmHfFvZsLhB+DPHMUct8jD0LXrPfVU/ 98+TuFJz94redUjxTQ7AAgNjP54/jsyEP8tkGn+fUA9cvWEBhXwWrSRbHJClrnMyWIpp 4/2QX7CUC9DqLR2hBlb/16y0KTLqpyaS7tNfuwVhyM+mYHaH+zq/lDb/TxwPrQsWZGm0 Kybg== 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:to :from:x-gm-message-state:from:to:cc; bh=F7803euBJZpJbHrP14TWj0cDSJNokMN1PCkQw9Eqk8Q=; b=1XTM6kRk1Sxn5d57bKjjTsJZCymsC6ymbDrI2VvaP6pOTaay+EOTfChabpxHI0UTmV 49Nhw6bydHjCQCc5mzATho3p9RUj8X7sQ23Ft1WTN7ky4vOkNANh0IOW9ZgGIAmoIYaY +HS8dg/5WzYjUwdvuj0JDr4jl2v6PiJcMRJnshq0TJQEqPAi0rMYwtdm5t7ZXdo+SJe9 ZPPqh1AkYTUlo4GmzDmfT1q2TOSqha+dD6D/rG/ZgvZrvWMtWDH4FIkYKiD6D94n+Q6F uSk2Ph6fP/p7lpUkhvAbntr5ocoXIJfcOvBzqvMG7d5Z3K8Ao0bEZ8s/x5h8RqKm0rbl d/aw== X-Gm-Message-State: ACgBeo1tJBO2dQA+ynKCZ+jaUSRAOThedN7wI4nkEu/83BaVTLcb/uuR ekOf8ydTZgH6JCygM557b4nsnKEO6v4J X-Received: by 2002:ac8:5cc3:0:b0:343:611f:3a53 with SMTP id s3-20020ac85cc3000000b00343611f3a53mr1587641qta.64.1661385124617; Wed, 24 Aug 2022 16:52:04 -0700 (PDT) Received: from localhost.localdomain ([192.210.24.132]) by smtp.gmail.com with ESMTPSA id q15-20020ac8450f000000b003447ee0a6bfsm13292065qtn.17.2022.08.24.16.52.04 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Aug 2022 16:52:04 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Aug 2022 18:51:58 -0500 Message-Id: <20220824235200.22312-1-rcombs@rcombs.me> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavu/dict: add AV_DICT_DEDUP 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vg/4j/I9hNVY 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;