From patchwork Fri Jan 27 21:20:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Snowhill X-Patchwork-Id: 2342 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp435827vsb; Fri, 27 Jan 2017 13:27:31 -0800 (PST) X-Received: by 10.28.9.148 with SMTP id 142mr4643932wmj.24.1485552451621; Fri, 27 Jan 2017 13:27:31 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z187si4158730wmd.166.2017.01.27.13.27.31; Fri, 27 Jan 2017 13:27:31 -0800 (PST) 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=@gmail.com; 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=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4526A68AA4C; Fri, 27 Jan 2017 23:27:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5804F68AA45 for ; Fri, 27 Jan 2017 23:27:22 +0200 (EET) Received: by mail-pf0-f193.google.com with SMTP id e4so19200176pfg.0 for ; Fri, 27 Jan 2017 13:27:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WCxkb4Ja1U7KbMFeMia0F4xV/ULdiV7kw9XflRr5nlk=; b=W1CyGxNYDaJAnoL95T0nFqV2y5Si1mSvyFpyXUXhGdoioWOAlSfLm+vDrahhwWog9P CMLK13agNj4v6P1pxsHT3TV3HQVf5RpV5fzilZFY3PBRvIYqiS2fjeEhHBp89vnfogmL z9m7AU+QDIHpbDFK1VJxXQ7bxl0fSUzBIaERA2mgG3pLJsaExdrx9GGmTgX0qnTWHjJO 3+z8MquzXZF6dHVPxNvzCOyMXLmdH5sivjocFyRpmz/U22IGNOhfnf7+Ya1J85GAoT9I A0YYPm1OdH/1Onm7TiZmzYxeXkO05R72dgHsPAuRZtrPErwO8xPP9lwjzXGPeWAWJZvx HcsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WCxkb4Ja1U7KbMFeMia0F4xV/ULdiV7kw9XflRr5nlk=; b=HMxevT5St7Wp85TRdjetSIKqczuP8bHrOtEjxWdc5yzVJdtm35WK2E7VTy0ds6Laar dzKSfaSh4I5kkezBTNmZ5VB4b9v7+f2wmPyJfBlUyM5VAimXnYjId8Og5PrgSASygnwS X2nxoNM87MATYHDP9I7HUtS5OzLkvJAgc6t5n5HxyXftl5dSSQnBYMEmiP6In9uBzMlS IOMgmgqt94+UXKabERXdRSN8xTB8FLh7HTuOxFggMZ3Ugk+6xqkuidG7YYvexWWTe0b7 8WNtjNFvN22IEO7FObEIpd9xn7Pki21OHFxmV38UjFTRSCvArkAEPUitYGxqcrUeu4vp 2Fqw== X-Gm-Message-State: AIkVDXJ6UHarMOfVEu636X3LOVDMw/EN+3oGFksxhxwWZmpNdHeOZELiVeO5EoAwbF1oPA== X-Received: by 10.84.231.203 with SMTP id g11mr15218728pln.165.1485552070607; Fri, 27 Jan 2017 13:21:10 -0800 (PST) Received: from localhost.localdomain ([2602:306:30b9:e21f:415:76:2aae:355]) by smtp.gmail.com with ESMTPSA id l25sm13543614pfb.24.2017.01.27.13.21.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 13:21:10 -0800 (PST) From: Christopher Snowhill To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Jan 2017 13:20:31 -0800 Message-Id: <20170127212031.9580-2-kode54@gmail.com> X-Mailer: git-send-email 2.10.1.windows.1 In-Reply-To: <20170127212031.9580-1-kode54@gmail.com> References: <20170127131039.5c9ef235@debian> <20170127212031.9580-1-kode54@gmail.com> Subject: [FFmpeg-devel] [PATCH] avformat: fix ID3v2 parser for v2.2 comment frames X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Chris Moeller MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Chris Moeller --- libavformat/id3v2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 9969d7a..f7fa3ef 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -823,6 +823,7 @@ static void id3v2_parse(AVIOContext *pb, AVDictionary **metadata, const ID3v2EMFunc *extra_func = NULL; unsigned char *uncompressed_buffer = NULL; av_unused int uncompressed_buffer_size = 0; + const char *comm_frame; av_log(s, AV_LOG_DEBUG, "id3v2 ver:%d flags:%02X len:%d\n", version, flags, len); @@ -834,12 +835,14 @@ static void id3v2_parse(AVIOContext *pb, AVDictionary **metadata, } isv34 = 0; taghdrlen = 6; + comm_frame = "COM"; break; case 3: case 4: isv34 = 1; taghdrlen = 10; + comm_frame = "COMM"; break; default: @@ -950,7 +953,7 @@ static void id3v2_parse(AVIOContext *pb, AVDictionary **metadata, /* check for text tag or supported special meta tag */ } else if (tag[0] == 'T' || !memcmp(tag, "USLT", 4) || - !memcmp(tag, "COMM", 4) || + !strcmp(tag, comm_frame) || (extra_meta && (extra_func = get_extra_meta_func(tag, isv34)))) { pbx = pb; @@ -1018,7 +1021,7 @@ static void id3v2_parse(AVIOContext *pb, AVDictionary **metadata, read_ttag(s, pbx, tlen, metadata, tag); else if (!memcmp(tag, "USLT", 4)) read_uslt(s, pbx, tlen, metadata); - else if (!memcmp(tag, "COMM", 4)) + else if (!strcmp(tag, comm_frame)) read_comment(s, pbx, tlen, metadata); else /* parse special meta tag */