| @@ -71,6 +71,7 @@ typedef struct DeNoiseChannel { · 70 unmodified lines |
| 71 | 71 | double *band_amt; |
| 72 | 72 | double *band_excit; |
| 73 | 73 | double *gain; |
| 74 | + double *smoothed_gain; |
| 74 | 75 | double *prior; |
| 75 | 76 | double *prior_band_excit; |
| 76 | 77 | double *clean_data; |
| @@ -114,7 +115,7 @@ typedef struct AudioFFTDeNoiseContext { · 37 unmodified lines |
| 114 | 115 | int output_mode; |
| 115 | 116 | int noise_floor_link; |
| 116 | 117 | float ratio; |
| 117 | | − float gain_smooth; |
| 118 | + int gain_smooth; |
| 118 | 119 | float band_multiplier; |
| 119 | 120 | float floor_offset; |
| 120 | 121 | |
| @@ -208,8 +209,8 @@ static const AVOption afftdn_options[] = { · 87 unmodified lines |
| 208 | 209 | { "begin", "start", 0, AV_OPT_TYPE_CONST, {.i64 = SAMPLE_START}, 0, 0, AFR, "sample" }, |
| 209 | 210 | { "stop", "stop", 0, AV_OPT_TYPE_CONST, {.i64 = SAMPLE_STOP}, 0, 0, AFR, "sample" }, |
| 210 | 211 | { "end", "stop", 0, AV_OPT_TYPE_CONST, {.i64 = SAMPLE_STOP}, 0, 0, AFR, "sample" }, |
| 211 | | − { "gain_smooth", "set gain smooth factor",OFFSET(gain_smooth), AV_OPT_TYPE_FLOAT, {.dbl = 1.00}, 0.0001, 1, AFR }, |
| 212 | | − { "gs", "set gain smooth factor",OFFSET(gain_smooth), AV_OPT_TYPE_FLOAT, {.dbl = 1.00}, 0.0001, 1, AFR }, |
| 212 | + { "gain_smooth", "set gain smooth radius",OFFSET(gain_smooth), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 50, AFR }, |
| 213 | + { "gs", "set gain smooth radius",OFFSET(gain_smooth), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 50, AFR }, |
| 213 | 214 | { NULL } |
| 214 | 215 | }; |
| 215 | 216 | |
| @@ -357,6 +358,7 @@ static void process_frame(AVFilterContext *ctx, · 141 unmodified lines |
| 357 | 358 | double *noisy_data = dnch->noisy_data; |
| 358 | 359 | double *band_excit = dnch->band_excit; |
| 359 | 360 | double *band_amt = dnch->band_amt; |
| 361 | + double *smoothed_gain = dnch->smoothed_gain; |
| 360 | 362 | double *gain = dnch->gain; |
| 361 | 363 | |
| 362 | 364 | for (int i = 0; i < s->bin_count; i++) { |
| @@ -424,16 +426,28 @@ static void process_frame(AVFilterContext *ctx, · 61 unmodified lines |
| 424 | 426 | } |
| 425 | 427 | } |
| 426 | 428 | |
| 427 | | − { |
| 428 | | − const double f = s->gain_smooth; |
| 429 | | − const double F = 1. - f; |
| 429 | + memcpy(smoothed_gain, gain, s->bin_count * sizeof(*smoothed_gain)); |
| 430 | + if (s->gain_smooth > 0) { |
| 431 | + const int r = s->gain_smooth; |
| 432 | + |
| 433 | + for (int i = r; i < s->bin_count - r; i++) { |
| 434 | + const double gc = gain[i]; |
| 435 | + double num = 0., den = 0.; |
| 436 | + |
| 437 | + for (int j = -r; j <= r; j++) { |
| 438 | + const double g = gain[i + j]; |
| 439 | + const double d = 1. - fabs(g - gc); |
| 430 | 440 | |
| 431 | | − for (int i = 1; i < s->bin_count; i++) |
| 432 | | − gain[i] = gain[i-1] * F + f * gain[i]; |
| 441 | + num += g * d; |
| 442 | + den += d; |
| 443 | + } |
| 444 | + |
| 445 | + smoothed_gain[i] = num / den; |
| 446 | + } |
| 433 | 447 | } |
| 434 | 448 | |
| 435 | 449 | for (int i = 0; i < s->bin_count; i++) { |
| 436 | | − const double new_gain = gain[i]; |
| 450 | + const double new_gain = smoothed_gain[i]; |
| 437 | 451 | |
| 438 | 452 | fft_data[i].re *= new_gain; |
| 439 | 453 | fft_data[i].im *= new_gain; |
| @@ -685,6 +699,7 @@ static int config_input(AVFilterLink *inlink) · 245 unmodified lines |
| 685 | 699 | dnch->band_amt = av_calloc(s->number_of_bands, sizeof(*dnch->band_amt)); |
| 686 | 700 | dnch->band_excit = av_calloc(s->number_of_bands, sizeof(*dnch->band_excit)); |
| 687 | 701 | dnch->gain = av_calloc(s->bin_count, sizeof(*dnch->gain)); |
| 702 | + dnch->smoothed_gain = av_calloc(s->bin_count, sizeof(*dnch->smoothed_gain)); |
| 688 | 703 | dnch->prior = av_calloc(s->bin_count, sizeof(*dnch->prior)); |
| 689 | 704 | dnch->prior_band_excit = av_calloc(s->number_of_bands, sizeof(*dnch->prior_band_excit)); |
| 690 | 705 | dnch->clean_data = av_calloc(s->bin_count, sizeof(*dnch->clean_data)); |
| @@ -708,6 +723,7 @@ static int config_input(AVFilterLink *inlink) · 17 unmodified lines |
| 708 | 723 | !dnch->band_amt || |
| 709 | 724 | !dnch->band_excit || |
| 710 | 725 | !dnch->gain || |
| 726 | + !dnch->smoothed_gain || |
| 711 | 727 | !dnch->prior || |
| 712 | 728 | !dnch->prior_band_excit || |
| 713 | 729 | !dnch->clean_data || |
| @@ -1161,6 +1177,7 @@ static av_cold void uninit(AVFilterContext *ctx) · 447 unmodified lines |
| 1161 | 1177 | av_freep(&dnch->band_amt); |
| 1162 | 1178 | av_freep(&dnch->band_excit); |
| 1163 | 1179 | av_freep(&dnch->gain); |
| 1180 | + av_freep(&dnch->smoothed_gain); |
| 1164 | 1181 | av_freep(&dnch->prior); |
| 1165 | 1182 | av_freep(&dnch->prior_band_excit); |
| 1166 | 1183 | av_freep(&dnch->clean_data); |