| @@ -36,6 +36,7 @@ · 35 unmodified lines |
| 36 | 36 | #include "internal.h" |
| 37 | 37 | #include "window_func.h" |
| 38 | 38 | |
| 39 | +enum DataMode { MAGNITUDE, PHASE, NB_DATA }; |
| 39 | 40 | enum DisplayMode { LINE, BAR, DOT, NB_MODES }; |
| 40 | 41 | enum ChannelMode { COMBINED, SEPARATE, NB_CMODES }; |
| 41 | 42 | enum FrequencyScale { FS_LINEAR, FS_LOG, FS_RLOG, NB_FSCALES }; |
| @@ -45,6 +46,7 @@ typedef struct ShowFreqsContext { · 3 unmodified lines |
| 45 | 46 | const AVClass *class; |
| 46 | 47 | int w, h; |
| 47 | 48 | int mode; |
| 49 | + int data_mode; |
| 48 | 50 | int cmode; |
| 49 | 51 | int fft_size; |
| 50 | 52 | int fft_bits; |
| @@ -115,6 +117,9 @@ static const AVOption showfreqs_options[] = { · 64 unmodified lines |
| 115 | 117 | { "combined", "show all channels in same window", 0, AV_OPT_TYPE_CONST, {.i64=COMBINED}, 0, 0, FLAGS, "cmode" }, |
| 116 | 118 | { "separate", "show each channel in own window", 0, AV_OPT_TYPE_CONST, {.i64=SEPARATE}, 0, 0, FLAGS, "cmode" }, |
| 117 | 119 | { "minamp", "set minimum amplitude", OFFSET(minamp), AV_OPT_TYPE_FLOAT, {.dbl=1e-6}, FLT_MIN, 1e-6, FLAGS }, |
| 120 | + { "data", "set data mode", OFFSET(data_mode), AV_OPT_TYPE_INT, {.i64=MAGNITUDE}, 0, NB_DATA-1, FLAGS, "data" }, |
| 121 | + { "magnitude", "show magnitude", 0, AV_OPT_TYPE_CONST, {.i64=MAGNITUDE}, 0, 0, FLAGS, "data" }, |
| 122 | + { "phase", "show phase", 0, AV_OPT_TYPE_CONST, {.i64=PHASE}, 0, 0, FLAGS, "data" }, |
| 118 | 123 | { NULL } |
| 119 | 124 | }; |
| 120 | 125 | |
| @@ -397,6 +402,7 @@ static int plot_freqs(AVFilterLink *inlink, AVFrame *in) · 276 unmodified lines |
| 397 | 402 | #define RE(x, ch) s->fft_data[ch][x].re |
| 398 | 403 | #define IM(x, ch) s->fft_data[ch][x].im |
| 399 | 404 | #define M(a, b) (sqrt((a) * (a) + (b) * (b))) |
| 405 | +#define P(a, b) (atan2((b), (a))) |
| 400 | 406 | |
| 401 | 407 | colors = av_strdup(s->colors); |
| 402 | 408 | if (!colors) { |
| @@ -413,13 +419,27 @@ static int plot_freqs(AVFilterLink *inlink, AVFrame *in) · 10 unmodified lines |
| 413 | 419 | if (color) |
| 414 | 420 | av_parse_color(fg, color, -1, ctx); |
| 415 | 421 | |
| 416 | | − a = av_clipd(M(RE(0, ch), 0) / s->scale, 0, 1); |
| 417 | | − plot_freq(s, ch, a, 0, fg, &prev_y, out, outlink); |
| 422 | + switch (s->data_mode) { |
| 423 | + case MAGNITUDE: |
| 424 | + a = av_clipd(M(RE(0, ch), 0) / s->scale, 0, 1); |
| 425 | + plot_freq(s, ch, a, 0, fg, &prev_y, out, outlink); |
| 418 | 426 | |
| 419 | | − for (f = 1; f < s->nb_freq; f++) { |
| 420 | | − a = av_clipd(M(RE(f, ch), IM(f, ch)) / s->scale, 0, 1); |
| 427 | + for (f = 1; f < s->nb_freq; f++) { |
| 428 | + a = av_clipd(M(RE(f, ch), IM(f, ch)) / s->scale, 0, 1); |
| 421 | 429 | |
| 422 | | − plot_freq(s, ch, a, f, fg, &prev_y, out, outlink); |
| 430 | + plot_freq(s, ch, a, f, fg, &prev_y, out, outlink); |
| 431 | + } |
| 432 | + break; |
| 433 | + case PHASE: |
| 434 | + a = av_clipd((M_PI + P(RE(0, ch), 0)) / (2. * M_PI), 0, 1); |
| 435 | + plot_freq(s, ch, a, 0, fg, &prev_y, out, outlink); |
| 436 | + |
| 437 | + for (f = 1; f < s->nb_freq; f++) { |
| 438 | + a = av_clipd((M_PI + P(RE(f, ch), IM(f, ch))) / (2. * M_PI), 0, 1); |
| 439 | + |
| 440 | + plot_freq(s, ch, a, f, fg, &prev_y, out, outlink); |
| 441 | + } |
| 442 | + break; |
| 423 | 443 | } |
| 424 | 444 | } |
| 425 | 445 | |