History

avfilter/af_asubboost: use transposed II form

Paul B Mahol committed 6 years ago

Commit 8750c8f1 parent 6d59d691 file · +14 −14Browse files

Unified · Split

libavfilter/af_asubboost.c+14−14
@@ -40,7 +40,7 @@ typedef struct ASubBoostContext { · 39 unmodified lines
4040 int write_pos;
4141 int buffer_samples;
4242
43− AVFrame *i, *o;
43+ AVFrame *w;
4444 AVFrame *buffer;
4545 } ASubBoostContext;
4646
@@ -104,9 +104,8 @@ static int config_input(AVFilterLink *inlink) · 57 unmodified lines
104104 ASubBoostContext *s = ctx->priv;
105105
106106 s->buffer = ff_get_audio_buffer(inlink, inlink->sample_rate / 10);
107− s->i = ff_get_audio_buffer(inlink, 2);
108− s->o = ff_get_audio_buffer(inlink, 2);
109− if (!s->buffer || !s->i || !s->o)
107+ s->w = ff_get_audio_buffer(inlink, 2);
108+ if (!s->buffer || !s->w)
110109 return AVERROR(ENOMEM);
111110
112111 return get_coeffs(ctx);
@@ -117,7 +116,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 4 unmodified lines
117116 AVFilterContext *ctx = inlink->dst;
118117 AVFilterLink *outlink = ctx->outputs[0];
119118 ASubBoostContext *s = ctx->priv;
120− const float wet = s->wet_gain, dry = s->dry_gain, feedback = s->feedback, decay = s->decay;
119+ const double wet = s->wet_gain, dry = s->dry_gain, feedback = s->feedback, decay = s->decay;
120+ const double b0 = s->b0;
121+ const double b1 = s->b1;
122+ const double b2 = s->b2;
123+ const double a1 = -s->a1;
124+ const double a2 = -s->a2;
121125 int write_pos;
122126 AVFrame *out;
123127
@@ -136,18 +140,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 12 unmodified lines
136140 const double *src = (const double *)in->extended_data[ch];
137141 double *dst = (double *)out->extended_data[ch];
138142 double *buffer = (double *)s->buffer->extended_data[ch];
139− double *ix = (double *)s->i->extended_data[ch];
140− double *ox = (double *)s->o->extended_data[ch];
143+ double *w = (double *)s->w->extended_data[ch];
141144
142145 write_pos = s->write_pos;
143146 for (int n = 0; n < in->nb_samples; n++) {
144147 double out_sample;
145148
146− out_sample = src[n] * s->b0 + ix[0] * s->b1 + ix[1] * s->b2 - ox[0] * s->a1 - ox[1] * s->a2;
147− ix[1] = ix[0];
148− ix[0] = src[n];
149− ox[1] = ox[0];
150− ox[0] = out_sample;
149+ out_sample = src[n] * b0 + w[0];
150+ w[0] = b1 * src[n] + w[1] + a1 * out_sample;
151+ w[1] = b2 * src[n] + a2 * out_sample;
151152
152153 buffer[write_pos] = buffer[write_pos] * decay + out_sample * feedback;
153154 dst[n] = src[n] * dry + buffer[write_pos] * wet;
@@ -169,8 +170,7 @@ static av_cold void uninit(AVFilterContext *ctx) · 15 unmodified lines
169170 ASubBoostContext *s = ctx->priv;
170171
171172 av_frame_free(&s->buffer);
172− av_frame_free(&s->i);
173− av_frame_free(&s->o);
173+ av_frame_free(&s->w);
174174 }
175175
176176 static int process_command(AVFilterContext *ctx, const char *cmd, const char *args,

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