History

avfilter/af_aiir: fix phase and group delay calculation

Properly unwrap phase.

Paul B Mahol committed 6 years ago

Commit 86822cf1 parent 74dfc881 file · +44 −16Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/af_aiir.c+44−16
@@ -819,11 +819,11 @@ static void get_response(int channel, int format, double w, · 818 unmodified lines
819819 *i = imag;
820820 }
821821
822−static void draw_response(AVFilterContext *ctx, AVFrame *out)
822+static void draw_response(AVFilterContext *ctx, AVFrame *out, int sample_rate)
823823 {
824824 AudioIIRContext *s = ctx->priv;
825− float *mag, *phase, *delay, min = FLT_MAX, max = FLT_MIN;
826− float min_delay = FLT_MAX, max_delay = FLT_MIN;
825+ double *mag, *phase, *temp, *delay, min = DBL_MAX, max = -DBL_MAX;
826+ double min_delay, max_delay, min_phase, max_phase;
827827 int prev_ymag = -1, prev_yphase = -1, prev_ydelay = -1;
828828 char text[32];
829829 int ch, i;
@@ -831,9 +831,10 @@ static void draw_response(AVFilterContext *ctx, AVFrame *out) · 1 unmodified line
831831 memset(out->data[0], 0, s->h * out->linesize[0]);
832832
833833 phase = av_malloc_array(s->w, sizeof(*phase));
834+ temp = av_malloc_array(s->w, sizeof(*temp));
834835 mag = av_malloc_array(s->w, sizeof(*mag));
835836 delay = av_malloc_array(s->w, sizeof(*delay));
836− if (!mag || !phase || !delay)
837+ if (!mag || !phase || !delay || !temp)
837838 goto end;
838839
839840 ch = av_clip(s->ir_channel, 0, s->channels - 1);
@@ -849,16 +850,34 @@ static void draw_response(AVFilterContext *ctx, AVFrame *out) · 9 unmodified lines
849850
850851 mag[i] = s->iir[ch].g * hypot(real, imag);
851852 phase[i] = atan2(imag, real);
852− min = fminf(min, mag[i]);
853− max = fmaxf(max, mag[i]);
853+ min = fmin(min, mag[i]);
854+ max = fmax(max, mag[i]);
854855 }
855856
857+ temp[0] = 0.;
856858 for (i = 0; i < s->w - 1; i++) {
857− float dw = M_PI / (s->w - 1);
859+ double d = phase[i] - phase[i + 1];
860+ temp[i + 1] = ceil(fabs(d) / (2. * M_PI)) * 2. * M_PI * ((d > M_PI) - (d < -M_PI));
861+ }
858862
859− delay[i] = -(phase[i + 1] - phase[i]) / dw;
860− min_delay = fminf(min_delay, delay[i]);
861− max_delay = fmaxf(max_delay, delay[i]);
863+ min_phase = phase[0];
864+ max_phase = phase[0];
865+ for (i = 1; i < s->w; i++) {
866+ temp[i] += temp[i - 1];
867+ phase[i] += temp[i];
868+ min_phase = fmin(min_phase, phase[i]);
869+ max_phase = fmax(max_phase, phase[i]);
870+ }
871+
872+ delay[0] = 0.;
873+ min_delay = 0.;
874+ max_delay = 0.;
875+ for (i = 0; i < s->w - 1; i++) {
876+ double div = s->w / (double)sample_rate;
877+
878+ delay[i + 1] = -(phase[i] - phase[i + 1]) / div;
879+ min_delay = fmin(min_delay, delay[i + 1]);
880+ max_delay = fmax(max_delay, delay[i + 1]);
862881 }
863882
864883 delay[i] = delay[i - 1];
@@ -866,7 +885,7 @@ static void draw_response(AVFilterContext *ctx, AVFrame *out) · 1 unmodified line
866885 for (i = 0; i < s->w; i++) {
867886 int ymag = mag[i] / max * (s->h - 1);
868887 int ydelay = (delay[i] - min_delay) / (max_delay - min_delay) * (s->h - 1);
869− int yphase = (0.5 * (1. + phase[i] / M_PI)) * (s->h - 1);
888+ int yphase = (phase[i] - min_phase) / (max_phase - min_phase) * (s->h - 1);
870889
871890 ymag = s->h - 1 - av_clip(ymag, 0, s->h - 1);
872891 yphase = s->h - 1 - av_clip(yphase, 0, s->h - 1);
@@ -897,17 +916,26 @@ static void draw_response(AVFilterContext *ctx, AVFrame *out) · 24 unmodified lines
897916 snprintf(text, sizeof(text), "%.2f", min);
898917 drawtext(out, 15 * 8 + 2, 12, text, 0xDDDDDDDD);
899918
900− drawtext(out, 2, 22, "Max Delay:", 0xDDDDDDDD);
919+ drawtext(out, 2, 22, "Max Phase:", 0xDDDDDDDD);
920+ snprintf(text, sizeof(text), "%.2f", max_phase);
921+ drawtext(out, 15 * 8 + 2, 22, text, 0xDDDDDDDD);
922+
923+ drawtext(out, 2, 32, "Min Phase:", 0xDDDDDDDD);
924+ snprintf(text, sizeof(text), "%.2f", min_phase);
925+ drawtext(out, 15 * 8 + 2, 32, text, 0xDDDDDDDD);
926+
927+ drawtext(out, 2, 42, "Max Delay:", 0xDDDDDDDD);
901928 snprintf(text, sizeof(text), "%.2f", max_delay);
902− drawtext(out, 11 * 8 + 2, 22, text, 0xDDDDDDDD);
929+ drawtext(out, 11 * 8 + 2, 42, text, 0xDDDDDDDD);
903930
904− drawtext(out, 2, 32, "Min Delay:", 0xDDDDDDDD);
931+ drawtext(out, 2, 52, "Min Delay:", 0xDDDDDDDD);
905932 snprintf(text, sizeof(text), "%.2f", min_delay);
906− drawtext(out, 11 * 8 + 2, 32, text, 0xDDDDDDDD);
933+ drawtext(out, 11 * 8 + 2, 52, text, 0xDDDDDDDD);
907934 }
908935
909936 end:
910937 av_free(delay);
938+ av_free(temp);
911939 av_free(phase);
912940 av_free(mag);
913941 }
@@ -951,7 +979,7 @@ static int config_output(AVFilterLink *outlink) · 37 unmodified lines
951979 if (!s->video)
952980 return AVERROR(ENOMEM);
953981
954− draw_response(ctx, s->video);
982+ draw_response(ctx, s->video, inlink->sample_rate);
955983 }
956984
957985 if (s->format == 0)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t