har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/af_dialoguenhance: simplify channels copy

Browse Source
This commit is contained in:
Paul B Mahol 2023-11-27 00:38:56 +01:00
parent 0ea9e26636
commit 4671fb7dfb
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavfilter/af_dialoguenhance.c
View File

@ -249,20 +249,21 @@ static int de_stereo(AVFilterContext *ctx, AVFrame *out)
float *left_osamples = (float *)out->extended_data[0]; float *left_osamples = (float *)out->extended_data[0];
float *right_osamples = (float *)out->extended_data[1]; float *right_osamples = (float *)out->extended_data[1];
float *center_osamples = (float *)out->extended_data[2]; float *center_osamples = (float *)out->extended_data[2];
const int offset = s->fft_size - s->overlap; const int overlap = s->overlap;
const int nb_samples = FFMIN(s->overlap, s->in->nb_samples); const int offset = s->fft_size - overlap;
const int nb_samples = FFMIN(overlap, s->in->nb_samples);
float vad; float vad;
// shift in/out buffers // shift in/out buffers
memmove(left_in, &left_in[s->overlap], offset * sizeof(float)); memmove(left_in, &left_in[overlap], offset * sizeof(float));
memmove(right_in, &right_in[s->overlap], offset * sizeof(float)); memmove(right_in, &right_in[overlap], offset * sizeof(float));
memmove(left_out, &left_out[s->overlap], offset * sizeof(float)); memmove(left_out, &left_out[overlap], offset * sizeof(float));
memmove(right_out, &right_out[s->overlap], offset * sizeof(float)); memmove(right_out, &right_out[overlap], offset * sizeof(float));
memcpy(&left_in[offset], left_samples, nb_samples * sizeof(float)); memcpy(&left_in[offset], left_samples, nb_samples * sizeof(float));
memcpy(&right_in[offset], right_samples, nb_samples * sizeof(float)); memcpy(&right_in[offset], right_samples, nb_samples * sizeof(float));
memset(&left_out[offset], 0, s->overlap * sizeof(float)); memset(&left_out[offset], 0, overlap * sizeof(float));
memset(&right_out[offset], 0, s->overlap * sizeof(float)); memset(&right_out[offset], 0, overlap * sizeof(float));
apply_window(s, left_in, windowed_left, 0); apply_window(s, left_in, windowed_left, 0);
apply_window(s, right_in, windowed_right, 0); apply_window(s, right_in, windowed_right, 0);
@ -292,14 +293,15 @@ static int de_stereo(AVFilterContext *ctx, AVFrame *out)
apply_window(s, windowed_oleft, left_out, 1); apply_window(s, windowed_oleft, left_out, 1);
for (int i = 0; i < s->overlap; i++) { memcpy(left_osamples, left_in, overlap * sizeof(float));
// 4 times overlap with squared hanning window results in 1.5 time increase in amplitude memcpy(right_osamples, right_in, overlap * sizeof(float));
if (!ctx->is_disabled)
// 4 times overlap with squared hanning window results in 1.5 time increase in amplitude
if (!ctx->is_disabled) {
for (int i = 0; i < overlap; i++)
center_osamples[i] = left_out[i] / 1.5f; center_osamples[i] = left_out[i] / 1.5f;
else } else {
center_osamples[i] = 0.f; memset(center_osamples, 0, overlap * sizeof(float));
left_osamples[i] = left_in[i];
right_osamples[i] = right_in[i];
} }
return 0; return 0;