Properly unwrap phase.
Unified · Split
| @@ -819,11 +819,11 @@ static void get_response(int channel, int format, double w, · 818 unmodified lines | |||
| 819 | *i = imag; | 819 | *i = imag; |
| 820 | } | 820 | } |
| 821 | 821 | ||
| 822 | static void draw_response(AVFilterContext *ctx, AVFrame *out) | 822 | static void draw_response(AVFilterContext *ctx, AVFrame *out, int sample_rate) |
| 823 | { | 823 | { |
| 824 | AudioIIRContext *s = ctx->priv; | 824 | AudioIIRContext *s = ctx->priv; |
| 825 | float *mag, *phase, *delay, min = FLT_MAX, max = FLT_MIN; | 825 | double *mag, *phase, *temp, *delay, min = DBL_MAX, max = -DBL_MAX; |
| 826 | float min_delay = FLT_MAX, max_delay = FLT_MIN; | 826 | double min_delay, max_delay, min_phase, max_phase; |
| 827 | int prev_ymag = -1, prev_yphase = -1, prev_ydelay = -1; | 827 | int prev_ymag = -1, prev_yphase = -1, prev_ydelay = -1; |
| 828 | char text[32]; | 828 | char text[32]; |
| 829 | int ch, i; | 829 | int ch, i; |
| @@ -831,9 +831,10 @@ static void draw_response(AVFilterContext *ctx, AVFrame *out) · 1 unmodified line | |||
| 831 | memset(out->data[0], 0, s->h * out->linesize[0]); | 831 | memset(out->data[0], 0, s->h * out->linesize[0]); |
| 832 | 832 | ||
| 833 | phase = av_malloc_array(s->w, sizeof(*phase)); | 833 | phase = av_malloc_array(s->w, sizeof(*phase)); |
| 834 | temp = av_malloc_array(s->w, sizeof(*temp)); | ||
| 834 | mag = av_malloc_array(s->w, sizeof(*mag)); | 835 | mag = av_malloc_array(s->w, sizeof(*mag)); |
| 835 | delay = av_malloc_array(s->w, sizeof(*delay)); | 836 | delay = av_malloc_array(s->w, sizeof(*delay)); |
| 836 | if (!mag || !phase || !delay) | 837 | if (!mag || !phase || !delay || !temp) |
| 837 | goto end; | 838 | goto end; |
| 838 | 839 | ||
| 839 | ch = av_clip(s->ir_channel, 0, s->channels - 1); | 840 | 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 | |||
| 849 | 850 | ||
| 850 | mag[i] = s->iir[ch].g * hypot(real, imag); | 851 | mag[i] = s->iir[ch].g * hypot(real, imag); |
| 851 | phase[i] = atan2(imag, real); | 852 | phase[i] = atan2(imag, real); |
| 852 | min = fminf(min, mag[i]); | 853 | min = fmin(min, mag[i]); |
| 853 | max = fmaxf(max, mag[i]); | 854 | max = fmax(max, mag[i]); |
| 854 | } | 855 | } |
| 855 | 856 | ||
| 857 | temp[0] = 0.; | ||
| 856 | for (i = 0; i < s->w - 1; i++) { | 858 | 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 | } | ||
| 858 | 862 | ||
| 859 | delay[i] = -(phase[i + 1] - phase[i]) / dw; | 863 | min_phase = phase[0]; |
| 860 | min_delay = fminf(min_delay, delay[i]); | 864 | max_phase = phase[0]; |
| 861 | max_delay = fmaxf(max_delay, delay[i]); | 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]); | ||
| 862 | } | 881 | } |
| 863 | 882 | ||
| 864 | delay[i] = delay[i - 1]; | 883 | delay[i] = delay[i - 1]; |
| @@ -866,7 +885,7 @@ static void draw_response(AVFilterContext *ctx, AVFrame *out) · 1 unmodified line | |||
| 866 | for (i = 0; i < s->w; i++) { | 885 | for (i = 0; i < s->w; i++) { |
| 867 | int ymag = mag[i] / max * (s->h - 1); | 886 | int ymag = mag[i] / max * (s->h - 1); |
| 868 | int ydelay = (delay[i] - min_delay) / (max_delay - min_delay) * (s->h - 1); | 887 | 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); |
| 870 | 889 | ||
| 871 | ymag = s->h - 1 - av_clip(ymag, 0, s->h - 1); | 890 | ymag = s->h - 1 - av_clip(ymag, 0, s->h - 1); |
| 872 | yphase = s->h - 1 - av_clip(yphase, 0, s->h - 1); | 891 | 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 | |||
| 897 | snprintf(text, sizeof(text), "%.2f", min); | 916 | snprintf(text, sizeof(text), "%.2f", min); |
| 898 | drawtext(out, 15 * 8 + 2, 12, text, 0xDDDDDDDD); | 917 | drawtext(out, 15 * 8 + 2, 12, text, 0xDDDDDDDD); |
| 899 | 918 | ||
| 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); | ||
| 901 | snprintf(text, sizeof(text), "%.2f", max_delay); | 928 | 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); |
| 903 | 930 | ||
| 904 | drawtext(out, 2, 32, "Min Delay:", 0xDDDDDDDD); | 931 | drawtext(out, 2, 52, "Min Delay:", 0xDDDDDDDD); |
| 905 | snprintf(text, sizeof(text), "%.2f", min_delay); | 932 | 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); |
| 907 | } | 934 | } |
| 908 | 935 | ||
| 909 | end: | 936 | end: |
| 910 | av_free(delay); | 937 | av_free(delay); |
| 938 | av_free(temp); | ||
| 911 | av_free(phase); | 939 | av_free(phase); |
| 912 | av_free(mag); | 940 | av_free(mag); |
| 913 | } | 941 | } |
| @@ -951,7 +979,7 @@ static int config_output(AVFilterLink *outlink) · 37 unmodified lines | |||
| 951 | if (!s->video) | 979 | if (!s->video) |
| 952 | return AVERROR(ENOMEM); | 980 | return AVERROR(ENOMEM); |
| 953 | 981 | ||
| 954 | draw_response(ctx, s->video); | 982 | draw_response(ctx, s->video, inlink->sample_rate); |
| 955 | } | 983 | } |
| 956 | 984 | ||
| 957 | if (s->format == 0) | 985 | if (s->format == 0) |