avfilter/af_axcorrelate: add DBLP sample format support

This commit is contained in:
Paul B Mahol 2021-10-09 13:58:07 +02:00
parent 95cae4922d
commit 30d4609484
1 changed files with 146 additions and 112 deletions

View File

@ -47,126 +47,156 @@ typedef struct AudioXCorrelateContext {
int (*xcorrelate)(AVFilterContext *ctx, AVFrame *out, int available); int (*xcorrelate)(AVFilterContext *ctx, AVFrame *out, int available);
} AudioXCorrelateContext; } AudioXCorrelateContext;
static float mean_sum(const float *in, int size) #define MEAN_SUM(suffix, type, zero) \
{ static type mean_sum_##suffix(const type *in, \
float mean_sum = 0.f; int size) \
{ \
for (int i = 0; i < size; i++) type mean_sum = zero; \
mean_sum += in[i]; \
for (int i = 0; i < size; i++) \
return mean_sum; mean_sum += in[i]; \
\
return mean_sum; \
} }
static float square_sum(const float *x, const float *y, int size) MEAN_SUM(f, float, 0.f)
{ MEAN_SUM(d, double, 0.0)
float square_sum = 0.f;
for (int i = 0; i < size; i++) #define SQUARE_SUM(suffix, type, zero) \
square_sum += x[i] * y[i]; static type square_sum_##suffix(const type *x, \
const type *y, \
return square_sum; int size) \
{ \
type square_sum = zero; \
\
for (int i = 0; i < size; i++) \
square_sum += x[i] * y[i]; \
\
return square_sum; \
} }
static float xcorrelate(const float *x, const float *y, float sumx, float sumy, int size) SQUARE_SUM(f, float, 0.f)
{ SQUARE_SUM(d, double, 0.0)
const float xm = sumx / size, ym = sumy / size;
float num = 0.f, den, den0 = 0.f, den1 = 0.f;
for (int i = 0; i < size; i++) { #define XCORRELATE(suffix, type, zero, small, sqrtfun)\
float xd = x[i] - xm; static type xcorrelate_##suffix(const type *x, \
float yd = y[i] - ym; const type *y, \
type sumx, \
num += xd * yd; type sumy, int size) \
den0 += xd * xd; { \
den1 += yd * yd; const type xm = sumx / size, ym = sumy / size; \
} type num = zero, den, den0 = zero, den1 = zero; \
\
num /= size; for (int i = 0; i < size; i++) { \
den = sqrtf((den0 * den1) / size / size); type xd = x[i] - xm; \
type yd = y[i] - ym; \
return den <= 1e-6f ? 0.f : num / den; \
num += xd * yd; \
den0 += xd * xd; \
den1 += yd * yd; \
} \
\
num /= size; \
den = sqrtfun((den0 * den1) / size / size); \
\
return den <= small ? zero : num / den; \
} }
static int xcorrelate_slow(AVFilterContext *ctx, AVFrame *out, int available) XCORRELATE(f, float, 0.f, 1e-6f, sqrtf)
{ XCORRELATE(d, double, 0.0, 1e-9, sqrt)
AudioXCorrelateContext *s = ctx->priv;
const int size = FFMIN(available, s->size);
int used;
for (int ch = 0; ch < out->channels; ch++) { #define XCORRELATE_SLOW(suffix, type) \
const float *x = (const float *)s->cache[0]->extended_data[ch]; static int xcorrelate_slow_##suffix(AVFilterContext *ctx, \
const float *y = (const float *)s->cache[1]->extended_data[ch]; AVFrame *out, int available) \
float *sumx = (float *)s->mean_sum[0]->extended_data[ch]; { \
float *sumy = (float *)s->mean_sum[1]->extended_data[ch]; AudioXCorrelateContext *s = ctx->priv; \
float *dst = (float *)out->extended_data[ch]; const int size = FFMIN(available, s->size); \
int used; \
used = s->used; \
if (!used) { for (int ch = 0; ch < out->channels; ch++) { \
sumx[0] = mean_sum(x, size); const type *x = (const type *)s->cache[0]->extended_data[ch]; \
sumy[0] = mean_sum(y, size); const type *y = (const type *)s->cache[1]->extended_data[ch]; \
used = 1; type *sumx = (type *)s->mean_sum[0]->extended_data[ch]; \
} type *sumy = (type *)s->mean_sum[1]->extended_data[ch]; \
type *dst = (type *)out->extended_data[ch]; \
for (int n = 0; n < out->nb_samples; n++) { \
const int idx = available <= s->size ? out->nb_samples - n - 1 : n + size; used = s->used; \
if (!used) { \
dst[n] = xcorrelate(x + n, y + n, sumx[0], sumy[0], size); sumx[0] = mean_sum_##suffix(x, size); \
sumy[0] = mean_sum_##suffix(y, size); \
sumx[0] -= x[n]; used = 1; \
sumx[0] += x[idx]; } \
sumy[0] -= y[n]; \
sumy[0] += y[idx]; for (int n = 0; n < out->nb_samples; n++) { \
} const int idx = available <= s->size ? out->nb_samples - n - 1 : n + size; \
} \
dst[n] = xcorrelate_##suffix(x + n, y + n, \
return used; sumx[0], sumy[0], \
size); \
\
sumx[0] -= x[n]; \
sumx[0] += x[idx]; \
sumy[0] -= y[n]; \
sumy[0] += y[idx]; \
} \
} \
\
return used; \
} }
static int xcorrelate_fast(AVFilterContext *ctx, AVFrame *out, int available) XCORRELATE_SLOW(f, float)
{ XCORRELATE_SLOW(d, double)
AudioXCorrelateContext *s = ctx->priv;
const int size = FFMIN(available, s->size);
int used;
for (int ch = 0; ch < out->channels; ch++) { #define XCORRELATE_FAST(suffix, type, zero, small, sqrtfun) \
const float *x = (const float *)s->cache[0]->extended_data[ch]; static int xcorrelate_fast_##suffix(AVFilterContext *ctx, AVFrame *out, \
const float *y = (const float *)s->cache[1]->extended_data[ch]; int available) \
float *num_sum = (float *)s->num_sum->extended_data[ch]; { \
float *den_sumx = (float *)s->den_sum[0]->extended_data[ch]; AudioXCorrelateContext *s = ctx->priv; \
float *den_sumy = (float *)s->den_sum[1]->extended_data[ch]; const int size = FFMIN(available, s->size); \
float *dst = (float *)out->extended_data[ch]; int used; \
\
used = s->used; for (int ch = 0; ch < out->channels; ch++) { \
if (!used) { const type *x = (const type *)s->cache[0]->extended_data[ch]; \
num_sum[0] = square_sum(x, y, size); const type *y = (const type *)s->cache[1]->extended_data[ch]; \
den_sumx[0] = square_sum(x, x, size); type *num_sum = (type *)s->num_sum->extended_data[ch]; \
den_sumy[0] = square_sum(y, y, size); type *den_sumx = (type *)s->den_sum[0]->extended_data[ch]; \
used = 1; type *den_sumy = (type *)s->den_sum[1]->extended_data[ch]; \
} type *dst = (type *)out->extended_data[ch]; \
\
for (int n = 0; n < out->nb_samples; n++) { used = s->used; \
const int idx = available <= s->size ? out->nb_samples - n - 1 : n + size; if (!used) { \
float num, den; num_sum[0] = square_sum_##suffix(x, y, size); \
den_sumx[0] = square_sum_##suffix(x, x, size); \
num = num_sum[0] / size; den_sumy[0] = square_sum_##suffix(y, y, size); \
den = sqrtf((den_sumx[0] * den_sumy[0]) / size / size); used = 1; \
} \
dst[n] = den <= 1e-6f ? 0.f : num / den; \
for (int n = 0; n < out->nb_samples; n++) { \
num_sum[0] -= x[n] * y[n]; const int idx = available <= s->size ? out->nb_samples - n - 1 : n + size; \
num_sum[0] += x[idx] * y[idx]; type num, den; \
den_sumx[0] -= x[n] * x[n]; \
den_sumx[0] += x[idx] * x[idx]; num = num_sum[0] / size; \
den_sumx[0] = FFMAX(den_sumx[0], 0.f); den = sqrtfun((den_sumx[0] * den_sumy[0]) / size / size); \
den_sumy[0] -= y[n] * y[n]; \
den_sumy[0] += y[idx] * y[idx]; dst[n] = den <= small ? zero : num / den; \
den_sumy[0] = FFMAX(den_sumy[0], 0.f); \
} num_sum[0] -= x[n] * y[n]; \
} num_sum[0] += x[idx] * y[idx]; \
den_sumx[0] -= x[n] * x[n]; \
return used; den_sumx[0] += x[idx] * x[idx]; \
den_sumx[0] = FFMAX(den_sumx[0], zero); \
den_sumy[0] -= y[n] * y[n]; \
den_sumy[0] += y[idx] * y[idx]; \
den_sumy[0] = FFMAX(den_sumy[0], zero); \
} \
} \
\
return used; \
} }
XCORRELATE_FAST(f, float, 0.f, 1e-6f, sqrtf)
XCORRELATE_FAST(d, double, 0.0, 1e-9, sqrt)
static int activate(AVFilterContext *ctx) static int activate(AVFilterContext *ctx)
{ {
AudioXCorrelateContext *s = ctx->priv; AudioXCorrelateContext *s = ctx->priv;
@ -265,13 +295,10 @@ static int activate(AVFilterContext *ctx)
static int config_output(AVFilterLink *outlink) static int config_output(AVFilterLink *outlink)
{ {
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
AVFilterLink *inlink = ctx->inputs[0];
AudioXCorrelateContext *s = ctx->priv; AudioXCorrelateContext *s = ctx->priv;
s->pts = AV_NOPTS_VALUE; s->pts = AV_NOPTS_VALUE;
outlink->format = inlink->format;
outlink->channels = inlink->channels;
s->fifo[0] = av_audio_fifo_alloc(outlink->format, outlink->channels, s->size); s->fifo[0] = av_audio_fifo_alloc(outlink->format, outlink->channels, s->size);
s->fifo[1] = av_audio_fifo_alloc(outlink->format, outlink->channels, s->size); s->fifo[1] = av_audio_fifo_alloc(outlink->format, outlink->channels, s->size);
if (!s->fifo[0] || !s->fifo[1]) if (!s->fifo[0] || !s->fifo[1])
@ -287,8 +314,15 @@ static int config_output(AVFilterLink *outlink)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
switch (s->algo) { switch (s->algo) {
case 0: s->xcorrelate = xcorrelate_slow; break; case 0: s->xcorrelate = xcorrelate_slow_f; break;
case 1: s->xcorrelate = xcorrelate_fast; break; case 1: s->xcorrelate = xcorrelate_fast_f; break;
}
if (outlink->format == AV_SAMPLE_FMT_DBLP) {
switch (s->algo) {
case 0: s->xcorrelate = xcorrelate_slow_d; break;
case 1: s->xcorrelate = xcorrelate_fast_d; break;
}
} }
return 0; return 0;
@ -350,5 +384,5 @@ const AVFilter ff_af_axcorrelate = {
.uninit = uninit, .uninit = uninit,
FILTER_INPUTS(inputs), FILTER_INPUTS(inputs),
FILTER_OUTPUTS(outputs), FILTER_OUTPUTS(outputs),
FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP),
}; };