From patchwork Sun Oct 20 05:33:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 15856 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 9DEE5448D6C for ; Sun, 20 Oct 2019 09:37:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 70FD268AEDA; Sun, 20 Oct 2019 09:37:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15A0F68AEC0 for ; Sun, 20 Oct 2019 09:37:46 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id 205so6338832pfw.2 for ; Sat, 19 Oct 2019 23:37: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=H7oAdDUv/O7PxWiaSHAl1EEoGAmJZ7tuiY2ne0m3E80=; b=Ggw0f34puZ3s2EOKb+gXBHppMT7hb/xvJRoHnPnymc/M7OPG9EXgzYvvz6YG0p6tVs vx1mgKW+5J1TRJ0kWe8kZ59TyIR10FjPM0YrZ+Ba7ZwaUAF1df21Ht/L4Kqvvb+ICTDd ncQehLLne9ctZNU9qc168r98qeKPYFY5gR4TarRGgFI1F5sA4pEW/PT5jYRnZv4R2a7V WzEr9rZohZqjJGfk5OUOHUZoUSVBivue1ND/ZOs6Xl1WPH7efu0XmIv43YTXWEe5BzZQ Z+lFi0tz8lDbam4Wqnt22ioXQAV99jJDKPhvZXJreUP8vAht6PxMDXRRbuqeP2cZhSPl s2xQ== 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=H7oAdDUv/O7PxWiaSHAl1EEoGAmJZ7tuiY2ne0m3E80=; b=qu6oFbeV6WsdTY+vE9u2nayzoUq85FYIk0DoQSS7bXaDohL1B1AQxPrfRFq/ZbfBC5 yx5kOv4DBJ8jpnx/2H1sp5kzV4jFBvKDNj5j1/sDX5gYZEYqqWuR65pes/Q2js7eJS2g yGq5nP2zNzYDxmFlfIYCIJYOFZcExOSBVtB5eeLZxC5HK1sDMb1I4cKUxeYLmtYANSsr z/kc7zGALqn9ywcQuYGfLWVaqAx/i1Uee5Ajq4oeMB41RisDLKGbHwGSspKTucEMbXGd OpV+NkKucAw7lJuxeLzAffB5jJsEmh7bfVGhfJ7vXcqAV3j5e/zXbAaqBzE9cP8dat0x khVw== X-Gm-Message-State: APjAAAWoTdLHd4G88JQ/GtD/0MFbezgjqDcWDZwI2H0jd81TvDkn4yss TV6p9tPlSNkatm0VZGXBTm/UZwZN X-Google-Smtp-Source: APXvYqwrWE5M2mOj7g56yMEwabG7iMPkKHoT0Hh9OUGv8yRJc5Af7PzxLUM/9CL4Oi95gxJbpz3NYw== X-Received: by 2002:a63:3683:: with SMTP id d125mr8962221pga.3.1571549642803; Sat, 19 Oct 2019 22:34:02 -0700 (PDT) Received: from jun-ubuntu.corp.microsoft.com ([2001:4898:80e8:7:37fe:dd70:42c8:85aa]) by smtp.googlemail.com with ESMTPSA id ep10sm26563955pjb.2.2019.10.19.22.34.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 22:34:01 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Oct 2019 22:33:55 -0700 Message-Id: <20191020053355.29223-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v1] 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 steams side data. Signed-off-by: Jun Li --- libavformat/wavdec.c | 10 ++++++++++ 1 file changed, 10 insertions(+) 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;