[FFmpeg-cvslog] avfilter: pass outlink to ff_get_audio_buffer()
Paul B Mahol
git at videolan.org
Wed Jan 3 23:53:31 EET 2018
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Jan 3 22:47:40 2018 +0100| [88cbd25b193dddb852bc1921b733c5dde5fee2fe] | committer: Paul B Mahol
avfilter: pass outlink to ff_get_audio_buffer()
This is more correct.
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88cbd25b193dddb852bc1921b733c5dde5fee2fe
---
libavfilter/af_acontrast.c | 2 +-
libavfilter/af_adelay.c | 2 +-
libavfilter/af_aecho.c | 2 +-
libavfilter/af_aemphasis.c | 2 +-
libavfilter/af_afade.c | 2 +-
libavfilter/af_agate.c | 2 +-
libavfilter/af_alimiter.c | 2 +-
libavfilter/af_aphaser.c | 2 +-
libavfilter/af_biquads.c | 2 +-
libavfilter/af_bs2b.c | 2 +-
libavfilter/af_chorus.c | 2 +-
libavfilter/af_compand.c | 4 ++--
libavfilter/af_compensationdelay.c | 2 +-
libavfilter/af_crossfeed.c | 2 +-
libavfilter/af_earwax.c | 2 +-
libavfilter/af_extrastereo.c | 2 +-
libavfilter/af_flanger.c | 2 +-
libavfilter/af_haas.c | 2 +-
libavfilter/af_loudnorm.c | 2 +-
libavfilter/af_replaygain.c | 2 +-
libavfilter/af_rubberband.c | 4 ++--
libavfilter/af_sidechaincompress.c | 2 +-
libavfilter/af_stereotools.c | 2 +-
libavfilter/af_stereowiden.c | 2 +-
libavfilter/af_tremolo.c | 2 +-
libavfilter/af_vibrato.c | 2 +-
libavfilter/af_volume.c | 2 +-
27 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/libavfilter/af_acontrast.c b/libavfilter/af_acontrast.c
index 8b45bd5b2b..e08053146e 100644
--- a/libavfilter/af_acontrast.c
+++ b/libavfilter/af_acontrast.c
@@ -173,7 +173,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (av_frame_is_writable(in)) {
out = in;
} else {
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(outlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c
index 983f089c21..d6d81ba7d8 100644
--- a/libavfilter/af_adelay.c
+++ b/libavfilter/af_adelay.c
@@ -192,7 +192,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
if (ctx->is_disabled || !s->delays)
return ff_filter_frame(ctx->outputs[0], frame);
- out_frame = ff_get_audio_buffer(inlink, frame->nb_samples);
+ out_frame = ff_get_audio_buffer(ctx->outputs[0], frame->nb_samples);
if (!out_frame) {
av_frame_free(&frame);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_aecho.c b/libavfilter/af_aecho.c
index cfaea3de43..b9ac18d3a4 100644
--- a/libavfilter/af_aecho.c
+++ b/libavfilter/af_aecho.c
@@ -279,7 +279,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
if (av_frame_is_writable(frame)) {
out_frame = frame;
} else {
- out_frame = ff_get_audio_buffer(inlink, frame->nb_samples);
+ out_frame = ff_get_audio_buffer(ctx->outputs[0], frame->nb_samples);
if (!out_frame) {
av_frame_free(&frame);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_aemphasis.c b/libavfilter/af_aemphasis.c
index a5b8e3058a..e1fa93affc 100644
--- a/libavfilter/af_aemphasis.c
+++ b/libavfilter/af_aemphasis.c
@@ -96,7 +96,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (av_frame_is_writable(in)) {
out = in;
} else {
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(outlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c
index 7ad124e887..4d0b31eac7 100644
--- a/libavfilter/af_afade.c
+++ b/libavfilter/af_afade.c
@@ -282,7 +282,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
if (av_frame_is_writable(buf)) {
out_buf = buf;
} else {
- out_buf = ff_get_audio_buffer(inlink, nb_samples);
+ out_buf = ff_get_audio_buffer(outlink, nb_samples);
if (!out_buf)
return AVERROR(ENOMEM);
av_frame_copy_props(out_buf, buf);
diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c
index 086a2f9cb9..ba96863a68 100644
--- a/libavfilter/af_agate.c
+++ b/libavfilter/af_agate.c
@@ -214,7 +214,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (av_frame_is_writable(in)) {
out = in;
} else {
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(outlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_alimiter.c b/libavfilter/af_alimiter.c
index 46211a710a..0fc8e6baa3 100644
--- a/libavfilter/af_alimiter.c
+++ b/libavfilter/af_alimiter.c
@@ -135,7 +135,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (av_frame_is_writable(in)) {
out = in;
} else {
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(outlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_aphaser.c b/libavfilter/af_aphaser.c
index dcffc216dd..bf46cc8fab 100644
--- a/libavfilter/af_aphaser.c
+++ b/libavfilter/af_aphaser.c
@@ -247,7 +247,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inbuf)
if (av_frame_is_writable(inbuf)) {
outbuf = inbuf;
} else {
- outbuf = ff_get_audio_buffer(inlink, inbuf->nb_samples);
+ outbuf = ff_get_audio_buffer(outlink, inbuf->nb_samples);
if (!outbuf) {
av_frame_free(&inbuf);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c
index 1d72cd5751..b0772b9fdc 100644
--- a/libavfilter/af_biquads.c
+++ b/libavfilter/af_biquads.c
@@ -417,7 +417,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
if (av_frame_is_writable(buf)) {
out_buf = buf;
} else {
- out_buf = ff_get_audio_buffer(inlink, nb_samples);
+ out_buf = ff_get_audio_buffer(outlink, nb_samples);
if (!out_buf) {
av_frame_free(&buf);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_bs2b.c b/libavfilter/af_bs2b.c
index 0942d540a6..c01b983cd3 100644
--- a/libavfilter/af_bs2b.c
+++ b/libavfilter/af_bs2b.c
@@ -135,7 +135,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
if (av_frame_is_writable(frame)) {
out_frame = frame;
} else {
- out_frame = ff_get_audio_buffer(inlink, frame->nb_samples);
+ out_frame = ff_get_audio_buffer(outlink, frame->nb_samples);
if (!out_frame) {
av_frame_free(&frame);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_chorus.c b/libavfilter/af_chorus.c
index 87c8290097..29c47ab14a 100644
--- a/libavfilter/af_chorus.c
+++ b/libavfilter/af_chorus.c
@@ -247,7 +247,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
if (av_frame_is_writable(frame)) {
out_frame = frame;
} else {
- out_frame = ff_get_audio_buffer(inlink, frame->nb_samples);
+ out_frame = ff_get_audio_buffer(ctx->outputs[0], frame->nb_samples);
if (!out_frame) {
av_frame_free(&frame);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c
index 8589b1ef09..c138f0b1d8 100644
--- a/libavfilter/af_compand.c
+++ b/libavfilter/af_compand.c
@@ -185,7 +185,7 @@ static int compand_nodelay(AVFilterContext *ctx, AVFrame *frame)
if (av_frame_is_writable(frame)) {
out_frame = frame;
} else {
- out_frame = ff_get_audio_buffer(inlink, nb_samples);
+ out_frame = ff_get_audio_buffer(ctx->outputs[0], nb_samples);
if (!out_frame) {
av_frame_free(&frame);
return AVERROR(ENOMEM);
@@ -249,7 +249,7 @@ static int compand_delay(AVFilterContext *ctx, AVFrame *frame)
if (count >= s->delay_samples) {
if (!out_frame) {
- out_frame = ff_get_audio_buffer(inlink, nb_samples - i);
+ out_frame = ff_get_audio_buffer(ctx->outputs[0], nb_samples - i);
if (!out_frame) {
av_frame_free(&frame);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_compensationdelay.c b/libavfilter/af_compensationdelay.c
index d5a3484317..05285cd297 100644
--- a/libavfilter/af_compensationdelay.c
+++ b/libavfilter/af_compensationdelay.c
@@ -131,7 +131,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
AVFrame *out;
int n, ch;
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(ctx->outputs[0], in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_crossfeed.c b/libavfilter/af_crossfeed.c
index d3def92fb3..a0af280432 100644
--- a/libavfilter/af_crossfeed.c
+++ b/libavfilter/af_crossfeed.c
@@ -99,7 +99,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (av_frame_is_writable(in)) {
out = in;
} else {
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(outlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_earwax.c b/libavfilter/af_earwax.c
index 7b880c86c6..cdd2b4fc49 100644
--- a/libavfilter/af_earwax.c
+++ b/libavfilter/af_earwax.c
@@ -115,7 +115,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
{
AVFilterLink *outlink = inlink->dst->outputs[0];
int16_t *taps, *endin, *in, *out;
- AVFrame *outsamples = ff_get_audio_buffer(inlink, insamples->nb_samples);
+ AVFrame *outsamples = ff_get_audio_buffer(outlink, insamples->nb_samples);
int len;
if (!outsamples) {
diff --git a/libavfilter/af_extrastereo.c b/libavfilter/af_extrastereo.c
index b07c006f2c..13c6f47776 100644
--- a/libavfilter/af_extrastereo.c
+++ b/libavfilter/af_extrastereo.c
@@ -71,7 +71,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (av_frame_is_writable(in)) {
out = in;
} else {
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(outlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_flanger.c b/libavfilter/af_flanger.c
index a92367c97a..b7497a12ed 100644
--- a/libavfilter/af_flanger.c
+++ b/libavfilter/af_flanger.c
@@ -148,7 +148,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
if (av_frame_is_writable(frame)) {
out_frame = frame;
} else {
- out_frame = ff_get_audio_buffer(inlink, frame->nb_samples);
+ out_frame = ff_get_audio_buffer(ctx->outputs[0], frame->nb_samples);
if (!out_frame) {
av_frame_free(&frame);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_haas.c b/libavfilter/af_haas.c
index 691c251f54..0cfc93a7d1 100644
--- a/libavfilter/af_haas.c
+++ b/libavfilter/af_haas.c
@@ -144,7 +144,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (av_frame_is_writable(in)) {
out = in;
} else {
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(outlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_loudnorm.c b/libavfilter/af_loudnorm.c
index e3e815e272..a7f11cbe6e 100644
--- a/libavfilter/af_loudnorm.c
+++ b/libavfilter/af_loudnorm.c
@@ -423,7 +423,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (av_frame_is_writable(in)) {
out = in;
} else {
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(outlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_replaygain.c b/libavfilter/af_replaygain.c
index c8f6f9666d..97617346ed 100644
--- a/libavfilter/af_replaygain.c
+++ b/libavfilter/af_replaygain.c
@@ -554,7 +554,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
uint32_t level;
AVFrame *out;
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(outlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_rubberband.c b/libavfilter/af_rubberband.c
index ded25449dd..ea6f4ff2c9 100644
--- a/libavfilter/af_rubberband.c
+++ b/libavfilter/af_rubberband.c
@@ -128,7 +128,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
nb_samples = rubberband_available(s->rbs);
if (nb_samples > 0) {
- out = ff_get_audio_buffer(inlink, nb_samples);
+ out = ff_get_audio_buffer(outlink, nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
@@ -187,7 +187,7 @@ static int request_frame(AVFilterLink *outlink)
nb_samples = rubberband_available(s->rbs);
if (nb_samples > 0) {
- out = ff_get_audio_buffer(inlink, nb_samples);
+ out = ff_get_audio_buffer(outlink, nb_samples);
if (!out)
return AVERROR(ENOMEM);
out->pts = av_rescale_q(s->nb_samples_out,
diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c
index 3c6458cd63..888049eaf0 100644
--- a/libavfilter/af_sidechaincompress.c
+++ b/libavfilter/af_sidechaincompress.c
@@ -367,7 +367,7 @@ static int acompressor_filter_frame(AVFilterLink *inlink, AVFrame *in)
if (av_frame_is_writable(in)) {
out = in;
} else {
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(outlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_stereotools.c b/libavfilter/af_stereotools.c
index a5e0b427f1..7e529783d5 100644
--- a/libavfilter/af_stereotools.c
+++ b/libavfilter/af_stereotools.c
@@ -166,7 +166,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (av_frame_is_writable(in)) {
out = in;
} else {
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(outlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_stereowiden.c b/libavfilter/af_stereowiden.c
index 24146ff1df..ef16fcec73 100644
--- a/libavfilter/af_stereowiden.c
+++ b/libavfilter/af_stereowiden.c
@@ -98,7 +98,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (av_frame_is_writable(in)) {
out = in;
} else {
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(outlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_tremolo.c b/libavfilter/af_tremolo.c
index 572e9e3b56..8cbc79892d 100644
--- a/libavfilter/af_tremolo.c
+++ b/libavfilter/af_tremolo.c
@@ -57,7 +57,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (av_frame_is_writable(in)) {
out = in;
} else {
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(outlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_vibrato.c b/libavfilter/af_vibrato.c
index c7691f2f2a..22bbab6239 100644
--- a/libavfilter/af_vibrato.c
+++ b/libavfilter/af_vibrato.c
@@ -63,7 +63,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (av_frame_is_writable(in)) {
out = in;
} else {
- out = ff_get_audio_buffer(inlink, in->nb_samples);
+ out = ff_get_audio_buffer(outlink, in->nb_samples);
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c
index 3d76f12f2c..b106ed8cf4 100644
--- a/libavfilter/af_volume.c
+++ b/libavfilter/af_volume.c
@@ -410,7 +410,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
&& (vol->precision != PRECISION_FIXED || vol->volume_i > 0)) {
out_buf = buf;
} else {
- out_buf = ff_get_audio_buffer(inlink, nb_samples);
+ out_buf = ff_get_audio_buffer(outlink, nb_samples);
if (!out_buf) {
av_frame_free(&buf);
return AVERROR(ENOMEM);
More information about the ffmpeg-cvslog
mailing list