From patchwork Wed Dec 12 18:08:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11390 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0D1EE44686A for ; Wed, 12 Dec 2018 20:08:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4645A68A73B; Wed, 12 Dec 2018 20:08:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 940A868A73B for ; Wed, 12 Dec 2018 20:08:22 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id r10so18618782wrs.10 for ; Wed, 12 Dec 2018 10:08:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=ZKpO/8v3fS64qBLcVaCei8P8FSYOuD91m8wbhOwsxDI=; b=vB18PSgsE6P+TOuKjQqNXri56YykAwDS9eNvXk5EB212jVNHsRguBkkbZO3rXCPZcX RZz/kUyfrnPSV5YKXO9GaNC0fr6FVA+Rte7y0DDZjoigFInh6EdgBbha17Fa366NjuKF CHZ+TGhqk5Ylk6+IQxcQbPaoylVjkkElZggQO2DSEyYwMLg5Uk6/4HLIcDg1IHRIAiJR VQ37xSZvzJ7StIbqAp25xoUeETTIBNW3O5740UO8zekajKe7QrA/SmG//Tu6jLUBuwQt mjLBBQKmizI2AtKL8kLAlq6TlIspSsCFt/G8a2w+wzEckYGTyKK5tAiU0+C3mn+twN4I fNbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=ZKpO/8v3fS64qBLcVaCei8P8FSYOuD91m8wbhOwsxDI=; b=OGTgyX69ZVakA4RB67260PwMIwyLee2DjEdUV+5QsLQ706KC8bnuv2PhDSTnE7fePu 4lrm4zt03DDWrLLWtHuNnl+t7yz9tzNfzLCMympy//fCwBQeBpUU1/jYyEvvemvV1isr Tj+ElfYv+8OFIIjVwJCdT14LVIVPbkRvdTaf92uU9NIcvAmkelhpTvBO5ikgdfikHX3E WkWvrTJwODEtZGSZjfRP70H83YGxE5k/BRFfLeQ2dDGHgvz2dLpf6+ILj/fbyJ6TqFvd c3odSDNYwXI+kJ3HwAV19rygp1+tJhYjpLgU9JL40KdVKwIa5RfrmbDJ1IcDW97+0WoE gRmw== X-Gm-Message-State: AA+aEWbwbe6zTjv1HXy16z8esH0GRN7tLJKGkSxJ5zOaJofddLt2sNVV HW/1KJk/CV1g9UNyJ+KwtIdtI+pZ X-Google-Smtp-Source: AFSGD/WPN7UhdadthEmwxvaM6jjcikA1A4wWAbcS6jQBR/h9MHBYBPV9uWMHX0S3rFAoD59QqQ149g== X-Received: by 2002:adf:bb8d:: with SMTP id q13mr18245554wrg.183.1544638113806; Wed, 12 Dec 2018 10:08:33 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id q185sm5081182wmg.14.2018.12.12.10.08.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Dec 2018 10:08:33 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Dec 2018 19:08:16 +0100 Message-Id: <20181212180816.17410-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avformat/wavdec: add support for 'id3 ' chunk 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes #5700. Signed-off-by: Paul B Mahol --- libavformat/wavdec.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index e280be4d44..6ab0a49313 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -34,6 +34,7 @@ #include "avformat.h" #include "avio.h" #include "avio_internal.h" +#include "id3v2.h" #include "internal.h" #include "metadata.h" #include "pcm.h" @@ -500,6 +501,17 @@ static int wav_read_header(AVFormatContext *s) ff_read_riff_info(s, size - 4); } break; + case MKTAG('i', 'd', '3', ' '): { + ID3v2ExtraMeta *id3v2_extra_meta = NULL; + ff_id3v2_read_dict(pb, &s->internal->id3v2_meta, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta); + if (id3v2_extra_meta) { + ff_id3v2_parse_apic(s, &id3v2_extra_meta); + ff_id3v2_parse_chapters(s, &id3v2_extra_meta); + ff_id3v2_parse_priv(s, &id3v2_extra_meta); + } + ff_id3v2_free_extra_meta(&id3v2_extra_meta); + } + break; } /* seek to next tag unless we know that we'll run into EOF */