From patchwork Mon Jun 20 01:37:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 36346 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp1409665pzb; Sun, 19 Jun 2022 18:37:30 -0700 (PDT) X-Google-Smtp-Source: AGRyM1swK1wu6VbjeryPSZVBLVOlch+F8rNdwEfcqi3kJ8rVPrKTIZKzuoA/xddfq6PJtnL945pg X-Received: by 2002:a17:906:7a19:b0:711:f5c8:2287 with SMTP id d25-20020a1709067a1900b00711f5c82287mr19369595ejo.286.1655689050018; Sun, 19 Jun 2022 18:37:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655689050; cv=none; d=google.com; s=arc-20160816; b=EpopbeTPPnK0wa3yY2tQtjuMLwSmMdXa9RxcQtkDWWIVrZhF5RIbu+30RiPuZJ4Uk0 6Qrg3/wFU4mo5oF0vXtYW4FhKYYoCNOEQz8kCJmX0JCfXqDsy8ejR204JDwmkR+XotKR 4AYXYvtGTugNIDt/MWTGmYK2b3OwPL/1bv2duRMRPV6RtT6kxSPo9ehqKClhKbnjFMlH Ee2rO313j0o+e4R0B8wdrdHwSiBjhYoQjgHJFWfG8DfzW5UAhNwESCpJiX1DkPibLiZF z2T3MyugHNvp/WtzG6Qy8Ys/PUfp7DH1q5Qh1X7xiGJ4KHrg8kweBIeS8GbqTjrjPIZX Nwgg== 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=IIvdZlekfp3Tu1aSwVfa3fAl9vn8NyHp3qB/oKOrZT4=; b=KMTSAveCaPZ7YRjVv94DTpdQ03caB9EoAN4uv8CJ5WLBSePzpfccrkXyTVbVHNj62A 45GRn+l1FrpgL65Mqad0EOCPfqEDeDmlyhSABekbx70ofcxidhkzR5WFNJNeK/djr+3R VXkcXjUfLtog5Ie91JHFRoIrBrUZ00NDWrCkOSCOVu8nA/ysbwsehkP4UR/XZGw83A4k 3fZb21ZcXp3AxxDasXjj+zD4PvRnz5h48vMVcCZ7SMr7Q57qbgyeYdslYbLnrkb75dAu +jQTSHsB32RzXa1pvHJDpMwtnop5i7NnTZqGLmNy6FM1GJqOLrJQcrK6XNSgeI56jaOz r2vA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=BFMQcaLd; 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 dm21-20020a170907949500b006fed9c581c8si11351004ejc.911.2022.06.19.18.37.29; Sun, 19 Jun 2022 18:37:30 -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=BFMQcaLd; 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 EE34668B58F; Mon, 20 Jun 2022 04:37:25 +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 36E2A68B2AC for ; Mon, 20 Jun 2022 04:37:19 +0300 (EEST) Received: by mail-qv1-f42.google.com with SMTP id 43so14125764qvb.3 for ; Sun, 19 Jun 2022 18:37:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=VCVXgYfO1s/gnN4G+xr/8bW/BXxtYx8fa7GlO6aIjPU=; b=BFMQcaLdqb8AJY5lIZ7kjkU33phAJgjOjhmROttiBkhegBXeKkY/uGNpgwtgaclfDP QSIKgILArCGu4qT/9qTjV0RucRXCEHpWg+AoNWfqx3DTI9cNBqrHbIOahFV93Al7xFTJ jyxWQS2HrZDck/4i6YFi+jYWroP107NJguY53hPRF2BrudOiiOmuJ1yrSY8/Lmr5BjB5 7cl7KARu8FFDmg8XLaVYEaUx50Jhn+xdoEHkQMtNnefzku1r6iRfPtnMstt3bETq+kA1 iOvTKA/tKCtF7NEWbhlwMOQEItKhtmUmwxCjYC0c/Z/qpxYaiOMJ+LgjevbZQd+9nF0l djOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=VCVXgYfO1s/gnN4G+xr/8bW/BXxtYx8fa7GlO6aIjPU=; b=2BPW6ZXmr75U6Ihcu16LQ7UdY+PtoPn5eyaf0R9+JP+NUZHOkHQ7nMSsHOeSDV1SOD W8TZzd3g/c81KYTASFnYe5XFunOAg59QshCsyqsWpeBP5LPtCFdUU25eyiy7rSsQW0CA pwCrLUIx2d7sSC+jUBRB6KYK/pTC4V0ZIy3oCy8sbgu2YdYuXwBa3tTFqXem5qCwkqW1 Op9XPhniuMkmg0166G7EPDdlkQvP3UO6cT0J/XNwFnOUJdRJJY5S3luGcLGP+Dporxai M2sd3v+9LUdMZCLpwPZ3rHuJ5qY9pJaJzCZGbxR3+hEMz4u8sdB5itUywsaJBuch1QDn r3qQ== X-Gm-Message-State: AJIora9dOV8IqlOguzxPYoi9IzI7FZodw4OmPJ8os8Wq3fNLB9FB6M1f 1BOAdJQpbGNUAH78KiV208k8NOHzPfEd X-Received: by 2002:a05:6214:5296:b0:470:47b8:6d6d with SMTP id kj22-20020a056214529600b0047047b86d6dmr209927qvb.15.1655689037534; Sun, 19 Jun 2022 18:37:17 -0700 (PDT) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:1d26:fc75:6ed:46cb]) by smtp.gmail.com with ESMTPSA id m19-20020a05622a055300b00304fc3d144esm10176863qtx.1.2022.06.19.18.37.16 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 19 Jun 2022 18:37:17 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Jun 2022 20:37:10 -0500 Message-Id: <20220620013711.91482-1-rcombs@rcombs.me> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] 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: 4xb40tMTFo9W --- libavformat/metadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/metadata.c b/libavformat/metadata.c index b9b6de7972..d5c1800079 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_free(pm); *pm = dst; From patchwork Mon Jun 20 01:37:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 36347 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp1409708pzb; Sun, 19 Jun 2022 18:37:39 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sjiX5RHKyma7PnRNyz41qxyqyec8SEL8BKux9SzS2CYu/sa81ZAF9zp0W1yBFemY2tv1SR X-Received: by 2002:a05:6402:2806:b0:431:87c8:b45e with SMTP id h6-20020a056402280600b0043187c8b45emr27040687ede.130.1655689059078; Sun, 19 Jun 2022 18:37:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655689059; cv=none; d=google.com; s=arc-20160816; b=N1j4puiTgEznDzBXUwO+kUDAd/a1PETwjfzzZnxrgn2/P56Q8M8kins7m1EcNBG0ZD V41oAT7cL+RUwRacZH036mN5m9V/Tgt6feWkX0gdsOVXxi+3wdB+8HZVmGzeOdreTWx2 YI2/HFQMkrxtSpNX2vbVrNHCC7RH8lrFEgQie83hKpvBNt7Ftn3Qrxb8MpqwYxgA5yp7 KiMiPSxJx2Zgada70YoYPOBl/65n3IQAva5u+j0XTl8Y+K6oduksOVpv3aMRyXN+xjv+ X4tkR5jWB8le/OCLv+bezTVQU8v96KJZKhtkr0HUyOB7NVX+ibHp1uIuaBh8MXPib790 E0Tg== 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=kBtkRWG2t1ieoyRJJa3HurXxlz3sxGkqMksTaXNMmVk=; b=X/vJOD9I1I4MnmuiGabRYIzuNZkP2T4lK/vSASuJlOZxVILAfd6NpT3/GVqcA/MwjZ 6posQHc69MwRkrz+7IWPEjHhCS3W6fnezcqEcHhd2juYgABZOkOYJlNn4WpuaVMoDEbY NYVsh3MfnDgKxr8r+pCUIF6fPl1fsoY6K0f5ctu1cicxdTeXujP0nlNl6g9IPFceVuwV xM3wNqIiAiy39h+yYkHraee0TgpQITfRU/dYFPItIXgr6nGurw/6PbRSpeJ5HmvDISq3 hXCj+KlYw4oXF54Uv18SLwyJDTc/TayZXIV49uTOynKicNJSmLjq8foNmYjLbmj2MEBZ Gd1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=Q5HpJVVW; 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 oz10-20020a1709077d8a00b006ff47214f59si10674080ejc.515.2022.06.19.18.37.38; Sun, 19 Jun 2022 18:37:39 -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=Q5HpJVVW; 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 5852D68B5C6; Mon, 20 Jun 2022 04:37:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE36B68B2AC for ; Mon, 20 Jun 2022 04:37:19 +0300 (EEST) Received: by mail-qv1-f54.google.com with SMTP id c1so13755340qvi.11 for ; Sun, 19 Jun 2022 18:37:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1LnFPWtbfM1c6nu93PkTtWik8xxu3xAmGBqbdi7rYRA=; b=Q5HpJVVWTKBy7P8mRg8lUUYYg08ORAND2mSX/4tL6+ozKzMwJAdjo6eoivGMCRBOun TuaUFp9gcU7/XvPLXbjimL7BcEbAo52crIucAPh0tC5rUHUYY8KMAYVvyKiGNkPcFXnA 1cz6Oi9Wtes3jpBdrIWymgvvJfYGhJsDzDal0MpQtpcBHjDK5ooO/nMas8ExPGTDK0Ue hrX6gt1u/kRKgpF8NeS6IkqVCMRcxvBMmmkF6thJS6ZxDgJ9lFT0mfMntQuaIYp37CmD Qmzj/tKhD3lwsTWL5CpQEDpqiVAB9ntHDwdCOFAi5NkLQgnirnvdB+nid9gNvGg1yJF7 qfew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1LnFPWtbfM1c6nu93PkTtWik8xxu3xAmGBqbdi7rYRA=; b=F7Cl8QZ5pc6Am7tSVrFmP/TyN1saM7QVGH+SKalkSXmlOOyNzm2anbbXwilblBVZLy m88RvBiQg4p6l9CoV7gENksc6JSILzLYMesG8EAX5+YrQwBpHrsj0uW5smo0SfeQICVh eIQqserIwVFfATM4Nc4LNJTQJmK7XKvQmZJlrRg/BBsDcfM9pisw69/zytCbVDrLwVv5 zAB5ErOhIJLoZwdZiJLCVPGxQ/4FPsGkjb20zIMyyP3TInyeA/gFsh6L4f0X6erXfT4o xhb/3Cgm9hfpT0F8x06biuNhSwB3UIzmkpttp9pBpQJ7eNhfk6YqrOIG9Jr0mW+NcU31 NDeQ== X-Gm-Message-State: AJIora9l5tDDl9S08nuHPLRKzoA/V2XZOwWB7hLBCAnjIUPkFVcHpm71 ahxmr2bm5pX8aURIqUmc9vxwNqI1sbNA X-Received: by 2002:a05:622a:1b09:b0:305:2a8c:5121 with SMTP id bb9-20020a05622a1b0900b003052a8c5121mr17382728qtb.657.1655689038276; Sun, 19 Jun 2022 18:37:18 -0700 (PDT) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:1d26:fc75:6ed:46cb]) by smtp.gmail.com with ESMTPSA id m19-20020a05622a055300b00304fc3d144esm10176863qtx.1.2022.06.19.18.37.17 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 19 Jun 2022 18:37:17 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Jun 2022 20:37:11 -0500 Message-Id: <20220620013711.91482-2-rcombs@rcombs.me> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220620013711.91482-1-rcombs@rcombs.me> References: <20220620013711.91482-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] 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: ORtWt1jmCeat 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..667105e9f9 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; 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))