From patchwork Thu Jan 26 13:29:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paul Arzelier X-Patchwork-Id: 2327 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp181504vsb; Thu, 26 Jan 2017 05:29:09 -0800 (PST) X-Received: by 10.223.128.77 with SMTP id 71mr2655197wrk.163.1485437349199; Thu, 26 Jan 2017 05:29:09 -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 m131si3076424wmd.60.2017.01.26.05.29.08; Thu, 26 Jan 2017 05:29:09 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B79568A954; Thu, 26 Jan 2017 15:29:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp5-g21.free.fr (smtp5-g21.free.fr [212.27.42.5]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2C6668A7C8 for ; Thu, 26 Jan 2017 15:28:58 +0200 (EET) Received: from [192.168.1.47] (unknown [93.163.38.190]) (Authenticated sender: paul.arzelier) by smtp5-g21.free.fr (Postfix) with ESMTPSA id 4CD635FFE0 for ; Thu, 26 Jan 2017 14:28:58 +0100 (CET) To: ffmpeg-devel@ffmpeg.org References: <76132ba8-af6a-ce81-87ce-5e4703103425@free.fr> <9f5d1b0d-0336-4a56-e7d6-baea3688ff04@free.fr> <20170126011234.GJ4698@nb4> <20170126112457.0ed024e9@debian> <1f383fee-feb5-c43d-ef0d-46bf1cb227fe@free.fr> <20170126131047.5169000e@debian> <20170126134326.2b997bee@debian> From: Paul Arzelier Message-ID: <6f6bf9cf-145e-a087-b633-79baa096ed3c@free.fr> Date: Thu, 26 Jan 2017 14:29:21 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <20170126134326.2b997bee@debian> X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] Ignore duplicate ID3 tags if vorbis tags exist 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Alright, attached is the last version (I hope!) Paul Le 26/01/2017 à 13:43, wm4 a écrit : > On Thu, 26 Jan 2017 13:32:08 +0100 > Paul Arzelier wrote: > >> From d84648e1990ad3a12462dfb76990dc7036f5f082 Mon Sep 17 00:00:00 2001 >> From: Polochon-street >> Date: Thu, 26 Jan 2017 13:25:22 +0100 >> Subject: [PATCH] Ignore ID3 tags if other tags are present (e.g. vorbis >> comments) >> Originally-by: Ben Boeckel >> --- >> libavformat/utils.c | 17 ++++++++++++++++- >> 1 file changed, 16 insertions(+), 1 deletion(-) >> > Patch looks generally great to me now. > >> diff --git a/libavformat/utils.c b/libavformat/utils.c >> index d5dfca7dec..ce24244135 100644 >> --- a/libavformat/utils.c >> +++ b/libavformat/utils.c >> @@ -513,6 +513,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, >> AVFormatContext *s = *ps; >> int i, ret = 0; >> AVDictionary *tmp = NULL; >> + AVDictionary *id3_meta = NULL; >> ID3v2ExtraMeta *id3v2_extra_meta = NULL; >> >> if (!s && !(s = avformat_alloc_context())) >> @@ -588,12 +589,25 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, >> >> /* e.g. AVFMT_NOFILE formats will not have a AVIOContext */ >> if (s->pb) >> - ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, 0); >> + ff_id3v2_read_dict(s->pb, &id3_meta, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta); >> >> if (!(s->flags&AVFMT_FLAG_PRIV_OPT) && s->iformat->read_header) >> if ((ret = s->iformat->read_header(s)) < 0) >> goto fail; >> >> + if (!s->metadata) { >> + av_dict_copy(&s->metadata, id3_meta, AV_DICT_DONT_OVERWRITE); >> + av_dict_free(&id3_meta); > Strictly speaking, this line is redundant, but it doesn't harm either. > If you feel like it you could remove it, but it's not necessary. > >> + } >> + else if (id3_meta) { > If you make another patch, you could merge the } with the next line too > (I'm not sure, but I think that's preferred coding-style wise). > >> + int level = AV_LOG_WARNING; >> + if (s->error_recognition & AV_EF_COMPLIANT) >> + level = AV_LOG_ERROR; >> + av_log(s, level, "Discarding ID3 tag because more suitable tags were found.\n"); >> + if (s->error_recognition & AV_EF_EXPLODE) >> + return AVERROR_INVALIDDATA; >> + } >> + >> if (id3v2_extra_meta) { >> if (!strcmp(s->iformat->name, "mp3") || !strcmp(s->iformat->name, "aac") || >> !strcmp(s->iformat->name, "tta")) { >> @@ -627,6 +641,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, >> fail: >> ff_id3v2_free_extra_meta(&id3v2_extra_meta); >> av_dict_free(&tmp); >> + av_dict_free(&id3_meta); >> if (s->pb && !(s->flags & AVFMT_FLAG_CUSTOM_IO)) >> avio_closep(&s->pb); >> avformat_free_context(s); > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel From d84648e1990ad3a12462dfb76990dc7036f5f082 Mon Sep 17 00:00:00 2001 From: Polochon-street Date: Thu, 26 Jan 2017 13:25:22 +0100 Subject: [PATCH] Ignore ID3 tags if other tags are present (e.g. vorbis comments) Originally-by: Ben Boeckel --- libavformat/utils.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index d5dfca7dec..ce24244135 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -513,6 +513,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVFormatContext *s = *ps; int i, ret = 0; AVDictionary *tmp = NULL; + AVDictionary *id3_meta = NULL; ID3v2ExtraMeta *id3v2_extra_meta = NULL; if (!s && !(s = avformat_alloc_context())) @@ -588,12 +589,25 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, /* e.g. AVFMT_NOFILE formats will not have a AVIOContext */ if (s->pb) - ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, 0); + ff_id3v2_read_dict(s->pb, &id3_meta, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta); if (!(s->flags&AVFMT_FLAG_PRIV_OPT) && s->iformat->read_header) if ((ret = s->iformat->read_header(s)) < 0) goto fail; + if (!s->metadata) { + s->metadata = id3_meta; + id3_meta = NULL; + } else if (id3_meta) { + int level = AV_LOG_WARNING; + if (s->error_recognition & AV_EF_COMPLIANT) + level = AV_LOG_ERROR; + av_log(s, level, "Discarding ID3 tag because more suitable tags were found.\n"); + av_dict_free(&id3_meta); + if (s->error_recognition & AV_EF_EXPLODE) + return AVERROR_INVALIDDATA; + } + if (id3v2_extra_meta) { if (!strcmp(s->iformat->name, "mp3") || !strcmp(s->iformat->name, "aac") || !strcmp(s->iformat->name, "tta")) { @@ -627,6 +641,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, fail: ff_id3v2_free_extra_meta(&id3v2_extra_meta); av_dict_free(&tmp); + av_dict_free(&id3_meta); if (s->pb && !(s->flags & AVFMT_FLAG_CUSTOM_IO)) avio_closep(&s->pb); avformat_free_context(s); -- 2.11.0