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
5985 5985
5986@item color, colour, c5986@item color, colour, c
5987Specify the color of noise. Available noise colors are white, pink, brown,5987Specify the color of noise. Available noise colors are white, pink, brown,
5988blue and violet. Default color is white.5988blue, violet and velvet. Default color is white.
5989 5989
5990@item seed, s5990@item seed, s
5991Specify a value used to seed the PRNG.5991Specify a value used to seed the PRNG.
libavfilter/asrc_anoisesrc.c+15−7
@@ -36,7 +36,7 @@ typedef struct ANoiseSrcContext { · 35 unmodified lines
36 36
37 int64_t pts;37 int64_t pts;
38 int infinite;38 int infinite;
39 double (*filter)(double white, double *buf);39 double (*filter)(double white, double *buf, double half_amplitude);
40 double buf[7];40 double buf[7];
41 AVLFG c;41 AVLFG c;
42} ANoiseSrcContext;42} ANoiseSrcContext;
@@ -47,6 +47,7 @@ enum NoiseMode { · 4 unmodified lines
47 NM_BROWN,47 NM_BROWN,
48 NM_BLUE,48 NM_BLUE,
49 NM_VIOLET,49 NM_VIOLET,
50 NM_VELVET,
50 NM_NB51 NM_NB
51};52};
52 53
@@ -68,6 +69,7 @@ static const AVOption anoisesrc_options[] = { · 15 unmodified lines
68 { "brown", 0, 0, AV_OPT_TYPE_CONST, {.i64 = NM_BROWN}, 0, 0, FLAGS, "color" },69 { "brown", 0, 0, AV_OPT_TYPE_CONST, {.i64 = NM_BROWN}, 0, 0, FLAGS, "color" },
69 { "blue", 0, 0, AV_OPT_TYPE_CONST, {.i64 = NM_BLUE}, 0, 0, FLAGS, "color" },70 { "blue", 0, 0, AV_OPT_TYPE_CONST, {.i64 = NM_BLUE}, 0, 0, FLAGS, "color" },
70 { "violet", 0, 0, AV_OPT_TYPE_CONST, {.i64 = NM_VIOLET}, 0, 0, FLAGS, "color" },71 { "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" },
71 { "seed", "set random seed", OFFSET(seed), AV_OPT_TYPE_INT64, {.i64 = -1}, -1, UINT_MAX, FLAGS },73 { "seed", "set random seed", OFFSET(seed), AV_OPT_TYPE_INT64, {.i64 = -1}, -1, UINT_MAX, FLAGS },
72 { "s", "set random seed", OFFSET(seed), AV_OPT_TYPE_INT64, {.i64 = -1}, -1, UINT_MAX, FLAGS },74 { "s", "set random seed", OFFSET(seed), AV_OPT_TYPE_INT64, {.i64 = -1}, -1, UINT_MAX, FLAGS },
73 { "nb_samples", "set the number of samples per requested frame", OFFSET(nb_samples), AV_OPT_TYPE_INT, {.i64 = 1024}, 1, INT_MAX, FLAGS },75 { "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
111 return ff_set_common_samplerates(ctx, formats);113 return ff_set_common_samplerates(ctx, formats);
112}114}
113 115
114static double white_filter(double white, double *buf)116static double white_filter(double white, double *buf, double ha)
115{117{
116 return white;118 return white;
117}119}
118 120
119static double pink_filter(double white, double *buf)121static double pink_filter(double white, double *buf, double ha)
120{122{
121 double pink;123 double pink;
122 124
@@ -132,7 +134,7 @@ static double pink_filter(double white, double *buf) · 9 unmodified lines
132 return pink * 0.11;134 return pink * 0.11;
133}135}
134 136
135static double blue_filter(double white, double *buf)137static double blue_filter(double white, double *buf, double ha)
136{138{
137 double blue;139 double blue;
138 140
@@ -148,7 +150,7 @@ static double blue_filter(double white, double *buf) · 9 unmodified lines
148 return blue * 0.11;150 return blue * 0.11;
149}151}
150 152
151static double brown_filter(double white, double *buf)153static double brown_filter(double white, double *buf, double ha)
152{154{
153 double brown;155 double brown;
154 156
@@ -157,7 +159,7 @@ static double brown_filter(double white, double *buf) · 2 unmodified lines
157 return brown * 3.5;159 return brown * 3.5;
158}160}
159 161
160static double violet_filter(double white, double *buf)162static double violet_filter(double white, double *buf, double ha)
161{163{
162 double violet;164 double violet;
163 165
@@ -166,6 +168,11 @@ static double violet_filter(double white, double *buf) · 2 unmodified lines
166 return violet * 3.5;168 return violet * 3.5;
167}169}
168 170
171static double velvet_filter(double white, double *buf, double ha)
172{
173 return 2. * ha * ((white > ha) - (white < -ha));
174}
175
169static av_cold int config_props(AVFilterLink *outlink)176static av_cold int config_props(AVFilterLink *outlink)
170{177{
171 AVFilterContext *ctx = outlink->src;178 AVFilterContext *ctx = outlink->src;
@@ -185,6 +192,7 @@ static av_cold int config_props(AVFilterLink *outlink) · 13 unmodified lines
185 case NM_BROWN: s->filter = brown_filter; break;192 case NM_BROWN: s->filter = brown_filter; break;
186 case NM_BLUE: s->filter = blue_filter; break;193 case NM_BLUE: s->filter = blue_filter; break;
187 case NM_VIOLET: s->filter = violet_filter; break;194 case NM_VIOLET: s->filter = violet_filter; break;
195 case NM_VELVET: s->filter = velvet_filter; break;
188 }196 }
189 197
190 return 0;198 return 0;
@@ -213,7 +221,7 @@ static int request_frame(AVFilterLink *outlink) · 22 unmodified lines
213 for (i = 0; i < nb_samples; i++) {221 for (i = 0; i < nb_samples; i++) {
214 double white;222 double white;
215 white = s->amplitude * ((2 * ((double) av_lfg_get(&s->c) / 0xffffffff)) - 1);223 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);
217 }225 }
218 226
219 if (!s->infinite)227 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