From patchwork Thu Apr 25 08:15:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Vobruba X-Patchwork-Id: 12903 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 D8FF9449216 for ; Thu, 25 Apr 2019 11:15:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BDAE768997E; Thu, 25 Apr 2019 11:15:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF6C068995F for ; Thu, 25 Apr 2019 11:15:40 +0300 (EEST) Received: by mail-wr1-f49.google.com with SMTP id a12so5735860wrq.10 for ; Thu, 25 Apr 2019 01:15:40 -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; bh=tSUPDm4viEEMqBl4cna4myueadJJqxy+taVzEDoW/Nk=; b=Za0RRunyLmox7FDGbJGCQJkgC90Oakj1DrgI7W7gPadI5zGiHCe/kd/gxghC457oot XpmL3aqr+5kRXBpVlfewhcuCqGMx1nrCcT3ElKi4IBowjvr7OZIUCsb1ZMMFu/fVjbyS AcjrZmVu/MEn+sCVV40/rH1vdG+KfmXNY6pokLxw7natGSf28toexJK46qkyPZtU78Ad ea4ulzqvc8XGvq+sOLfEiKl+OTbWT2uvyRYlkyBVYR1sRNiwPJdItDS53kvlze9zWWH1 8ZmXok5CHGdnkhFktp+dlfRcwiihvEFS4oKllBBjCCyExrNIgvalvIsWKGi+pC0PbXMG 8ouQ== 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; bh=tSUPDm4viEEMqBl4cna4myueadJJqxy+taVzEDoW/Nk=; b=VdYdv0ubC4qT6MtM7Ts2Kf84Y3P+Jt9TVRX062IrfrImtWRGolFL3iC+Tq/trl2fdK m4105zv5FGkf2CJ3VFjkJffT5X+5PGJDdsC1j0Cf6nN03uxuxy+KwmU/sYVnkgsS8Yvy mTfEI381kKbXexejm5CeKNvbLJP3ootuhsBgHupVzbe1ISS/YQrbpZMdFXS2IkRx/kTR wf0P16ezqyCrDivR0p3LFBN81eX77Sd1uk26YnwBEk0dxys2VzYA2frJLCJtdQiFxuDJ lcHUs0aNNEWTpsKei3Qhv/073q/p+LkFl2UctGMpMEQy19JnwqerWGS6DltRog8OQucQ 76Kg== X-Gm-Message-State: APjAAAUn9qhdkCjYOTn4Tygdcmm8jiHLgEuznXLa/g/TFAYLrBm4/woa aR4qZJuE0ESkfjyIT2NWddLZmS+9 X-Google-Smtp-Source: APXvYqy5HlzyfFIoNOXLR6FHpqS3Dwu3iSW631M7XGWZk/Sg4hbTBItra1hYE3w2Csj3OYjr1p4Epw== X-Received: by 2002:a5d:6384:: with SMTP id p4mr24081143wru.208.1556180139983; Thu, 25 Apr 2019 01:15:39 -0700 (PDT) Received: from localhost.localdomain ([2001:4de8:cb07:0:281b:bab3:8b58:7a6c]) by smtp.gmail.com with ESMTPSA id t24sm19086825wmi.10.2019.04.25.01.15.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Apr 2019 01:15:39 -0700 (PDT) From: Martin Vobruba To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Apr 2019 10:15:16 +0200 Message-Id: <1556180116-15861-1-git-send-email-vobruba.martin@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] 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..9b92189 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. This is mostly useful to set for high @var{n}. + +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 } };