[FFmpeg-cvslog] avfilter/af_biquads: use the name 's' for the pointer to the private context
Paul B Mahol
git at videolan.org
Wed Jan 28 15:43:29 CET 2015
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Jan 28 14:30:27 2015 +0000| [6121968a9e8711d61ea36e864bc8a5dbe195ce8d] | committer: Paul B Mahol
avfilter/af_biquads: use the name 's' for the pointer to the private context
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6121968a9e8711d61ea36e864bc8a5dbe195ce8d
---
libavfilter/af_biquads.c | 210 +++++++++++++++++++++++-----------------------
1 file changed, 105 insertions(+), 105 deletions(-)
diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c
index 02bf9db..10de28d 100644
--- a/libavfilter/af_biquads.c
+++ b/libavfilter/af_biquads.c
@@ -118,12 +118,12 @@ typedef struct {
static av_cold int init(AVFilterContext *ctx)
{
- BiquadsContext *p = ctx->priv;
+ BiquadsContext *s = ctx->priv;
- if (p->filter_type != biquad) {
- if (p->frequency <= 0 || p->width <= 0) {
+ if (s->filter_type != biquad) {
+ if (s->frequency <= 0 || s->width <= 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid frequency %f and/or width %f <= 0\n",
- p->frequency, p->width);
+ s->frequency, s->width);
return AVERROR(EINVAL);
}
}
@@ -233,153 +233,153 @@ BIQUAD_FILTER(dbl, double, -1., 1., 0)
static int config_output(AVFilterLink *outlink)
{
AVFilterContext *ctx = outlink->src;
- BiquadsContext *p = ctx->priv;
+ BiquadsContext *s = ctx->priv;
AVFilterLink *inlink = ctx->inputs[0];
- double A = exp(p->gain / 40 * log(10.));
- double w0 = 2 * M_PI * p->frequency / inlink->sample_rate;
+ double A = exp(s->gain / 40 * log(10.));
+ double w0 = 2 * M_PI * s->frequency / inlink->sample_rate;
double alpha;
if (w0 > M_PI) {
av_log(ctx, AV_LOG_ERROR,
"Invalid frequency %f. Frequency must be less than half the sample-rate %d.\n",
- p->frequency, inlink->sample_rate);
+ s->frequency, inlink->sample_rate);
return AVERROR(EINVAL);
}
- switch (p->width_type) {
+ switch (s->width_type) {
case NONE:
alpha = 0.0;
break;
case HERTZ:
- alpha = sin(w0) / (2 * p->frequency / p->width);
+ alpha = sin(w0) / (2 * s->frequency / s->width);
break;
case OCTAVE:
- alpha = sin(w0) * sinh(log(2.) / 2 * p->width * w0 / sin(w0));
+ alpha = sin(w0) * sinh(log(2.) / 2 * s->width * w0 / sin(w0));
break;
case QFACTOR:
- alpha = sin(w0) / (2 * p->width);
+ alpha = sin(w0) / (2 * s->width);
break;
case SLOPE:
- alpha = sin(w0) / 2 * sqrt((A + 1 / A) * (1 / p->width - 1) + 2);
+ alpha = sin(w0) / 2 * sqrt((A + 1 / A) * (1 / s->width - 1) + 2);
break;
default:
av_assert0(0);
}
- switch (p->filter_type) {
+ switch (s->filter_type) {
case biquad:
break;
case equalizer:
- p->a0 = 1 + alpha / A;
- p->a1 = -2 * cos(w0);
- p->a2 = 1 - alpha / A;
- p->b0 = 1 + alpha * A;
- p->b1 = -2 * cos(w0);
- p->b2 = 1 - alpha * A;
+ s->a0 = 1 + alpha / A;
+ s->a1 = -2 * cos(w0);
+ s->a2 = 1 - alpha / A;
+ s->b0 = 1 + alpha * A;
+ s->b1 = -2 * cos(w0);
+ s->b2 = 1 - alpha * A;
break;
case bass:
- p->a0 = (A + 1) + (A - 1) * cos(w0) + 2 * sqrt(A) * alpha;
- p->a1 = -2 * ((A - 1) + (A + 1) * cos(w0));
- p->a2 = (A + 1) + (A - 1) * cos(w0) - 2 * sqrt(A) * alpha;
- p->b0 = A * ((A + 1) - (A - 1) * cos(w0) + 2 * sqrt(A) * alpha);
- p->b1 = 2 * A * ((A - 1) - (A + 1) * cos(w0));
- p->b2 = A * ((A + 1) - (A - 1) * cos(w0) - 2 * sqrt(A) * alpha);
+ s->a0 = (A + 1) + (A - 1) * cos(w0) + 2 * sqrt(A) * alpha;
+ s->a1 = -2 * ((A - 1) + (A + 1) * cos(w0));
+ s->a2 = (A + 1) + (A - 1) * cos(w0) - 2 * sqrt(A) * alpha;
+ s->b0 = A * ((A + 1) - (A - 1) * cos(w0) + 2 * sqrt(A) * alpha);
+ s->b1 = 2 * A * ((A - 1) - (A + 1) * cos(w0));
+ s->b2 = A * ((A + 1) - (A - 1) * cos(w0) - 2 * sqrt(A) * alpha);
break;
case treble:
- p->a0 = (A + 1) - (A - 1) * cos(w0) + 2 * sqrt(A) * alpha;
- p->a1 = 2 * ((A - 1) - (A + 1) * cos(w0));
- p->a2 = (A + 1) - (A - 1) * cos(w0) - 2 * sqrt(A) * alpha;
- p->b0 = A * ((A + 1) + (A - 1) * cos(w0) + 2 * sqrt(A) * alpha);
- p->b1 =-2 * A * ((A - 1) + (A + 1) * cos(w0));
- p->b2 = A * ((A + 1) + (A - 1) * cos(w0) - 2 * sqrt(A) * alpha);
+ s->a0 = (A + 1) - (A - 1) * cos(w0) + 2 * sqrt(A) * alpha;
+ s->a1 = 2 * ((A - 1) - (A + 1) * cos(w0));
+ s->a2 = (A + 1) - (A - 1) * cos(w0) - 2 * sqrt(A) * alpha;
+ s->b0 = A * ((A + 1) + (A - 1) * cos(w0) + 2 * sqrt(A) * alpha);
+ s->b1 =-2 * A * ((A - 1) + (A + 1) * cos(w0));
+ s->b2 = A * ((A + 1) + (A - 1) * cos(w0) - 2 * sqrt(A) * alpha);
break;
case bandpass:
- if (p->csg) {
- p->a0 = 1 + alpha;
- p->a1 = -2 * cos(w0);
- p->a2 = 1 - alpha;
- p->b0 = sin(w0) / 2;
- p->b1 = 0;
- p->b2 = -sin(w0) / 2;
+ if (s->csg) {
+ s->a0 = 1 + alpha;
+ s->a1 = -2 * cos(w0);
+ s->a2 = 1 - alpha;
+ s->b0 = sin(w0) / 2;
+ s->b1 = 0;
+ s->b2 = -sin(w0) / 2;
} else {
- p->a0 = 1 + alpha;
- p->a1 = -2 * cos(w0);
- p->a2 = 1 - alpha;
- p->b0 = alpha;
- p->b1 = 0;
- p->b2 = -alpha;
+ s->a0 = 1 + alpha;
+ s->a1 = -2 * cos(w0);
+ s->a2 = 1 - alpha;
+ s->b0 = alpha;
+ s->b1 = 0;
+ s->b2 = -alpha;
}
break;
case bandreject:
- p->a0 = 1 + alpha;
- p->a1 = -2 * cos(w0);
- p->a2 = 1 - alpha;
- p->b0 = 1;
- p->b1 = -2 * cos(w0);
- p->b2 = 1;
+ s->a0 = 1 + alpha;
+ s->a1 = -2 * cos(w0);
+ s->a2 = 1 - alpha;
+ s->b0 = 1;
+ s->b1 = -2 * cos(w0);
+ s->b2 = 1;
break;
case lowpass:
- if (p->poles == 1) {
- p->a0 = 1;
- p->a1 = -exp(-w0);
- p->a2 = 0;
- p->b0 = 1 + p->a1;
- p->b1 = 0;
- p->b2 = 0;
+ if (s->poles == 1) {
+ s->a0 = 1;
+ s->a1 = -exp(-w0);
+ s->a2 = 0;
+ s->b0 = 1 + s->a1;
+ s->b1 = 0;
+ s->b2 = 0;
} else {
- p->a0 = 1 + alpha;
- p->a1 = -2 * cos(w0);
- p->a2 = 1 - alpha;
- p->b0 = (1 - cos(w0)) / 2;
- p->b1 = 1 - cos(w0);
- p->b2 = (1 - cos(w0)) / 2;
+ s->a0 = 1 + alpha;
+ s->a1 = -2 * cos(w0);
+ s->a2 = 1 - alpha;
+ s->b0 = (1 - cos(w0)) / 2;
+ s->b1 = 1 - cos(w0);
+ s->b2 = (1 - cos(w0)) / 2;
}
break;
case highpass:
- if (p->poles == 1) {
- p->a0 = 1;
- p->a1 = -exp(-w0);
- p->a2 = 0;
- p->b0 = (1 - p->a1) / 2;
- p->b1 = -p->b0;
- p->b2 = 0;
+ if (s->poles == 1) {
+ s->a0 = 1;
+ s->a1 = -exp(-w0);
+ s->a2 = 0;
+ s->b0 = (1 - s->a1) / 2;
+ s->b1 = -s->b0;
+ s->b2 = 0;
} else {
- p->a0 = 1 + alpha;
- p->a1 = -2 * cos(w0);
- p->a2 = 1 - alpha;
- p->b0 = (1 + cos(w0)) / 2;
- p->b1 = -(1 + cos(w0));
- p->b2 = (1 + cos(w0)) / 2;
+ s->a0 = 1 + alpha;
+ s->a1 = -2 * cos(w0);
+ s->a2 = 1 - alpha;
+ s->b0 = (1 + cos(w0)) / 2;
+ s->b1 = -(1 + cos(w0));
+ s->b2 = (1 + cos(w0)) / 2;
}
break;
case allpass:
- p->a0 = 1 + alpha;
- p->a1 = -2 * cos(w0);
- p->a2 = 1 - alpha;
- p->b0 = 1 - alpha;
- p->b1 = -2 * cos(w0);
- p->b2 = 1 + alpha;
+ s->a0 = 1 + alpha;
+ s->a1 = -2 * cos(w0);
+ s->a2 = 1 - alpha;
+ s->b0 = 1 - alpha;
+ s->b1 = -2 * cos(w0);
+ s->b2 = 1 + alpha;
break;
default:
av_assert0(0);
}
- p->a1 /= p->a0;
- p->a2 /= p->a0;
- p->b0 /= p->a0;
- p->b1 /= p->a0;
- p->b2 /= p->a0;
+ s->a1 /= s->a0;
+ s->a2 /= s->a0;
+ s->b0 /= s->a0;
+ s->b1 /= s->a0;
+ s->b2 /= s->a0;
- p->cache = av_realloc_f(p->cache, sizeof(ChanCache), inlink->channels);
- if (!p->cache)
+ s->cache = av_realloc_f(s->cache, sizeof(ChanCache), inlink->channels);
+ if (!s->cache)
return AVERROR(ENOMEM);
- memset(p->cache, 0, sizeof(ChanCache) * inlink->channels);
+ memset(s->cache, 0, sizeof(ChanCache) * inlink->channels);
switch (inlink->format) {
- case AV_SAMPLE_FMT_S16P: p->filter = biquad_s16; break;
- case AV_SAMPLE_FMT_S32P: p->filter = biquad_s32; break;
- case AV_SAMPLE_FMT_FLTP: p->filter = biquad_flt; break;
- case AV_SAMPLE_FMT_DBLP: p->filter = biquad_dbl; break;
+ case AV_SAMPLE_FMT_S16P: s->filter = biquad_s16; break;
+ case AV_SAMPLE_FMT_S32P: s->filter = biquad_s32; break;
+ case AV_SAMPLE_FMT_FLTP: s->filter = biquad_flt; break;
+ case AV_SAMPLE_FMT_DBLP: s->filter = biquad_dbl; break;
default: av_assert0(0);
}
@@ -388,7 +388,7 @@ static int config_output(AVFilterLink *outlink)
static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
{
- BiquadsContext *p = inlink->dst->priv;
+ BiquadsContext *s = inlink->dst->priv;
AVFilterLink *outlink = inlink->dst->outputs[0];
AVFrame *out_buf;
int nb_samples = buf->nb_samples;
@@ -404,11 +404,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
}
for (ch = 0; ch < av_frame_get_channels(buf); ch++)
- p->filter(buf->extended_data[ch],
+ s->filter(buf->extended_data[ch],
out_buf->extended_data[ch], nb_samples,
- &p->cache[ch].i1, &p->cache[ch].i2,
- &p->cache[ch].o1, &p->cache[ch].o2,
- p->b0, p->b1, p->b2, p->a1, p->a2);
+ &s->cache[ch].i1, &s->cache[ch].i2,
+ &s->cache[ch].o1, &s->cache[ch].o2,
+ s->b0, s->b1, s->b2, s->a1, s->a2);
if (buf != out_buf)
av_frame_free(&buf);
@@ -418,9 +418,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
static av_cold void uninit(AVFilterContext *ctx)
{
- BiquadsContext *p = ctx->priv;
+ BiquadsContext *s = ctx->priv;
- av_freep(&p->cache);
+ av_freep(&s->cache);
}
static const AVFilterPad inputs[] = {
@@ -448,9 +448,9 @@ static const AVFilterPad outputs[] = {
AVFILTER_DEFINE_CLASS(name_); \
static av_cold int name_##_init(AVFilterContext *ctx) \
{ \
- BiquadsContext *p = ctx->priv; \
- p->class = &name_##_class; \
- p->filter_type = name_; \
+ BiquadsContext *s = ctx->priv; \
+ s->class = &name_##_class; \
+ s->filter_type = name_; \
return init(ctx); \
} \
\
More information about the ffmpeg-cvslog
mailing list