From patchwork Thu Aug 25 00:27:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 37461 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp26169pzh; Wed, 24 Aug 2022 17:27:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR6/M+++gJhnPETSglKMq49C5m8axKZu/MwqNibrU5N6++hCwTPvzOkFnsuWk9VD5rSY1SS+ X-Received: by 2002:a17:907:7292:b0:733:1965:3176 with SMTP id dt18-20020a170907729200b0073319653176mr863680ejc.318.1661387265681; Wed, 24 Aug 2022 17:27:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661387265; cv=none; d=google.com; s=arc-20160816; b=xqZbmy2WRAoCxJNQ85DsvXwYK/+4BPkLjHTmRqKGMAuZ/w+sBr75LqoUCagfbVPKbV 5t6Yx4Cbf7nnS3m5L1NovJDoZO2RaL4/LYOKtn7wlvpd741XGbqLGEUJShCLWIZFLq5b pha8lHJXMpmZwUVGGdfC58rtw80OA5xNh4dVIQohOLG3nTyj4QdQRab5px/Gje2k8cl5 fSwybs4k6MmWO4P5kO1JVgbww8+rTw8p61PTnKYT8nFDqfAc1szYZeiVmOf6RbChnB+I HIQsagXkLRbqMiWPQHshbaJnDQJMAoojyz8ryNK6FQFZRgSfgiEkQlPSD2rjHLjetgUZ xevw== 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=aVeHD5xHoVMZAAofQs9Nj/8apfxc6whDPoCrBzQXt3U=; b=QlkMFF9PC4vunURQtwxV6GeAdCO9RMdFl3T0M14WFnccdoIVR6jquyH0KnPhp0u2+3 9iDNxJ3S4GrwaPvisWdE8qa/TZO83Gz9xQQMVS9gukErp17+e68YmDRPS+Z+0Y+CpeRQ +IyMmyS23PVBWkZE6MR+bZUOmOyJq6VhJY4MNCyMAzw3/hVvBi61y4Cl3Nfw3Z3zindR s8/83p3Uji2iWp9LsOo272j+Lmf9MoLZiTsMRfpRp4JyUega2a+VVJY/r30b15aeOwaa w6Fptvyn/Oqkd2lLyFWSLgGVqX8hXUuefm9SMPWtSd7tzWLAWV3gFIXCNZObEBI6efjS W06g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=qHorpdx1; 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 hw8-20020a170907a0c800b00734ca64fb9bsi3068981ejc.832.2022.08.24.17.27.38; Wed, 24 Aug 2022 17:27:45 -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=qHorpdx1; 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 884CF68B915; Thu, 25 Aug 2022 03:27:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D29DB68B8EC for ; Thu, 25 Aug 2022 03:27:29 +0300 (EEST) Received: by mail-qt1-f180.google.com with SMTP id cb8so14126334qtb.0 for ; Wed, 24 Aug 2022 17:27:29 -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=rQAWEcKvvl1YRMqIlIAndnKAe3/sfCJqnqfevKH46HA=; b=qHorpdx1c6+NgbIiOXK3ZxjMXboUl38aRb4FyXSr/Vh54SmMuPQKOucgnWWmruxZmI A268QrTx6qsxt5r6/OD/2TttKPhmrmi1FQvimerRAlDNSeoRRC/gEpMyA6+qqGP50JrZ gQd7DH21ELRNSO5bql7ZxNH+Y+Omli+9O+l/5+04pgOjyvVklD9EGMhiXg6pn6V88GQh urFIpxspLawLzShOBxJjICrYTirVw5JQB6/wHh1q47fhIu1MvDgyrkpLeYgW415r6eMv MV+rfW7t2+RcMzmXIIdhUVIF8wd2/4rB1fri0jCh7Xg9m/SeUj9gWdAxqMqOFl7IdWRW t6LQ== 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=rQAWEcKvvl1YRMqIlIAndnKAe3/sfCJqnqfevKH46HA=; b=Fz7PYbyAsdqfgYVytA4zSUdryudtQTvF0x73P297eGGt0a+bqFLtNKT11mBYa/t5ul 7SzWI/AG1VvngQeP/HhzgjRyFYyxy1Lvy7m/HA8ROg3XNjXbPzRzUvbYmbR6L9oDLpb9 PtcGGv7cJJpZo5NCfiIzTGqnPzDJTuQiqidjQ46GK48F30w8gdB7tkd4HXlGYgwfZUcu 5AmINrCufRDgTPoqYI8JgJ88NWS1vPtsghGWfGNlnUxGw7pHkpao2U4mcAQhLLUg66uh hJA+CqXSAwtjJL+BtgG0wPLHMZVAMk10HiLaZ3hGusoz+/kL4XzP3BCgtMoN4XgY4xXZ y67g== X-Gm-Message-State: ACgBeo3HoZE5xNPbaeUcs87hlyDzWVADb/VvCc894Wt93NH4UWM4LMWi 7Ypqr+jMu+x6Xjv+T2q87TiACGUtPSXo X-Received: by 2002:a05:622a:614:b0:343:487:45d1 with SMTP id z20-20020a05622a061400b00343048745d1mr1584724qta.443.1661387248414; Wed, 24 Aug 2022 17:27:28 -0700 (PDT) Received: from localhost.localdomain ([192.210.24.132]) by smtp.gmail.com with ESMTPSA id i22-20020a05620a405600b006bba9575621sm16521091qko.68.2022.08.24.17.27.27 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Aug 2022 17:27:28 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Aug 2022 19:27:20 -0500 Message-Id: <20220825002722.79902-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: HJwurbFF9Y6h 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..aa98f753a3 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, tag, flags))) { + if ((!value && !tag->value) || + (value && tag->value && !strcmp(value, tag->value))) { + if (flags & AV_DICT_DONT_STRDUP_KEY) + av_free((void*)key); + if (flags & AV_DICT_DONT_STRDUP_VAL) + av_free((void*)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;