From patchwork Thu Apr 25 09:37:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Vobruba X-Patchwork-Id: 12905 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 5136344996D for ; Thu, 25 Apr 2019 12:37:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3098E68A803; Thu, 25 Apr 2019 12:37:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3AC0D6808C1 for ; Thu, 25 Apr 2019 12:37:36 +0300 (EEST) Received: by mail-wr1-f42.google.com with SMTP id s18so4517502wrp.0 for ; Thu, 25 Apr 2019 02:37:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tNasuaqeAGPIyUL4PCk3JioBFD+OFhD22qX/QG7CtEw=; b=EzRPtRV3JhHaFs3GVsagkwY5xA9xn+tkN03H6Oyo6DR2CtZERXICAvUYYq0kZ/Chw1 zyei4DCM8HMn25Yd7WJv/JzsHCGtlx0y0HJkcwribk6lS9Al5Z8lc7lvMhwU3dVgKbVT LU2o86kbFj7bZrg4nj0AwCN3nHFZqwUMtaPAM1hLXr9cAr5KirEC2UkLQEqJ4UiPLHWj o59iG+iz6jwXeDcPSRTavSISZIrtKYhG6kjoIlISddmp0GokxeSHS7rtxJ12uj33JznR /piqoqPbdSmRdtp31A4nk3MLvfoCFpMBWLNeYrMcfnnjVT/e5jVdqSP5R8qU+qgD54nL g1YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tNasuaqeAGPIyUL4PCk3JioBFD+OFhD22qX/QG7CtEw=; b=PTxjtaM3NeJGzktOtRaYVNSjxg8wihYZPgza8+hYRAkIU0eObV9caS5R29H11/lwx3 tW6Mxb+v201FrggUSIO7o1066dGQBgG7MjMcXiggL3HoOQbBjCTIhiLXMBu/lnOoJw3T 1uUjk17w1zTtd/iwPQ9Ws4kYhWOL5kALJtXBV6CiqkbUjq8ntZvHQGAqEdTxr7ivQm9t OqXFopqraMRtZzeSatQmXdAMCI8gF7pfjIchfF7nLWX6H73X+8+Vggi78OZLXyRodzna Lj5FI43+0vFNB1F9cKJsCAvJtV673c2K+Q0TVj12pTWPD/Ge8k3e1pyTl6pwJmSqe/Hc zHuQ== X-Gm-Message-State: APjAAAUC39fCojXKAsn0ddDERiIMtK92VV6B8xURtcQocHKnURqhTqU1 YzGgGqumdVgChpTNqW+VXt997wan X-Google-Smtp-Source: APXvYqz985Kqm2ykKGdmRlMdgVpqAuuPkTJcqQrfIdrYhpOXiZEkL2+4dPodi8R2AWr9cVwb+bHU4g== X-Received: by 2002:adf:e78e:: with SMTP id n14mr12153496wrm.21.1556185055497; Thu, 25 Apr 2019 02:37:35 -0700 (PDT) Received: from localhost.localdomain ([2001:4de8:cb07:0:281b:bab3:8b58:7a6c]) by smtp.gmail.com with ESMTPSA id o12sm18303085wrx.92.2019.04.25.02.37.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Apr 2019 02:37:34 -0700 (PDT) From: Martin Vobruba To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Apr 2019 11:37:28 +0200 Message-Id: <1556185048-19989-1-git-send-email-vobruba.martin@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH v2] avfilter/avf_showwaves: Add draw mode also to showwavespic filter 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: Martin Vobruba MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" See commit a8c2d375ca68b7f001564ced14d8ac0757f53a29 --- doc/filters.texi | 15 +++++++++++++++ libavfilter/avf_showwaves.c | 3 +++ 2 files changed, 18 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index e9cbccc..e8636da 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -22647,6 +22647,21 @@ Cubic root. Default is linear. @end table +@item draw +Set the draw mode. + +Available values are: +@table @samp +@item scale +Scale pixel values for each drawn sample. + +@item full +Draw every sample directly. +@end table + +Default value is @code{scale}. +@end table + @subsection Examples @itemize diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c index 0e683cf..a0d2b25 100644 --- a/libavfilter/avf_showwaves.c +++ b/libavfilter/avf_showwaves.c @@ -765,6 +765,9 @@ static const AVOption showwavespic_options[] = { { "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"}, + { "draw", "set draw mode", OFFSET(draw_mode), AV_OPT_TYPE_INT, {.i64 = DRAW_SCALE}, 0, DRAW_NB-1, FLAGS, .unit="draw" }, + { "scale", "scale pixel values for each drawn sample", 0, AV_OPT_TYPE_CONST, {.i64=DRAW_SCALE}, .flags=FLAGS, .unit="draw"}, + { "full", "draw every pixel for sample directly", 0, AV_OPT_TYPE_CONST, {.i64=DRAW_FULL}, .flags=FLAGS, .unit="draw"}, { NULL } };