#include "libavutil/opt.h"
#include "audio.h"
#include "avfilter.h"
+#include "filters.h"
#include "internal.h"
#include "libavutil/lfg.h"
#include "libavutil/random_seed.h"
int sample_rate;
double amplitude;
int64_t duration;
- int64_t color;
+ int color;
int64_t seed;
int nb_samples;
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;
NM_BROWN,
NM_BLUE,
NM_VIOLET,
+ NM_VELVET,
NM_NB
};
{ "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 },
if (ret < 0)
return ret;
- layouts = avfilter_make_format64_list(chlayouts);
+ layouts = ff_make_format64_list(chlayouts);
if (!layouts)
return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts);
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;
return pink * 0.11;
}
-static double blue_filter(double white, double *buf)
+static double blue_filter(double white, double *buf, double ha)
{
double blue;
return blue * 0.11;
}
-static double brown_filter(double white, double *buf)
+static double brown_filter(double white, double *buf, double ha)
{
double brown;
return brown * 3.5;
}
-static double violet_filter(double white, double *buf)
+static double violet_filter(double white, double *buf, double ha)
{
double violet;
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;
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;
}
-static int request_frame(AVFilterLink *outlink)
+static int activate(AVFilterContext *ctx)
{
- AVFilterContext *ctx = outlink->src;
+ AVFilterLink *outlink = ctx->outputs[0];
ANoiseSrcContext *s = ctx->priv;
AVFrame *frame;
int nb_samples, i;
double *dst;
+ if (!ff_outlink_frame_wanted(outlink))
+ return FFERROR_NOT_READY;
+
if (!s->infinite && s->duration <= 0) {
- return AVERROR_EOF;
+ ff_outlink_set_status(outlink, AVERROR_EOF, s->pts);
+ return 0;
} else if (!s->infinite && s->duration < s->nb_samples) {
nb_samples = s->duration;
} else {
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)
{
.name = "default",
.type = AVMEDIA_TYPE_AUDIO,
- .request_frame = request_frame,
.config_props = config_props,
},
{ NULL }
};
-AVFilter ff_asrc_anoisesrc = {
+const AVFilter ff_asrc_anoisesrc = {
.name = "anoisesrc",
.description = NULL_IF_CONFIG_SMALL("Generate a noise audio signal."),
.query_formats = query_formats,
.priv_size = sizeof(ANoiseSrcContext),
.inputs = NULL,
+ .activate = activate,
.outputs = anoisesrc_outputs,
.priv_class = &anoisesrc_class,
};