From patchwork Thu Mar 9 09:23:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 2851 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp243680vsy; Thu, 9 Mar 2017 01:23:48 -0800 (PST) X-Received: by 10.28.207.14 with SMTP id f14mr9347759wmg.72.1489051428742; Thu, 09 Mar 2017 01:23:48 -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 l62si7981987wrc.6.2017.03.09.01.23.48; Thu, 09 Mar 2017 01:23:48 -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 7D78268832B; Thu, 9 Mar 2017 11:23:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A999F688321 for ; Thu, 9 Mar 2017 11:23:25 +0200 (EET) Received: from paradise.fritz.box.fritz.box ([80.144.14.140]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MfiFU-1cZr5S3BTw-00NBfI; Thu, 09 Mar 2017 10:23:38 +0100 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Thu, 9 Mar 2017 10:23:28 +0100 Message-Id: <20170309092328.10862-1-barsnick@gmx.net> X-Mailer: git-send-email 2.9.3 X-Provags-ID: V03:K0:9VAC+RV/AXhCgdXC+adN/HRCyaEi1/UPYzrIHA+Mc0MJJKYbr0v cMovLooPl1XQjJvVV4usKerRl7GmkyZOkpBWnrtVr1Qov7TvIwahfDBMezK7wmrFGm7VDoJ 0y97GZex3BAJhyaBu8aKpAO5fTBQkbacEEGT/TdCjityPDgpeqGrpvbECFKl2bOEaSPQedz TrKZIhHrRd+VNegg0PKcA== X-UI-Out-Filterresults: notjunk:1; V01:K0:1qWcbkjV8HY=:uApfAonUn06hcIkcFBTWCG RR2VOa0kqxDc56S5g/OVnz/UU8uB/5OqLWdvRBVDIviLkuo2GBCt5S5b3VQTk93slVu+Ir4mr mPpaE8dP1hLSRufhG1XXD3R4Xp+7lEXjkhXvm9F9fm4jxBikGRmXFEFI8Wq4VDaPoysnWt+rm cVHFXDRtuZp+25tmLEkufjsIVvQw1r5BH19gmfPyfsUQ7vHYC1R52Rs8csuZkIsQUUt/a6Ad0 /dNKoilOhb9KAvEexKv1AHNa4wlmc++orC176Kvsh2gVLAC9S2xx/inaUBJygfs7I2hpSPAWp NgKKI3beam9J0RurBPiczy2iasKAjkDiXVB+G5W4UTBJE+ypKRJBS5n6/Q6Kcjq/mtjDBI6s9 OwPheoiN6Mdh8uoKa+Hs6ZyoyrAT+NbhRSusy8/n47LTrqkMY0q7CoW+qr2XD+7Eer80S3R7P fhRzAveqeAQrHAC7uAX4mPK0B8UYKwTSyStkA7r09xP7Gz8TLLvkY9h1IeYosdrge42WPYsqo AyWZVjoMRb7xxgid7TXLOExgcsx5L15U1zcKZIRq/WB8XVTgHMpD6av8ipyVKPLQQxvvd9PXx i7koTTg2GHRFp4x6cpcxKA7SQtaipmsCMqw8HVk6l7z6j8U4TdgXbiOAmMkgOvQRGmQRs7WLG Xbcg4YIFl9SQO+N3vUln2NMQRMuSgBTxHv/YaTB62aQPtuM9upoBjk3asPYVCCIn13/3/DPE2 W679cm2UB+1iLcAW3cWuilShmdgqAFWXVRq020kLCRJgCtSiFC/kb/FYr7M= Subject: [FFmpeg-devel] [PATCH] libavfilter/avf_showwaves: make sqrt and cbrt scale option values available to showwavespic by name 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 Cc: Moritz Barsnick MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The 'sqrt' and 'cbrt' scalers were added in commit 80262d8c86e94ff9a4bb3a9e3c2d734e04ccb399, but their symbolic option values only made available to the showwaves filter, not showwavespic, despite the scalers working properly by their numerical option values. Signed-off-by: Moritz Barsnick --- doc/filters.texi | 18 +++++++++++++++++- libavfilter/avf_showwaves.c | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index b5265d9..192a81a 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -17897,7 +17897,23 @@ Set if channels should be drawn separately or overlap. Default value is 0. Set colors separated by '|' which are going to be used for drawing of each channel. @item scale -Set amplitude scale. Can be linear @code{lin} or logarithmic @code{log}. +Set amplitude scale. + +Available values are: +@table @samp +@item lin +Linear. + +@item log +Logarithmic. + +@item sqrt +Square root. + +@item cbrt +Cubic root. +@end table + Default is linear. @end table diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c index 05aa995..aadc5c1 100644 --- a/libavfilter/avf_showwaves.c +++ b/libavfilter/avf_showwaves.c @@ -676,6 +676,8 @@ static const AVOption showwavespic_options[] = { { "scale", "set amplitude scale", OFFSET(scale), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, SCALE_NB-1, FLAGS, .unit="scale" }, { "lin", "linear", 0, AV_OPT_TYPE_CONST, {.i64=SCALE_LIN}, .flags=FLAGS, .unit="scale"}, { "log", "logarithmic", 0, AV_OPT_TYPE_CONST, {.i64=SCALE_LOG}, .flags=FLAGS, .unit="scale"}, + { "sqrt", "square root", 0, AV_OPT_TYPE_CONST, {.i64=SCALE_SQRT}, .flags=FLAGS, .unit="scale"}, + { "cbrt", "cubic root", 0, AV_OPT_TYPE_CONST, {.i64=SCALE_CBRT}, .flags=FLAGS, .unit="scale"}, { NULL } };