virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

avfilter/af_headphone: improve stereo hrir support

Browse Source 
Until now, in some cases produced output would be wrong.
This commit is contained in:
Paul B Mahol 2022-02-19 13:38:56 +01:00
parent 1372b30db2
commit c439c6b191
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavfilter/af_headphone.c
View File

@ -82,7 +82,9 @@ typedef struct HeadphoneContext {
int ir_len; int ir_len;
int eof; int eof;
} hrir_in[64]; } hrir_in[64];
uint64_t map_channel_layout;
uint64_t mapping[64]; uint64_t mapping[64];
uint8_t hrir_map[64];
} HeadphoneContext; } HeadphoneContext;
static int parse_channel_name(const char *arg, uint64_t *rchannel) static int parse_channel_name(const char *arg, uint64_t *rchannel)
@ -118,6 +120,7 @@ static void parse_map(AVFilterContext *ctx)
s->mapping[s->nb_irs] = out_channel; s->mapping[s->nb_irs] = out_channel;
s->nb_irs++; s->nb_irs++;
} }
s->map_channel_layout = used_channels;
if (s->hrir_fmt == HRIR_MULTI) if (s->hrir_fmt == HRIR_MULTI)
s->nb_hrir_inputs = 1; s->nb_hrir_inputs = 1;
@ -262,7 +265,7 @@ static int headphone_fast_convolute(AVFilterContext *ctx, void *arg, int jobnr,
} }
offset = i * n_fft; offset = i * n_fft;
hrtf_offset = hrtf + offset; hrtf_offset = hrtf + s->hrir_map[i] * n_fft;
memset(fft_in, 0, sizeof(AVComplexFloat) * n_fft); memset(fft_in, 0, sizeof(AVComplexFloat) * n_fft);
@ -361,6 +364,7 @@ static int convert_coeffs(AVFilterContext *ctx, AVFilterLink *inlink)
struct HeadphoneContext *s = ctx->priv; struct HeadphoneContext *s = ctx->priv;
const int ir_len = s->ir_len; const int ir_len = s->ir_len;
int nb_input_channels = ctx->inputs[0]->channels; int nb_input_channels = ctx->inputs[0]->channels;
const int nb_hrir_channels = s->nb_hrir_inputs == 1 ? ctx->inputs[1]->channels : s->nb_hrir_inputs * 2;
float gain_lin = expf((s->gain - 3 * nb_input_channels) / 20 * M_LN10); float gain_lin = expf((s->gain - 3 * nb_input_channels) / 20 * M_LN10);
AVFrame *frame; AVFrame *frame;
int ret = 0; int ret = 0;
@ -426,15 +430,15 @@ static int convert_coeffs(AVFilterContext *ctx, AVFilterLink *inlink)
s->temp_src[0] = av_calloc(s->air_len, sizeof(float)); s->temp_src[0] = av_calloc(s->air_len, sizeof(float));
s->temp_src[1] = av_calloc(s->air_len, sizeof(float)); s->temp_src[1] = av_calloc(s->air_len, sizeof(float));
s->data_ir[0] = av_calloc(nb_input_channels * s->air_len, sizeof(*s->data_ir[0])); s->data_ir[0] = av_calloc(nb_hrir_channels * s->air_len, sizeof(*s->data_ir[0]));
s->data_ir[1] = av_calloc(nb_input_channels * s->air_len, sizeof(*s->data_ir[1])); s->data_ir[1] = av_calloc(nb_hrir_channels * s->air_len, sizeof(*s->data_ir[1]));
if (!s->data_ir[0] || !s->data_ir[1] || !s->temp_src[0] || !s->temp_src[1]) { if (!s->data_ir[0] || !s->data_ir[1] || !s->temp_src[0] || !s->temp_src[1]) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }
} else { } else {
s->data_hrtf[0] = av_calloc(n_fft, sizeof(*s->data_hrtf[0]) * nb_input_channels); s->data_hrtf[0] = av_calloc(n_fft, sizeof(*s->data_hrtf[0]) * nb_hrir_channels);
s->data_hrtf[1] = av_calloc(n_fft, sizeof(*s->data_hrtf[1]) * nb_input_channels); s->data_hrtf[1] = av_calloc(n_fft, sizeof(*s->data_hrtf[1]) * nb_hrir_channels);
if (!s->data_hrtf[0] || !s->data_hrtf[1]) { if (!s->data_hrtf[0] || !s->data_hrtf[1]) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
@ -451,10 +455,12 @@ static int convert_coeffs(AVFilterContext *ctx, AVFilterLink *inlink)
ptr = (float *)frame->extended_data[0]; ptr = (float *)frame->extended_data[0];
if (s->hrir_fmt == HRIR_STEREO) { if (s->hrir_fmt == HRIR_STEREO) {
int idx = av_get_channel_layout_channel_index(inlink->channel_layout, int idx = av_get_channel_layout_channel_index(s->map_channel_layout,
s->mapping[i]); s->mapping[i]);
if (idx < 0) if (idx < 0)
continue; continue;
s->hrir_map[i] = idx;
if (s->type == TIME_DOMAIN) { if (s->type == TIME_DOMAIN) {
float *data_ir_l = s->data_ir[0] + idx * s->air_len; float *data_ir_l = s->data_ir[0] + idx * s->air_len;
float *data_ir_r = s->data_ir[1] + idx * s->air_len; float *data_ir_r = s->data_ir[1] + idx * s->air_len;
@ -486,6 +492,7 @@ static int convert_coeffs(AVFilterContext *ctx, AVFilterLink *inlink)
if (idx < 0) if (idx < 0)
continue; continue;
s->hrir_map[k] = idx;
I = k * 2; I = k * 2;
if (s->type == TIME_DOMAIN) { if (s->type == TIME_DOMAIN) {
float *data_ir_l = s->data_ir[0] + idx * s->air_len; float *data_ir_l = s->data_ir[0] + idx * s->air_len;