From patchwork Fri Sep 29 15:08:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Rapp X-Patchwork-Id: 5339 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.61.197 with SMTP id n188csp881710jan; Fri, 29 Sep 2017 08:08:42 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCScW+XfmCC/8wiHHU5q7rP3lA2eTafRNkS5zJhPyHq6DNMv6P3Bncuua+pMnjuZUDGL648 X-Received: by 10.223.148.165 with SMTP id 34mr7378924wrr.20.1506697722835; Fri, 29 Sep 2017 08:08:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506697722; cv=none; d=google.com; s=arc-20160816; b=0Ls+KY+Y+X7nsSEBmmXXANT/VjrcCnqM2AEUyf/tU26Uzs8FrGwH/cfnWbIN6iJbut nwIF7/73wixBpsyG49pEmFts23byZCe1U9pWyVS1HPMrkPLQ3ZLutn4VHprFTGq9Hsur 2RXwErCY1W+y/wJgSDN/WsPTA6ftcIom0Kk85Fs4QOiJwxjxH181g56ioffr/aRP1gY5 qY2t8KNl2v/dc0oNgupetX4MdBHx83prY+ZNd7pJj85xsC5hY9sSI1/GK82m7P4Sl8n1 M3lmo3F2AmN8R2q57Vpc2x4bFM435pSzNWpmn64kjPqAijFaLbr9KMlAi7nTBVEctUTT vmnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=qX/pfdlfFGN4W0LK1h1c+UYxbazkJcwYH/wauyZceGg=; b=COmKk2CXJEXUH36kxtATRYxLKFPpV3mTcFyXCYEXU94ZDHnZgfGjupgqBvl72cUQxK QoI175W4P+NM9SCQdmMCBrO91jyHeo1zaHseq4ppll9bfIfXotoD7rX/nWX/bZm/pL9X jQ5PBlNSR7G+8tIbEUdgVLpPxGm+04SQBEWz3X0sY6/2GM0VFLNbXoQ2AAHQYOI+iuzz KV2rIJhNkqseCkPNVD/kXhvrpjaGgprqA+RdQfgq+/Ph3+h2cdAYK+QmYJzobX9rq8w8 v5tt2MAXJV7V0UaSu6vVo1s24fW6h9rl5pGNiWpTmIxbKHQnZ50Uwi8f7Ul09KYoJyDR Zwtw== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y52si3779162wry.87.2017.09.29.08.08.42; Fri, 29 Sep 2017 08:08:42 -0700 (PDT) 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 D781D6899F5; Fri, 29 Sep 2017 18:08:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx02.mail.netstorage.at (mx02.mail.netstorage.at [89.207.146.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EAAE680A69 for ; Fri, 29 Sep 2017 18:08:20 +0300 (EEST) Received: from p1002.netstorage.at (p1002.netstorage.at [89.207.146.186]) by mx02.mail.netstorage.at (Postfix) with ESMTPS id C95D4A0706 for ; Fri, 29 Sep 2017 17:08:16 +0200 (CEST) Received: from mailix (noaport.de [46.237.252.213]) by p1002.netstorage.at (Postfix) with ESMTPA id 70D4880C8F for ; Fri, 29 Sep 2017 17:08:16 +0200 (CEST) Received: from frogstar-a.kuhnle.local (frogstar-a.kuhnle.local [192.168.0.26]) by mailix with ESMTPA ; Fri, 29 Sep 2017 17:08:16 +0200 From: Tobias Rapp To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Sep 2017 17:08:16 +0200 Message-Id: <1506697696-21235-2-git-send-email-t.rapp@noa-archive.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506697696-21235-1-git-send-email-t.rapp@noa-archive.com> References: <1506697696-21235-1-git-send-email-t.rapp@noa-archive.com> X-PPP-Message-ID: <20170929150816.17476.18061@p1002.netstorage.at> X-PPP-Vhost: noa-archive.com X-NetStorage-MailScanner-Information: Please contact the ISP for more information X-NetStorage-MailScanner-ID: C95D4A0706.A62C1 X-NetStorage-MailScanner: Found to be clean X-NetStorage-MailScanner-SpamCheck: not spam (whitelisted), SpamAssassin (nicht zwischen gespeichert, Wertung=-0.5, benoetigt 6, autolearn=not spam, BAYES_00 -0.50) X-NetStorage-MailScanner-From: t.rapp@noa-archive.com X-Spam-Status: No Subject: [FFmpeg-devel] [PATCH 2/2] avformat/wavenc: skip writing peak-of-peaks position when writing peaks only 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" Signed-off-by: Tobias Rapp --- libavformat/wavenc.c | 5 ++++- tests/ref/lavf/wav_peak_only | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c index adb20cb..7a4acf9 100644 --- a/libavformat/wavenc.c +++ b/libavformat/wavenc.c @@ -287,7 +287,10 @@ static int peak_write_chunk(AVFormatContext *s) avio_wl32(pb, wav->peak_block_size); /* frames per value */ avio_wl32(pb, par->channels); /* number of channels */ avio_wl32(pb, wav->peak_num_frames); /* number of peak frames */ - avio_wl32(pb, wav->peak_pos_pop); /* audio sample frame index */ + if (wav->write_peak == PEAK_ONLY) /* audio sample frame index */ + avio_wl32(pb, -1); + else + avio_wl32(pb, wav->peak_pos_pop); avio_wl32(pb, 128); /* equal to size of header */ avio_write(pb, timestamp, 28); /* ASCII time stamp */ ffio_fill(pb, 0, 60); diff --git a/tests/ref/lavf/wav_peak_only b/tests/ref/lavf/wav_peak_only index dccd0e7..b203d03 100644 --- a/tests/ref/lavf/wav_peak_only +++ b/tests/ref/lavf/wav_peak_only @@ -1,2 +1,2 @@ -b609a363e6d490710ed52231a8d09d3c *./tests/data/lavf/lavf.peak_only.wav +f1a8aeeae8069f3992c4d780436c3d23 *./tests/data/lavf/lavf.peak_only.wav 832 ./tests/data/lavf/lavf.peak_only.wav