From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DED844405F for ; Thu, 25 Aug 2022 00:16:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 41E1468B8F2; Thu, 25 Aug 2022 03:16:25 +0300 (EEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10olkn2084.outbound.protection.outlook.com [40.92.40.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63C8468B612 for ; Thu, 25 Aug 2022 03:16:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NznAjXPQekzLNiJqlQyy7UVvmgkdenonsX0SM4+IGhIa7a4SjN5ID1YrReE9fglQlOlpYNuKox8gcR/qY0DULgLXdxL43h8Fn3i62KTgo+nS3Wzs4qXgqJhvCinkuKqzCRdLMM0qKa4C7uIDQHT7mKoebLIO/nYCtSjuDQd8ocWYZEB5WVQGgpU40Eofo531JipwM2ptmyMzZiYsTzo1LSeGHsulbInuXMMfOskr7HNbKJqkUiCXbOTiZqil2XzHbrZZbRVSacxZ13c2XIms18G8HSzkI0RfLbtWt5QaQzKc5LUGE4yrjZ73HyC5Z4rvIjDgkWZpv87KmM0v4s+qsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Db9sjAtjyB48sqdBfod7gtdsS1OQmoQmDPR72sbpMYM=; b=a+OaBga+JLWNdeJL2AeUP/gdpuHbMmEeQaeQE6YUGn59OF2TT8/L6ufZQcgMiRK6dP02KdNBFT0hZ9Q+vB7uiHY6gQ07vtp+SwfarJI1DaXZEIT67WW2EbLYZp25PoNjA0qCz1qcoYUdHRFUGFFUp7CULlp1cJ07cxFAyoPoFilF7lVRGepDcao7oGpggQzEhmPFDDA0j0SrYjBHSlkBRIDV31IvFQXO9AytFrZcSFv4WlaeOrI6OtZUrXxDepgn5CLf1kRByVcPetffEVqKXV2lEPx/6+FoYQzH6jGhemuu4KYSl+G3EnpD8XMpeqFNSTmDOMKJfmDvMH+beKexzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Db9sjAtjyB48sqdBfod7gtdsS1OQmoQmDPR72sbpMYM=; b=KhAdZptbjhZHtPqG5Zn4/Z13zxHPZSOpR3Ac7cHamT8F2h5AwRNLO26bWyqlHgUM6k+Thl2EaRHqq68T49gSPmadLsTUl2ESUPqxV5DU76p4lzgbzXk+meL9pdO8vWLeFy39iShjPzXe6+jQFN+NdbrgUEFo7TB1WelY46YReMW36P1SlLtfg1H21OPhICXq1U9SHKIZhtdVz4Frm2mVoVjcDdl6aX6UI6n2WL1vcg9Pz4iokqVOksUtnIX4gAZHcfMtmD+8iWbIU9FBN+/MiR5VYQILklnebS0bDA3ZHOfFlLrxC8HwEFSmT5e+00egGTJI6CzGqqoOSnRFVw/5Jg== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by CH0P223MB0169.NAMP223.PROD.OUTLOOK.COM (2603:10b6:610:e8::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.18; Thu, 25 Aug 2022 00:16:16 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::59af:f946:e59d:784b]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::59af:f946:e59d:784b%6]) with mapi id 15.20.5546.023; Thu, 25 Aug 2022 00:16:16 +0000 From: Soft Works To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH 3/3] lavf/id3v2dec: support multiple values and TIPL frames Thread-Index: AQHYuBSaqEINHOWuP0iAIrXPUAk3Dq2+vXEw Date: Thu, 25 Aug 2022 00:16:16 +0000 Message-ID: References: <20220824235200.22312-1-rcombs@rcombs.me> <20220824235200.22312-3-rcombs@rcombs.me> In-Reply-To: <20220824235200.22312-3-rcombs@rcombs.me> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-tmn: [B3J2b2qeJ749R/5T1hK4CDHjKvp6dOVX] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b8a8834b-287b-4aa8-3230-08da862f0736 x-ms-traffictypediagnostic: CH0P223MB0169:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wpXC2MOYc3H2fGv3iaPDzsji3YbFVdZdfPkLMWXJ0VXrkzoMK/4sBxrwDbJUEgedbPJQoceghRnOXEzV+DqIvzsCknUw02U2Hl5LcQWNNUn1rkT0RMLeZCrQgqQilQnx80sIGGGsyrHVbveTUlwyddAO8fr+Iw41qkPnF444viruwYw9dVBnn52iHukS3SN/9iddOjEORGNaOIyjcKUMODGfITXpZDnAVIONPK1YMw4Qtk7OdEK57nmH4if1xqUHFtSA0aNMk0m54bQu+D5Gu2EDOVEe+M3VGh/+7FykEJatskxL1NtKBOObxJXtnJHVgbzXcGlUwTSm5H9iUwc6tZPDmEEdAyy2q5npga48R0q7t2R9G3CTJgRa30hpsolIoh7cZ6E3R86Ap+wR/h2Ijw8Zo/XKwJkK1ZDqfOV/E9pHNH+HEtDjamHLl/K9YMxQNNXCnKpA3kLelcAvyv6iomJ42rT7Bpy/nVLwXU+Jk8Cgr8wBYdLKQETA0XLszB12uglmf9jZc4sJ+wysSXFxV37dBeybte/vRr5JgjarIp3dDNxPgH4+EVVsRwaUfUD9VML/O4JSiJyT8Ai6PkzRVeTe2CIY9XUjdSLD8q5RgDF1Hnri56kAk//mXKtXmgMB6bA6n0kI/eer5jG+9uYSkZ/4lvj9OEkoEIlwZCItbkq75sRcu6pgfVBmj3V5PB7u x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?dzRDdGNOR2loaEFzVFI0Z0V3SVhGVjVCL0liQnhEclBHa2d6UEdnUmFVR1dB?= =?utf-8?B?TjNXM3lFQVZyOW9vNDB0dXN6RkdCaFhITVF2Si9sUVRiZVV3V25mdEEyV1FL?= =?utf-8?B?NDgzeEw2d1JtZkdHV0xpYVV2QmozajFaSmsvSFdTWVZiK1BKaGxqeDBaMVYv?= =?utf-8?B?ZE9ZOXZCOVlSNjlqZWlHc01EdEs2cmlYY2FXdFZTekZmaURMcW8zVDlqWjJs?= =?utf-8?B?Si9GcVRwdXExdmF0dWlzaUpKTHNJUU9pdTF6UjZGYlpJZEVSME1PN216eWRW?= =?utf-8?B?SUxheFN1K1hKbUVwMXdqc21NNjVmeDFJMHdWTWhUVXQrcmJTNnZnc1IrNk02?= =?utf-8?B?bVkvRisyR3lOcGFSMDZvY0JDOHY0eW1LSWRwKzBnZm1vUmllOGwyOUoxVkJr?= =?utf-8?B?WHJld3hVZExXM1BiRnZmRStEeFlOY2RoWm44Smdoejd0QU1NMC8xeERLWTkx?= =?utf-8?B?Yll0U1FiWjc4V0FKd1pwRm1kWXpmTDlzeXppTjJFMTlhL3FWMHpXTGpxSnNo?= =?utf-8?B?QU9uNk85UU90UkNnbWhZQWRtclpzeWY4QUJIUHVCWGs2Rm5XaWhrV3R3dzIz?= =?utf-8?B?VGFweHZOVDZLaUpsUDBRSHF6UGVLTTBiWWsyV3JRQVZPVzZqZWlrSDVKcGZn?= =?utf-8?B?aktPSXF1bFhoeEVENCtTeGoxWWZqOXgycWl6NldDR2UxYWQ1a0dSZjMvSVVM?= =?utf-8?B?RnQ5am55RGJ6NDNkbmtxOVFWLzN5Z0s5Q1pFL0htR1J3OFB3VEVhM0xQTGEx?= =?utf-8?B?TG53b1BKb0JzeFJ4Q296ZDczRDZSWmxEYysxcjBaV293dmpHM09HZnhncys5?= =?utf-8?B?Y1EyQWw4K3NBMGNBTUg3WVY0NE9jQnRiNGtlNnBvWVlJMDNrRGhTTUpjWkpx?= =?utf-8?B?Y25IcHplMkUvTjFTYmE5REkwNERaTUlkdWN2bkNNSnN6cHcwZWlZN2g5R1ZR?= =?utf-8?B?TGVNd3NiSTkxbzNxaVdjUmZqaFZ3OUJ5UXpKcmt3enJuK1pCZUtpVG93M2d4?= =?utf-8?B?VVFkN3BBM0VHajhNTE1GeDdHNDcrYVF4VGVkTm40OGpUU2hOTzJKRVhzWVJI?= =?utf-8?B?UXBWTFJ2cEU3T1Q1bDQ3YklqQkl2aEROaDFoZ0VxT0YyR21HaW1OeUxqTnpY?= =?utf-8?B?V2FQRDV0bjlZbzJ0VjMrbFJ5bTVJWS85V2FsVE9XMnBNTkZrbWxBMlh5Qmwr?= =?utf-8?B?d3FsU1QvVkJqSGhhUVJnZmJjTkM5RG5wWUs4eU9uOVNsNTVBUHlld2F4Y0pj?= =?utf-8?B?d3dYMzEwSDY0dnpXaEk0OUgzVXowU0FQVnk1cm1aUXlWMGZ4ZWx6TFFVRUlY?= =?utf-8?B?NU54d2h2MERRMFlEVmVXaGRhK2kraEx0R2JSbEFOUXA5THoxYnVvdERhWnlY?= =?utf-8?B?S3pkb1VnUzNpVXpOdkpjV3dBejljN2hGVjJhcU83MGh2TndZNFloWGhoOW1k?= =?utf-8?B?ajZQOTRKWi90UElaNVJBOXBqYzVlcWhwQUFudEFDdnhDdjVPVHJoMTJmRC80?= =?utf-8?B?c1RVN2Mwb29STzZOcFVoMnJ2eEs3Ymk2STlSNUgvTzQ2OWNueFB4VzZqMW10?= =?utf-8?B?anRTenVqR0lBVGU4WmZjZ2VacGx6Z1NRUFlqcUl4RWFlZjBkU0t5L3BsaFVn?= =?utf-8?B?TUF2UncxM0JCejE3TXJUQ3puNkw2OE0rekNTVUdhWHQ2QUptYUw4Y2NrakdK?= =?utf-8?B?NHdhK1haaHJRemtzc05BS3pGTi9hbnZKNlZpZFZjQk9kYzh3QytvT0l3PT0=?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: b8a8834b-287b-4aa8-3230-08da862f0736 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Aug 2022 00:16:16.8767 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0P223MB0169 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > -----Original Message----- > From: ffmpeg-devel On Behalf Of > rcombs > Sent: Thursday, August 25, 2022 1:52 AM > To: ffmpeg-devel@ffmpeg.org > Subject: [FFmpeg-devel] [PATCH 3/3] lavf/id3v2dec: support multiple > values and TIPL frames > > 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) { int n = 0; > 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) && (sscanf(dst, "(%d)", &genre) == 1 || (sscanf(dst, "%d%n", &genre, &n) == 1 && n == strlen(dst))) && avoids parsing genre strings starting with numbers (like '2step') as genre id. Thanks for resubmitting, softworkz _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".