ffmpeg-cvslog

Download

ffmpeg-cvslog@ffmpeg.org

January 2019

2 participants
282 discussions

afilter/af_sofalizer: check explicitly other type
by Paul B Mahol 01 Jan '19

01 Jan '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Jan 1 12:29:19 2019 +0100| [e1f7881d926f960cbf49f870d9c94393d5b4dbde] | committer: Paul B Mahol afilter/af_sofalizer: check explicitly other type > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1f7881d926f960cb… --- libavfilter/af_sofalizer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/af_sofalizer.c b/libavfilter/af_sofalizer.c index 48123594a6..109cf5695b 100644 --- a/libavfilter/af_sofalizer.c +++ b/libavfilter/af_sofalizer.c @@ -588,7 +588,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) if (s->type == TIME_DOMAIN) { ctx->internal->execute(ctx, sofalizer_convolute, &td, NULL, 2); - } else { + } else if (s->type == FREQUENCY_DOMAIN) { ctx->internal->execute(ctx, sofalizer_fast_convolute, &td, NULL, 2); } emms_c(); @@ -825,7 +825,7 @@ static int load_data(AVFilterContext *ctx, int azim, int elev, float radius, int if (s->type == TIME_DOMAIN) { s->ringbuffer[0] = av_calloc(s->buffer_length, sizeof(float) * nb_input_channels); s->ringbuffer[1] = av_calloc(s->buffer_length, sizeof(float) * nb_input_channels); - } else { + } else if (s->type == FREQUENCY_DOMAIN) { /* get temporary HRTF memory for L and R channel */ data_hrtf_l = av_malloc_array(n_fft, sizeof(*data_hrtf_l) * n_conv); data_hrtf_r = av_malloc_array(n_fft, sizeof(*data_hrtf_r) * n_conv); @@ -876,7 +876,7 @@ static int load_data(AVFilterContext *ctx, int azim, int elev, float radius, int s->data_ir[0][offset + j] = lir[ir_samples - 1 - j] * gain_lin; s->data_ir[1][offset + j] = rir[ir_samples - 1 - j] * gain_lin; } - } else { + } else if (s->type == FREQUENCY_DOMAIN) { memset(fft_in_l, 0, n_fft * sizeof(*fft_in_l)); memset(fft_in_r, 0, n_fft * sizeof(*fft_in_r));

1 0

doc/filters: improve afir description a little
by Paul B Mahol 01 Jan '19

01 Jan '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Jan 1 11:56:29 2019 +0100| [f7745edeaaeeb3f4f9cc0a4f545d538cd86fa418] | committer: Paul B Mahol doc/filters: improve afir description a little > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7745edeaaeeb3f4f… --- doc/filters.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index b3e2081bcf..45582dd2bd 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1165,7 +1165,7 @@ up to 60 seconds long. It can be used as component for digital crossover filters, room equalization, cross talk cancellation, wavefield synthesis, -auralization, ambiophonics and ambisonics. +auralization, ambiophonics, ambisonics and spatialization. This filter uses second stream as FIR coefficients. If second stream holds single channel, it will be used

1 0

Jump to page: