History

avfilter/asrc_anoisesrc: add velvet noise

Paul B Mahol committed 6 years ago

Commit 273886f1 parent fdddc0d2 files · +16 −8Browse files

Unified · Split

2 files
  1. doc/filters.texi +1 −1
  2. libavfilter/asrc_anoisesrc.c +15 −7
doc/filters.texi+1−1
@@ -5985,7 +5985,7 @@ results in noise with an infinite length. · 5984 unmodified lines
59855985
59865986 @item color, colour, c
59875987 Specify the color of noise. Available noise colors are white, pink, brown,
5988−blue and violet. Default color is white.
5988+blue, violet and velvet. Default color is white.
59895989
59905990 @item seed, s
59915991 Specify a value used to seed the PRNG.
libavfilter/asrc_anoisesrc.c+15−7
@@ -36,7 +36,7 @@ typedef struct ANoiseSrcContext { · 35 unmodified lines
3636
3737 int64_t pts;
3838 int infinite;
39− double (*filter)(double white, double *buf);
39+ double (*filter)(double white, double *buf, double half_amplitude);
4040 double buf[7];
4141 AVLFG c;
4242 } ANoiseSrcContext;
@@ -47,6 +47,7 @@ enum NoiseMode { · 4 unmodified lines
4747 NM_BROWN,
4848 NM_BLUE,
4949 NM_VIOLET,
50+ NM_VELVET,
5051 NM_NB
5152 };
5253
@@ -68,6 +69,7 @@ static const AVOption anoisesrc_options[] = { · 15 unmodified lines
6869 { "brown", 0, 0, AV_OPT_TYPE_CONST, {.i64 = NM_BROWN}, 0, 0, FLAGS, "color" },
6970 { "blue", 0, 0, AV_OPT_TYPE_CONST, {.i64 = NM_BLUE}, 0, 0, FLAGS, "color" },
7071 { "violet", 0, 0, AV_OPT_TYPE_CONST, {.i64 = NM_VIOLET}, 0, 0, FLAGS, "color" },
72+ { "velvet", 0, 0, AV_OPT_TYPE_CONST, {.i64 = NM_VELVET}, 0, 0, FLAGS, "color" },
7173 { "seed", "set random seed", OFFSET(seed), AV_OPT_TYPE_INT64, {.i64 = -1}, -1, UINT_MAX, FLAGS },
7274 { "s", "set random seed", OFFSET(seed), AV_OPT_TYPE_INT64, {.i64 = -1}, -1, UINT_MAX, FLAGS },
7375 { "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) · 37 unmodified lines
111113 return ff_set_common_samplerates(ctx, formats);
112114 }
113115
114−static double white_filter(double white, double *buf)
116+static double white_filter(double white, double *buf, double ha)
115117 {
116118 return white;
117119 }
118120
119−static double pink_filter(double white, double *buf)
121+static double pink_filter(double white, double *buf, double ha)
120122 {
121123 double pink;
122124
@@ -132,7 +134,7 @@ static double pink_filter(double white, double *buf) · 9 unmodified lines
132134 return pink * 0.11;
133135 }
134136
135−static double blue_filter(double white, double *buf)
137+static double blue_filter(double white, double *buf, double ha)
136138 {
137139 double blue;
138140
@@ -148,7 +150,7 @@ static double blue_filter(double white, double *buf) · 9 unmodified lines
148150 return blue * 0.11;
149151 }
150152
151−static double brown_filter(double white, double *buf)
153+static double brown_filter(double white, double *buf, double ha)
152154 {
153155 double brown;
154156
@@ -157,7 +159,7 @@ static double brown_filter(double white, double *buf) · 2 unmodified lines
157159 return brown * 3.5;
158160 }
159161
160−static double violet_filter(double white, double *buf)
162+static double violet_filter(double white, double *buf, double ha)
161163 {
162164 double violet;
163165
@@ -166,6 +168,11 @@ static double violet_filter(double white, double *buf) · 2 unmodified lines
166168 return violet * 3.5;
167169 }
168170
171+static double velvet_filter(double white, double *buf, double ha)
172+{
173+ return 2. * ha * ((white > ha) - (white < -ha));
174+}
175+
169176 static av_cold int config_props(AVFilterLink *outlink)
170177 {
171178 AVFilterContext *ctx = outlink->src;
@@ -185,6 +192,7 @@ static av_cold int config_props(AVFilterLink *outlink) · 13 unmodified lines
185192 case NM_BROWN: s->filter = brown_filter; break;
186193 case NM_BLUE: s->filter = blue_filter; break;
187194 case NM_VIOLET: s->filter = violet_filter; break;
195+ case NM_VELVET: s->filter = velvet_filter; break;
188196 }
189197
190198 return 0;
@@ -213,7 +221,7 @@ static int request_frame(AVFilterLink *outlink) · 22 unmodified lines
213221 for (i = 0; i < nb_samples; i++) {
214222 double white;
215223 white = s->amplitude * ((2 * ((double) av_lfg_get(&s->c) / 0xffffffff)) - 1);
216− dst[i] = s->filter(white, s->buf);
224+ dst[i] = s->filter(white, s->buf, s->amplitude * 0.5);
217225 }
218226
219227 if (!s->infinite)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t