History

avfilter: pass outlink to ff_get_audio_buffer()

This is more correct.

Paul B Mahol committed 8 years ago

Commit 88cbd251 parent 677701c27 files · +29 −29Browse files

Unified · Split

27 files
  1. libavfilter/af_acontrast.c +1 −1
  2. libavfilter/af_adelay.c +1 −1
  3. libavfilter/af_aecho.c +1 −1
  4. libavfilter/af_aemphasis.c +1 −1
  5. libavfilter/af_afade.c +1 −1
  6. libavfilter/af_agate.c +1 −1
  7. libavfilter/af_alimiter.c +1 −1
  8. libavfilter/af_aphaser.c +1 −1
  9. libavfilter/af_biquads.c +1 −1
  10. libavfilter/af_bs2b.c +1 −1
  11. libavfilter/af_chorus.c +1 −1
  12. libavfilter/af_compand.c +2 −2
  13. libavfilter/af_compensationdelay.c +1 −1
  14. libavfilter/af_crossfeed.c +1 −1
  15. libavfilter/af_earwax.c +1 −1
  16. libavfilter/af_extrastereo.c +1 −1
  17. libavfilter/af_flanger.c +1 −1
  18. libavfilter/af_haas.c +1 −1
  19. libavfilter/af_loudnorm.c +1 −1
  20. libavfilter/af_replaygain.c +1 −1
  21. libavfilter/af_rubberband.c +2 −2
  22. libavfilter/af_sidechaincompress.c +1 −1
  23. libavfilter/af_stereotools.c +1 −1
  24. libavfilter/af_stereowiden.c +1 −1
  25. libavfilter/af_tremolo.c +1 −1
  26. libavfilter/af_vibrato.c +1 −1
  27. libavfilter/af_volume.c +1 −1
