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))