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; From patchwork Wed Aug 24 23:51:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 37459 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp12304pzh; Wed, 24 Aug 2022 16:52:27 -0700 (PDT) X-Google-Smtp-Source: AA6agR7BexVvb6hXBW5RP7rcsBjb2QsnZGHBMVMvrUHrOcnWHCCa9qP2w0aK3Ip6v3G8uPRFFNVb X-Received: by 2002:a17:906:668b:b0:730:a5b7:8985 with SMTP id z11-20020a170906668b00b00730a5b78985mr760673ejo.548.1661385147489; Wed, 24 Aug 2022 16:52:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661385147; cv=none; d=google.com; s=arc-20160816; b=MujwFru9YonJaWlC405E5TAZON9pg66Jis4Dlcwbc4xT3nGYUomUcxtr734qd8qt1q CsJ66E6vna4hH9Zb6G9d3Lpyq15kkbnQ1PbXpzMghwjNlADoUnRK4LbEF89KcE61ZIqz HrmS6x0mqNlSPm24CaC9Kd4TnlwFUTYXUpFYk9PF0KA9jFOvekfMWXzHYKTbNQKBvtzz oj6TfiUpgqZS6Z5LuxJLOv/UJHG1Edcb74VB9enqO+cDECqOwcsnraN3Os9CRK4gwAW3 GT2HGz7NE1Y/cBEcem8ODEMKcvTwQpqlYammF0OhedEi13Cwy1N52XuTbLPZ0YR/+WvW ikZQ== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=cqXmFiG2aEcDBWKugO/f8vIk5H9hVJvMJLo4L9ysQxo=; b=Bs9e7rjAuCOsTGL6UBovJN5Q2f445iECzUSX5a9D/Ocg5J+gIDpYYfnhSpaH2Szogg qrBBICD7GvuaGGTO91Gumd9j7VWOj/0GDszW7hLH8wS2+/j9/jRCCa8ioNJIHt4MgmP4 xMHyy0/oNJN0i/jP5YhFwfHrglUN8ug9vvsh9OeDnJyPNY3VZ06W9Vmb08SlY0REAxno 1E5OI3AlxVSzaB/gqUym5D3XgfcFtbcxJAbN/gcbz7LcmqAa0vVYeX7inBvMAE3iMMsd 4Jep+fyR/5YYKwZzgIq+BoiUWC+8R6vrgU6XqkQ8Zs8TlVp4wKdtNBNNkJTeYiENngSU s1Og== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=mkQGQaBu; 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 w8-20020a1709060a0800b0073d7353d1ffsi2858489ejf.860.2022.08.24.16.52.27; Wed, 24 Aug 2022 16:52:27 -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=mkQGQaBu; 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 60A8A68B988; Thu, 25 Aug 2022 02:52:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C7B068B737 for ; Thu, 25 Aug 2022 02:52:07 +0300 (EEST) Received: by mail-qk1-f173.google.com with SMTP id i7so13969663qka.13 for ; Wed, 24 Aug 2022 16:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=lAlWDEqtYV5gIKzqoIXAvc9LgBo9MDfmFS20A2ONjTs=; b=mkQGQaBu3V0ohUR94wxERt1IQWWCRbzhVxahYmtnwLMhV3ysa2Qk1WB16UacNFTJco u9Jvw4PlNp/cIQnXXIRyCbPjYHDLCVSxq7/uh3Xk5qqHARvjy0ttnLSN0WdtTzRxQs5W 0+x9Hj+LLcjOUKAXkIm2TnxdKorUQEMO/ZSZLrOzYs3fx+KspcgL52AfM3c+7kngpN2/ KODW6/nUqU3yhHYpGWQU2q1AvutK1M4HK0jkKTnsM+sTZpriDPENilGRWK3T3hWQxlhn c75fl5pa2SRCIvQEmgzWj2G9cF4V3156Q3fRnQUpL4wABSB49Bva8TOVN5au1Bp7GUt/ obYg== 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:to:from:x-gm-message-state:from:to:cc; bh=lAlWDEqtYV5gIKzqoIXAvc9LgBo9MDfmFS20A2ONjTs=; b=6r72b5irukErbGDMwHjxFTHAuWbUXcJhsauJv4EYoJa/xfOXjvnatkvW84zPUylTeh wVq2+fUb5ohm7EWMttBZ6iLhZxuuDL767CLVroOcEx1/ctWxZUokeR+N95cxaFv2I64o JGe8zXkbhNqcweFa94wxMg12qYuueCYzy3W7EVZN4zlDztonUlFupFbn7S27WIc9Hdbo PpEHM2XnteVcobNzpB8sOxXcGEadhSG9WblmmDNIAK4I203dExZ3eUGWrg6PK+KgQzkw DMsLS1IIJpim0pg0iJuipIyKQbOZVkyJ2LX8ICYnbxSEAOXcSi6WPCIVnEinxiB0sUYz OR+w== X-Gm-Message-State: ACgBeo2Ednf12IjEIYE+mP1zzbpZm3PyZSkvwpYSfdvAU0gpJFfu+led NxPiKB2xn740oOjB7jPcpyxZQxdFmE/l X-Received: by 2002:a05:620a:4711:b0:6bb:7e1b:5f0b with SMTP id bs17-20020a05620a471100b006bb7e1b5f0bmr1257521qkb.127.1661385125528; Wed, 24 Aug 2022 16:52:05 -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:59 -0500 Message-Id: <20220824235200.22312-2-rcombs@rcombs.me> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220824235200.22312-1-rcombs@rcombs.me> References: <20220824235200.22312-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavf/metadata: support duplicate keys in ff_metadata_conv 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: myA5OTg3PTAE --- libavformat/metadata.c | 2 +- tests/ref/fate/cover-art-aiff-id3v2-remux | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/metadata.c b/libavformat/metadata.c index b9b6de7972..2a1ffc69e7 100644 --- a/libavformat/metadata.c +++ b/libavformat/metadata.c @@ -50,7 +50,7 @@ void ff_metadata_conv(AVDictionary **pm, const AVMetadataConv *d_conv, key = dc->native; break; } - av_dict_set(&dst, key, mtag->value, 0); + av_dict_set(&dst, key, mtag->value, AV_DICT_MULTIKEY | AV_DICT_DEDUP); } av_dict_free(pm); *pm = dst; diff --git a/tests/ref/fate/cover-art-aiff-id3v2-remux b/tests/ref/fate/cover-art-aiff-id3v2-remux index 3ca2855eb8..2eac5f8d9c 100644 --- a/tests/ref/fate/cover-art-aiff-id3v2-remux +++ b/tests/ref/fate/cover-art-aiff-id3v2-remux @@ -67,10 +67,10 @@ TAG:title=third TAG:comment=Conductor [/STREAM] [FORMAT] -TAG:artist=Мельница +TAG:title=Дороги TAG:RATING=0 TAG:album=Ангелофрения -TAG:title=Дороги +TAG:artist=Мельница TAG:tracktotal=11 TAG:totaltracks=11 TAG:genre=Folk From patchwork Wed Aug 24 23:52:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 37460 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp12340pzh; Wed, 24 Aug 2022 16:52:36 -0700 (PDT) X-Google-Smtp-Source: AA6agR6AdWwE3mJrRLfkRmaBLujH9BckNGpPNX2DhYn46Xsu+jjiw81oMdw4l4dgcuWYLtxI8y/T X-Received: by 2002:a05:6402:2691:b0:43d:ba10:854b with SMTP id w17-20020a056402269100b0043dba10854bmr1070873edd.158.1661385156660; Wed, 24 Aug 2022 16:52:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661385156; cv=none; d=google.com; s=arc-20160816; b=LiWVIJYFKfrUQAD18fKOHlJSNUuVISA6NSt5NW/VZBhZk2bF51SNXVx6ijF9lhALyb 1NHFvUDDlIcGXMWposvm+KaujvmjfKVPxCm/vrsfv90g6KehpcGoYdISbkgRDzewXH2Q ylRlLeN/7YyHjufDsrVJezVdmltWqN4sdOVFMv8zO+QdxmDrh5jgs6WnU0q9A9WgVbOK inS3HKTJJOuGyjh9SMoKg6wMN1gM15ZAIYnP7M7JVmZKTD2yGvoHbfjx+8gTBqSk46h5 /i01GC31Ql5wIw0pNTMEmJw9+2dLBC/xjBToTBmLYxTn0XWFy6NHO34NFmbAz1jbycv3 DF5A== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=4VT+FGLohU0G8rRJ8WhVUHzm05EL7Qi5ZDyxr0AZyWg=; b=O9zwz0InexltVdXT506XaVD6SFOhs56eeGY9bJeOIfy5bdI0BCH4l24lEvrJgSk6mt Aw9Uez+ScOBHxgyvnkaXpymMed/18Puo4OfPQR/nUeiAYaBxAJeGGzAQtwTQK8nMYeOy +sLH0HkO0jEYeTwqD0U1AHouBvtkxuBuK2pVmdhABNhUGE35u6vW3JfKwn67WE2uqpb4 z0yx0KFXkAdGrIbEPgRTm3n/mkwfbk1C/Aq8auIffjyRjSiyUn8tqR7fvpoqvb40nEGJ hb/UD3fTXyyT1wTeWc8CUlmDoGgcVRq/iJxrHtYNnkZdSA+qVDDFoGyRI0WoweMtJcM4 EGtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=Bz7Ye+i5; 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 hg4-20020a1709072cc400b0073159f049ddsi2909887ejc.659.2022.08.24.16.52.36; Wed, 24 Aug 2022 16:52:36 -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=Bz7Ye+i5; 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 7C5E568B900; Thu, 25 Aug 2022 02:52:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0A7C68B737 for ; Thu, 25 Aug 2022 02:52:07 +0300 (EEST) Received: by mail-qv1-f42.google.com with SMTP id de16so11784532qvb.12 for ; Wed, 24 Aug 2022 16:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=kSRRoBFkBOWQ1BGEXZopxUfT2hRwJvMLYOw8EvMyDFI=; b=Bz7Ye+i5nlcjvuLmZkTzh0Z0kEzozEPnA/EBQqSXFbvdKxr6L0REmxkXlMJKivUrfg IUz8FGtTITH96HvQCNRwfab+q7HXfJZQaDP6Pm/yt2DB4SsXkkV8FVvew4FYF7h8BW7T jGmcnQZid8ptpLAmaHP6LzdGOH6vLUpm4H4BvPvvLZW1AYibrfRsM2QxjHR6lqYuymUU 7A8OHMTW1skA1+2ILV6fz5tDMvPyhRY3I5x9Up8/j70U6bObTCk+9/jxBiKcEAr8+++7 mNlFoYW3+E2mWodur0v0zjJInFmLVMx0UW59T5OobYCUjrMojHeLaB8ydNbvt2QEsTnH cQcA== 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:to:from:x-gm-message-state:from:to:cc; bh=kSRRoBFkBOWQ1BGEXZopxUfT2hRwJvMLYOw8EvMyDFI=; b=w1xoXJYQROgGp7gwry/0Uis1Ne9QYbWCWoZDq6dt/gZs9YxtiZYRzOibV3heGB4Fv4 EdifCBMvGYTMbmZCDH7XTltbRoQDCg+WkaN5LSSQ+23YCW7Vd7uFpDRR9EMkxEcn9lMp /mf3h5ftoGYGUow8skujArHHkYtarwNTRQtQD2AFA58PxhS3uIm/nMADWLOL016RT/dX VbnHVMm36RYHyd7U0UZORmx9FK8yTaz61Xk4TEKweBV0ANhzxmYrn62l1DoCgpxTCk0R GtVeJlNdMUghcSLzGzVrIlwJ55bEOPB91Qbz4mVw0roVJoQq3wJuBw7LnklUWddf6nlp /ndw== X-Gm-Message-State: ACgBeo14SX0/7C/vRecPBh66Rzz2DxyTMrWDgqfSe7YzxpTZvhBWaUT2 jOwFwmZEc3/nhw22DWe2HoqboDNzkeyt X-Received: by 2002:a05:6214:c6c:b0:496:2772:3217 with SMTP id t12-20020a0562140c6c00b0049627723217mr1453907qvj.105.1661385126172; Wed, 24 Aug 2022 16:52:06 -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.05 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Aug 2022 16:52:05 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Aug 2022 18:52:00 -0500 Message-Id: <20220824235200.22312-3-rcombs@rcombs.me> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220824235200.22312-1-rcombs@rcombs.me> References: <20220824235200.22312-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavf/id3v2dec: support multiple values and TIPL frames 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: mWyM0u2ria+a Fixes https://trac.ffmpeg.org/ticket/6949 Ordinary text frames in ID3v2 are allowed to have multiple (null-separated) values. This technically isn't allowed in TXXX, but it's used in practice by Picard, and supporting it is harmless. TIPL/IPL (Involved People List) and TMCL (Musician Credits List) work similarly to TXXX, but alternate key-value-key-value. --- libavformat/id3v2.c | 49 ++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 191a305ffb..335a1436b2 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -321,8 +321,12 @@ static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen, AVDictionary **metadata, const char *key) { uint8_t *dst; - int encoding, dict_flags = AV_DICT_DONT_OVERWRITE | AV_DICT_DONT_STRDUP_VAL; + uint8_t *dst_key = NULL; + int encoding, dict_flags = AV_DICT_MULTIKEY | AV_DICT_DONT_STRDUP_VAL | AV_DICT_DEDUP; unsigned genre; + int count = 0; + int is_tipl = !(strcmp(key, "TIPL") && strcmp(key, "TMCL") && + strcmp(key, "IPL")); if (taglen < 1) return; @@ -330,30 +334,33 @@ static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen, encoding = avio_r8(pb); taglen--; /* account for encoding type byte */ - if (decode_str(s, pb, encoding, &dst, &taglen) < 0) { - av_log(s, AV_LOG_ERROR, "Error reading frame %s, skipped\n", key); - return; - } - - if (!(strcmp(key, "TCON") && strcmp(key, "TCO")) && - (sscanf(dst, "(%d)", &genre) == 1 || sscanf(dst, "%d", &genre) == 1) && - genre <= ID3v1_GENRE_MAX) { - av_freep(&dst); - dst = av_strdup(ff_id3v1_genre_str[genre]); - } else if (!(strcmp(key, "TXXX") && strcmp(key, "TXX"))) { - /* dst now contains the key, need to get value */ - key = dst; + while (taglen > 1) { if (decode_str(s, pb, encoding, &dst, &taglen) < 0) { av_log(s, AV_LOG_ERROR, "Error reading frame %s, skipped\n", key); - av_freep(&key); return; } - dict_flags |= AV_DICT_DONT_STRDUP_KEY; - } else if (!*dst) - av_freep(&dst); - if (dst) - av_dict_set(metadata, key, dst, dict_flags); + count++; + + if (!(strcmp(key, "TCON") && strcmp(key, "TCO")) && + (sscanf(dst, "(%d)", &genre) == 1 || sscanf(dst, "%d", &genre) == 1) && + genre <= ID3v1_GENRE_MAX) { + av_freep(&dst); + dst = av_strdup(ff_id3v1_genre_str[genre]); + } else if (!(strcmp(key, "TXXX") && strcmp(key, "TXX")) || + (is_tipl && (count & 1))) { + /* dst now contains the key, need to get value */ + av_free(dst_key); + key = dst_key = dst; + continue; + } else if (!*dst) + av_freep(&dst); + + if (dst) + av_dict_set(metadata, key, dst, dict_flags); + } + + av_free(dst_key); } static void read_uslt(AVFormatContext *s, AVIOContext *pb, int taglen, @@ -1039,7 +1046,7 @@ static void id3v2_parse(AVIOContext *pb, AVDictionary **metadata, pbx = &pb_local.pub; // read from sync buffer } #endif - if (tag[0] == 'T') + if (tag[0] == 'T' || !strcmp(tag, "IPL")) /* parse text tag */ read_ttag(s, pbx, tlen, metadata, tag); else if (!memcmp(tag, "USLT", 4))