From patchwork Mon Jan 13 16:57:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 17325 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 31CB044B4F2 for ; Mon, 13 Jan 2020 18:57:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1963068AF2E; Mon, 13 Jan 2020 18:57:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6304968AEC9 for ; Mon, 13 Jan 2020 18:57:51 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id q9so10527428wmj.5 for ; Mon, 13 Jan 2020 08:57:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=rPu22uXb0vKBRcfipl7a3gzoFXHP9GuWzTNt+XTxNFY=; b=oDGii3+bmQozg26B8iavtBR3zsw+c29GsZPFdIqQBQ8lMXL/HWlLbK955Zz+AU1NK6 a6YXo8ob4Zk/b7ozY+BeWvhZ4PNV36rwVFxATec/5f1Z+RnziZc+fVynuluk8HJ+RJBn DTK1uWTAxn3D/muz41ykhwGJjmfKUmlPA2T+IjNnY0qoNoGXMobSDJ2amAoUm+QQjO/W k2PfgvdvXGW15AYxHxXoVQBxt1x8zno0qT/I9Ia/NOhnhEW6XmcSbMyv9oI6mcNiw27m tCa6441MOTkeXWPi1C32iD950DtZJg0wAaBFU4MvrIhlnt5iJMqhUZdRBn+2s32sAdfD YdlQ== 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=rPu22uXb0vKBRcfipl7a3gzoFXHP9GuWzTNt+XTxNFY=; b=L4aVlfGt/6ijmuoLz4O5uOSJxZ5YngBN3xStTcF6QRqhUe84Lbb3QCnAIuUeZeaXF1 Fva4STADAq3C+umJXD96+uOxMCGsi3yDZpN2JlF4HNJ3gCu7pj43+AaBU9EaFXTrRwkj 2R0YMmWniOkV9oH0nqmLnkCIKg6X7qj9RgNN+Dr4s36OwiioL0UUO7Kz3mFavESFuTzE JZZeGH/6dIO+6dHhAKifwB4ipRDOxDqnoOAQGw7bqQbEHxPpnaQygshWFBA7j3Id1Wk9 Tzzl90IWtrYMz8lj3xtEZrdQYd0BmKHfxkd56Y7jAZBSk8dYjWRDGQoNtzxoxOZYECKE SBhg== X-Gm-Message-State: APjAAAW2XKQvlkqDpMQuDkFCyPI/xa0NlGlJRbdvGyqBDi6BCPUfTGKL 3piQKvjhVuAGuZVRlnlAF2VuH4HEXYs= X-Google-Smtp-Source: APXvYqxQDqO9Y4fFj4kquXUvFVreDhgieOpUPDsM5a7JawW0Yql5GBsH7AEY6f1mLglF8+SmYts5hw== X-Received: by 2002:a1c:1f56:: with SMTP id f83mr21593746wmf.93.1578934669991; Mon, 13 Jan 2020 08:57:49 -0800 (PST) Received: from localhost.localdomain ([109.227.51.81]) by smtp.gmail.com with ESMTPSA id o129sm15031647wmb.1.2020.01.13.08.57.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jan 2020 08:57:49 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jan 2020 17:57:39 +0100 Message-Id: <20200113165739.13698-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter/asrc_anoisesrc: add velvet noise 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: Paul B Mahol --- doc/filters.texi | 2 +- libavfilter/asrc_anoisesrc.c | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index e691ec0bb2..ba070d40a8 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -5985,7 +5985,7 @@ results in noise with an infinite length. @item color, colour, c Specify the color of noise. Available noise colors are white, pink, brown, -blue and violet. Default color is white. +blue, violet and velvet. Default color is white. @item seed, s Specify a value used to seed the PRNG. diff --git a/libavfilter/asrc_anoisesrc.c b/libavfilter/asrc_anoisesrc.c index cedadde6c9..ebcc446ae1 100644 --- a/libavfilter/asrc_anoisesrc.c +++ b/libavfilter/asrc_anoisesrc.c @@ -36,7 +36,7 @@ typedef struct ANoiseSrcContext { int64_t pts; int infinite; - double (*filter)(double white, double *buf); + double (*filter)(double white, double *buf, double half_amplitude); double buf[7]; AVLFG c; } ANoiseSrcContext; @@ -47,6 +47,7 @@ enum NoiseMode { NM_BROWN, NM_BLUE, NM_VIOLET, + NM_VELVET, NM_NB }; @@ -68,6 +69,7 @@ static const AVOption anoisesrc_options[] = { { "brown", 0, 0, AV_OPT_TYPE_CONST, {.i64 = NM_BROWN}, 0, 0, FLAGS, "color" }, { "blue", 0, 0, AV_OPT_TYPE_CONST, {.i64 = NM_BLUE}, 0, 0, FLAGS, "color" }, { "violet", 0, 0, AV_OPT_TYPE_CONST, {.i64 = NM_VIOLET}, 0, 0, FLAGS, "color" }, + { "velvet", 0, 0, AV_OPT_TYPE_CONST, {.i64 = NM_VELVET}, 0, 0, FLAGS, "color" }, { "seed", "set random seed", OFFSET(seed), AV_OPT_TYPE_INT64, {.i64 = -1}, -1, UINT_MAX, FLAGS }, { "s", "set random seed", OFFSET(seed), AV_OPT_TYPE_INT64, {.i64 = -1}, -1, UINT_MAX, FLAGS }, { "nb_samples", "set the number of samples per requested frame", OFFSET(nb_samples), AV_OPT_TYPE_INT, {.i64 = 1024}, 1, INT_MAX, FLAGS }, @@ -111,12 +113,12 @@ static av_cold int query_formats(AVFilterContext *ctx) return ff_set_common_samplerates(ctx, formats); } -static double white_filter(double white, double *buf) +static double white_filter(double white, double *buf, double ha) { return white; } -static double pink_filter(double white, double *buf) +static double pink_filter(double white, double *buf, double ha) { double pink; @@ -132,7 +134,7 @@ static double pink_filter(double white, double *buf) return pink * 0.11; } -static double blue_filter(double white, double *buf) +static double blue_filter(double white, double *buf, double ha) { double blue; @@ -148,7 +150,7 @@ static double blue_filter(double white, double *buf) return blue * 0.11; } -static double brown_filter(double white, double *buf) +static double brown_filter(double white, double *buf, double ha) { double brown; @@ -157,7 +159,7 @@ static double brown_filter(double white, double *buf) return brown * 3.5; } -static double violet_filter(double white, double *buf) +static double violet_filter(double white, double *buf, double ha) { double violet; @@ -166,6 +168,11 @@ static double violet_filter(double white, double *buf) return violet * 3.5; } +static double velvet_filter(double white, double *buf, double ha) +{ + return 2. * ha * ((white > ha) - (white < -ha)); +} + static av_cold int config_props(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -185,6 +192,7 @@ static av_cold int config_props(AVFilterLink *outlink) case NM_BROWN: s->filter = brown_filter; break; case NM_BLUE: s->filter = blue_filter; break; case NM_VIOLET: s->filter = violet_filter; break; + case NM_VELVET: s->filter = velvet_filter; break; } return 0; @@ -213,7 +221,7 @@ static int request_frame(AVFilterLink *outlink) for (i = 0; i < nb_samples; i++) { double white; white = s->amplitude * ((2 * ((double) av_lfg_get(&s->c) / 0xffffffff)) - 1); - dst[i] = s->filter(white, s->buf); + dst[i] = s->filter(white, s->buf, s->amplitude * 0.5); } if (!s->infinite)