libavfilter/af_acontrast.c+1−1
@@ -173,7 +173,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 172 unmodified lines
173173 if (av_frame_is_writable(in)) {
174174 out = in;
175175 } else {
176− out = ff_get_audio_buffer(inlink, in->nb_samples);
176+ out = ff_get_audio_buffer(outlink, in->nb_samples);
177177 if (!out) {
178178 av_frame_free(&in);
179179 return AVERROR(ENOMEM);
libavfilter/af_adelay.c+1−1
@@ -192,7 +192,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 191 unmodified lines
192192 if (ctx->is_disabled || !s->delays)
193193 return ff_filter_frame(ctx->outputs[0], frame);
194194
195− out_frame = ff_get_audio_buffer(inlink, frame->nb_samples);
195+ out_frame = ff_get_audio_buffer(ctx->outputs[0], frame->nb_samples);
196196 if (!out_frame) {
197197 av_frame_free(&frame);
198198 return AVERROR(ENOMEM);
libavfilter/af_aecho.c+1−1
@@ -279,7 +279,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 278 unmodified lines
279279 if (av_frame_is_writable(frame)) {
280280 out_frame = frame;
281281 } else {
282− out_frame = ff_get_audio_buffer(inlink, frame->nb_samples);
282+ out_frame = ff_get_audio_buffer(ctx->outputs[0], frame->nb_samples);
283283 if (!out_frame) {
284284 av_frame_free(&frame);
285285 return AVERROR(ENOMEM);
libavfilter/af_aemphasis.c+1−1
@@ -96,7 +96,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 95 unmodified lines
9696 if (av_frame_is_writable(in)) {
9797 out = in;
9898 } else {
99− out = ff_get_audio_buffer(inlink, in->nb_samples);
99+ out = ff_get_audio_buffer(outlink, in->nb_samples);
100100 if (!out) {
101101 av_frame_free(&in);
102102 return AVERROR(ENOMEM);
libavfilter/af_afade.c+1−1
@@ -282,7 +282,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) · 281 unmodified lines
282282 if (av_frame_is_writable(buf)) {
283283 out_buf = buf;
284284 } else {
285− out_buf = ff_get_audio_buffer(inlink, nb_samples);
285+ out_buf = ff_get_audio_buffer(outlink, nb_samples);
286286 if (!out_buf)
287287 return AVERROR(ENOMEM);
288288 av_frame_copy_props(out_buf, buf);
libavfilter/af_agate.c+1−1
@@ -214,7 +214,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 213 unmodified lines
214214 if (av_frame_is_writable(in)) {
215215 out = in;
216216 } else {
217− out = ff_get_audio_buffer(inlink, in->nb_samples);
217+ out = ff_get_audio_buffer(outlink, in->nb_samples);
218218 if (!out) {
219219 av_frame_free(&in);
220220 return AVERROR(ENOMEM);
libavfilter/af_alimiter.c+1−1
@@ -135,7 +135,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 134 unmodified lines
135135 if (av_frame_is_writable(in)) {
136136 out = in;
137137 } else {
138− out = ff_get_audio_buffer(inlink, in->nb_samples);
138+ out = ff_get_audio_buffer(outlink, in->nb_samples);
139139 if (!out) {
140140 av_frame_free(&in);
141141 return AVERROR(ENOMEM);
libavfilter/af_aphaser.c+1−1
@@ -247,7 +247,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inbuf) · 246 unmodified lines
247247 if (av_frame_is_writable(inbuf)) {
248248 outbuf = inbuf;
249249 } else {
250− outbuf = ff_get_audio_buffer(inlink, inbuf->nb_samples);
250+ outbuf = ff_get_audio_buffer(outlink, inbuf->nb_samples);
251251 if (!outbuf) {
252252 av_frame_free(&inbuf);
253253 return AVERROR(ENOMEM);
libavfilter/af_biquads.c+1−1
@@ -417,7 +417,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) · 416 unmodified lines
417417 if (av_frame_is_writable(buf)) {
418418 out_buf = buf;
419419 } else {
420− out_buf = ff_get_audio_buffer(inlink, nb_samples);
420+ out_buf = ff_get_audio_buffer(outlink, nb_samples);
421421 if (!out_buf) {
422422 av_frame_free(&buf);
423423 return AVERROR(ENOMEM);
libavfilter/af_bs2b.c+1−1
@@ -135,7 +135,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 134 unmodified lines
135135 if (av_frame_is_writable(frame)) {
136136 out_frame = frame;
137137 } else {
138− out_frame = ff_get_audio_buffer(inlink, frame->nb_samples);
138+ out_frame = ff_get_audio_buffer(outlink, frame->nb_samples);
139139 if (!out_frame) {
140140 av_frame_free(&frame);
141141 return AVERROR(ENOMEM);
libavfilter/af_chorus.c+1−1
@@ -247,7 +247,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 246 unmodified lines
247247 if (av_frame_is_writable(frame)) {
248248 out_frame = frame;
249249 } else {
250− out_frame = ff_get_audio_buffer(inlink, frame->nb_samples);
250+ out_frame = ff_get_audio_buffer(ctx->outputs[0], frame->nb_samples);
251251 if (!out_frame) {
252252 av_frame_free(&frame);
253253 return AVERROR(ENOMEM);
libavfilter/af_compand.c+2−2
@@ -185,7 +185,7 @@ static int compand_nodelay(AVFilterContext *ctx, AVFrame *frame) · 184 unmodified lines
185185 if (av_frame_is_writable(frame)) {
186186 out_frame = frame;
187187 } else {
188− out_frame = ff_get_audio_buffer(inlink, nb_samples);
188+ out_frame = ff_get_audio_buffer(ctx->outputs[0], nb_samples);
189189 if (!out_frame) {
190190 av_frame_free(&frame);
191191 return AVERROR(ENOMEM);
@@ -249,7 +249,7 @@ static int compand_delay(AVFilterContext *ctx, AVFrame *frame) · 57 unmodified lines
249249
250250 if (count >= s->delay_samples) {
251251 if (!out_frame) {
252− out_frame = ff_get_audio_buffer(inlink, nb_samples - i);
252+ out_frame = ff_get_audio_buffer(ctx->outputs[0], nb_samples - i);
253253 if (!out_frame) {
254254 av_frame_free(&frame);
255255 return AVERROR(ENOMEM);
libavfilter/af_compensationdelay.c+1−1
@@ -131,7 +131,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 130 unmodified lines
131131 AVFrame *out;
132132 int n, ch;
133133
134− out = ff_get_audio_buffer(inlink, in->nb_samples);
134+ out = ff_get_audio_buffer(ctx->outputs[0], in->nb_samples);
135135 if (!out) {
136136 av_frame_free(&in);
137137 return AVERROR(ENOMEM);
libavfilter/af_crossfeed.c+1−1
@@ -99,7 +99,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 98 unmodified lines
9999 if (av_frame_is_writable(in)) {
100100 out = in;
101101 } else {
102− out = ff_get_audio_buffer(inlink, in->nb_samples);
102+ out = ff_get_audio_buffer(outlink, in->nb_samples);
103103 if (!out) {
104104 av_frame_free(&in);
105105 return AVERROR(ENOMEM);
libavfilter/af_earwax.c+1−1
@@ -115,7 +115,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) · 114 unmodified lines
115115 {
116116 AVFilterLink *outlink = inlink->dst->outputs[0];
117117 int16_t *taps, *endin, *in, *out;
118− AVFrame *outsamples = ff_get_audio_buffer(inlink, insamples->nb_samples);
118+ AVFrame *outsamples = ff_get_audio_buffer(outlink, insamples->nb_samples);
119119 int len;
120120
121121 if (!outsamples) {
libavfilter/af_extrastereo.c+1−1
@@ -71,7 +71,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 70 unmodified lines
7171 if (av_frame_is_writable(in)) {
7272 out = in;
7373 } else {
74− out = ff_get_audio_buffer(inlink, in->nb_samples);
74+ out = ff_get_audio_buffer(outlink, in->nb_samples);
7575 if (!out) {
7676 av_frame_free(&in);
7777 return AVERROR(ENOMEM);
libavfilter/af_flanger.c+1−1
@@ -148,7 +148,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 147 unmodified lines
148148 if (av_frame_is_writable(frame)) {
149149 out_frame = frame;
150150 } else {
151− out_frame = ff_get_audio_buffer(inlink, frame->nb_samples);
151+ out_frame = ff_get_audio_buffer(ctx->outputs[0], frame->nb_samples);
152152 if (!out_frame) {
153153 av_frame_free(&frame);
154154 return AVERROR(ENOMEM);
libavfilter/af_haas.c+1−1
@@ -144,7 +144,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 143 unmodified lines
144144 if (av_frame_is_writable(in)) {
145145 out = in;
146146 } else {
147− out = ff_get_audio_buffer(inlink, in->nb_samples);
147+ out = ff_get_audio_buffer(outlink, in->nb_samples);
148148 if (!out) {
149149 av_frame_free(&in);
150150 return AVERROR(ENOMEM);
libavfilter/af_loudnorm.c+1−1
@@ -423,7 +423,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 422 unmodified lines
423423 if (av_frame_is_writable(in)) {
424424 out = in;
425425 } else {
426− out = ff_get_audio_buffer(inlink, in->nb_samples);
426+ out = ff_get_audio_buffer(outlink, in->nb_samples);
427427 if (!out) {
428428 av_frame_free(&in);
429429 return AVERROR(ENOMEM);
libavfilter/af_replaygain.c+1−1
@@ -554,7 +554,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 553 unmodified lines
554554 uint32_t level;
555555 AVFrame *out;
556556
557− out = ff_get_audio_buffer(inlink, in->nb_samples);
557+ out = ff_get_audio_buffer(outlink, in->nb_samples);
558558 if (!out) {
559559 av_frame_free(&in);
560560 return AVERROR(ENOMEM);
libavfilter/af_rubberband.c+2−2
@@ -128,7 +128,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 127 unmodified lines
128128
129129 nb_samples = rubberband_available(s->rbs);
130130 if (nb_samples > 0) {
131− out = ff_get_audio_buffer(inlink, nb_samples);
131+ out = ff_get_audio_buffer(outlink, nb_samples);
132132 if (!out) {
133133 av_frame_free(&in);
134134 return AVERROR(ENOMEM);
@@ -187,7 +187,7 @@ static int request_frame(AVFilterLink *outlink) · 52 unmodified lines
187187 nb_samples = rubberband_available(s->rbs);
188188
189189 if (nb_samples > 0) {
190− out = ff_get_audio_buffer(inlink, nb_samples);
190+ out = ff_get_audio_buffer(outlink, nb_samples);
191191 if (!out)
192192 return AVERROR(ENOMEM);
193193 out->pts = av_rescale_q(s->nb_samples_out,
libavfilter/af_sidechaincompress.c+1−1
@@ -367,7 +367,7 @@ static int acompressor_filter_frame(AVFilterLink *inlink, AVFrame *in) · 366 unmodified lines
367367 if (av_frame_is_writable(in)) {
368368 out = in;
369369 } else {
370− out = ff_get_audio_buffer(inlink, in->nb_samples);
370+ out = ff_get_audio_buffer(outlink, in->nb_samples);
371371 if (!out) {
372372 av_frame_free(&in);
373373 return AVERROR(ENOMEM);
libavfilter/af_stereotools.c+1−1
@@ -166,7 +166,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 165 unmodified lines
166166 if (av_frame_is_writable(in)) {
167167 out = in;
168168 } else {
169− out = ff_get_audio_buffer(inlink, in->nb_samples);
169+ out = ff_get_audio_buffer(outlink, in->nb_samples);
170170 if (!out) {
171171 av_frame_free(&in);
172172 return AVERROR(ENOMEM);
libavfilter/af_stereowiden.c+1−1
@@ -98,7 +98,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 97 unmodified lines
9898 if (av_frame_is_writable(in)) {
9999 out = in;
100100 } else {
101− out = ff_get_audio_buffer(inlink, in->nb_samples);
101+ out = ff_get_audio_buffer(outlink, in->nb_samples);
102102 if (!out) {
103103 av_frame_free(&in);
104104 return AVERROR(ENOMEM);
libavfilter/af_tremolo.c+1−1
@@ -57,7 +57,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 56 unmodified lines
5757 if (av_frame_is_writable(in)) {
5858 out = in;
5959 } else {
60− out = ff_get_audio_buffer(inlink, in->nb_samples);
60+ out = ff_get_audio_buffer(outlink, in->nb_samples);
6161 if (!out) {
6262 av_frame_free(&in);
6363 return AVERROR(ENOMEM);
libavfilter/af_vibrato.c+1−1
@@ -63,7 +63,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 62 unmodified lines
6363 if (av_frame_is_writable(in)) {
6464 out = in;
6565 } else {
66− out = ff_get_audio_buffer(inlink, in->nb_samples);
66+ out = ff_get_audio_buffer(outlink, in->nb_samples);
6767 if (!out) {
6868 av_frame_free(&in);
6969 return AVERROR(ENOMEM);
libavfilter/af_volume.c+1−1
@@ -410,7 +410,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) · 409 unmodified lines
410410 && (vol->precision != PRECISION_FIXED || vol->volume_i > 0)) {
411411 out_buf = buf;
412412 } else {
413− out_buf = ff_get_audio_buffer(inlink, nb_samples);
413+ out_buf = ff_get_audio_buffer(outlink, nb_samples);
414414 if (!out_buf) {
415415 av_frame_free(&buf);
416416 return AVERROR(ENOMEM);

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