From patchwork Sun Oct 20 23:14:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 15867 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 B95CC449E6A for ; Mon, 21 Oct 2019 02:22:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 92CAB68AFBC; Mon, 21 Oct 2019 02:22:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2271768AFAF for ; Mon, 21 Oct 2019 02:22:45 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id q15so5664861pll.11 for ; Sun, 20 Oct 2019 16:22:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=GwLg47MFMKDOdKtdUXonhA4neJlqRwhi3D3q86ovQNA=; b=cCQYhlTL1MhvLpvCZcxfC4uRtyF6AXOXYpbs5xOVhEPOxYAbmdbkH6bG+/2wwE0zus vIRH3uMLvVyOPPAJEGZtK39d5gfWaMIVcPO7x5mbx+OfnALZoBA5zT9mXUomPXwIXO87 mZMtMIxnwcibNRFmJH3/+EP51L7D9V5TA3iNhpvZcivlLK140MaOUfG3Q7q7XVYRxLGg zWQRzvstX1+Xaex4VARtlek63HsKEzUwVMVCD2Ag6x3RVPnfVMAvSQ+LjLFPOi3wKMZr bT0IL72q9s/Zj6Vs/QZ225w59Z0DGSAgZYVxFiMz6AotMX1BjLgau/cqBRyfVrBvCDbs hRxw== 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=GwLg47MFMKDOdKtdUXonhA4neJlqRwhi3D3q86ovQNA=; b=eX/uPg7lw0cwDTg7pmurvfLb25bm5/z8huWHxVB2sBszy5eB/rOoOV40Q5EUSLeP+2 cKjbmzILNl5AmyiXBTvg6HF99vfClmnvaROLbcGpsnZGqxob5gXA+Y/7oS3L+dmDCRoD H1RA4gmrACvbZjGQdarT22tglrw+v0CN+8cQGhSWu3ZgFOhhY23YikadRjUT9VmHx5MI opxGEFobuLqQhzAcas0yEyBh4Gaxt2QDeNzRgGw3Rp/1q4TepDgCJG97iH+gNHRYZV9P LoIcpxXQsbJhXuxqmGLx1f/Tyo/KtawH/NYtVTQm1i4RiOrwaKaJKMn9eIFY2km38NY0 PNOA== X-Gm-Message-State: APjAAAVpaWNGw1Gt6NtrxyJsgLznrZcBHGo/VG67S2VXPWkepV/zmKsb xABQ5zI8rsuMBmGEjAkkEA0zSrI6 X-Google-Smtp-Source: APXvYqx6fXaHxbY5zhc0yZoLwUySsMAqUGlo1VHWLH2OWwJp55BrT2FNZQGnrraMWZPeNT8iJlhNrA== X-Received: by 2002:a17:902:222:: with SMTP id 31mr21870785plc.169.1571613272554; Sun, 20 Oct 2019 16:14:32 -0700 (PDT) Received: from jun-ubuntu.corp.microsoft.com ([2001:4898:80e8:7:37fe:dd70:42c8:85aa]) by smtp.googlemail.com with ESMTPSA id m22sm13713963pgj.29.2019.10.20.16.14.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Oct 2019 16:14:31 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Oct 2019 16:14:25 -0700 Message-Id: <20191020231425.30001-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2] avformat/wavdec.c: copy id3 metadata to format metadata and stream side data 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" Enhancement #7803 Copy id3 metadata to format meta data and stream side data. Signed-off-by: Jun Li --- libavformat/Makefile | 4 ++-- libavformat/wavdec.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 615156c120..0ab6fe0793 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -535,9 +535,9 @@ OBJS-$(CONFIG_VOC_MUXER) += vocenc.o voc.o OBJS-$(CONFIG_VPK_DEMUXER) += vpk.o OBJS-$(CONFIG_VPLAYER_DEMUXER) += vplayerdec.o subtitles.o OBJS-$(CONFIG_VQF_DEMUXER) += vqf.o -OBJS-$(CONFIG_W64_DEMUXER) += wavdec.o w64.o pcm.o +OBJS-$(CONFIG_W64_DEMUXER) += wavdec.o w64.o pcm.o replaygain.o OBJS-$(CONFIG_W64_MUXER) += wavenc.o w64.o -OBJS-$(CONFIG_WAV_DEMUXER) += wavdec.o pcm.o +OBJS-$(CONFIG_WAV_DEMUXER) += wavdec.o pcm.o replaygain.o OBJS-$(CONFIG_WAV_MUXER) += wavenc.o OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \ diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 52194f54ef..d82bdaaa66 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -41,6 +41,7 @@ #include "riff.h" #include "w64.h" #include "spdif.h" +#include "replaygain.h" typedef struct WAVDemuxContext { const AVClass *class; @@ -537,6 +538,15 @@ break_loop: avio_seek(pb, data_ofs, SEEK_SET); + if (s->internal->id3v2_meta) { + ret = av_dict_copy(&s->metadata, s->internal->id3v2_meta, 0); + if (ret < 0) + return ret; + ret = ff_replaygain_export(st, s->internal->id3v2_meta); + if (ret < 0) + return ret; + } + if (data_size > (INT64_MAX>>3)) { av_log(s, AV_LOG_WARNING, "Data size %"PRId64" is too large\n", data_size); data_size = 0;