diff options
| author | Paul B Mahol <[email protected]> | 2015-12-31 11:15:10 +0100 | 
|---|---|---|
| committer | Paul B Mahol <[email protected]> | 2015-12-31 11:44:18 +0100 | 
| commit | b98c58573b0ecdbfe72059debbf26c53a7cfcfe5 (patch) | |
| tree | 14884d6db669e8556746966a7abb59836e89999c | |
| parent | 416090089909d19f2f6b80a15d6588242b7b8aa4 (diff) | |
avfilter/avf_showspectrum: add fire color map
Signed-off-by: Paul B Mahol <[email protected]>
| -rw-r--r-- | doc/filters.texi | 2 | ||||
| -rw-r--r-- | libavfilter/avf_showspectrum.c | 13 | 
2 files changed, 14 insertions, 1 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 2e52c44901..92931aa0c6 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14621,6 +14621,8 @@ each channel is displayed using the rainbow color scheme  each channel is displayed using the moreland color scheme  @item nebulae  each channel is displayed using the nebulae color scheme +@item fire +each channel is displayed using the fire color scheme  @end table  Default value is @samp{channel}. diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 227aff8d32..d1ac560169 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -37,7 +37,7 @@  enum DisplayMode  { COMBINED, SEPARATE, NB_MODES };  enum DisplayScale { LINEAR, SQRT, CBRT, LOG, NB_SCALES }; -enum ColorMode    { CHANNEL, INTENSITY, RAINBOW, MORELAND, NEBULAE, NB_CLMODES }; +enum ColorMode    { CHANNEL, INTENSITY, RAINBOW, MORELAND, NEBULAE, FIRE, NB_CLMODES };  enum SlideMode    { REPLACE, SCROLL, FULLFRAME, RSCROLL, NB_SLIDES };  enum Orientation  { VERTICAL, HORIZONTAL, NB_ORIENTATIONS }; @@ -85,6 +85,7 @@ static const AVOption showspectrum_options[] = {          { "rainbow",   "rainbow based coloring",          0, AV_OPT_TYPE_CONST, {.i64=RAINBOW},   0, 0, FLAGS, "color" },          { "moreland",  "moreland based coloring",         0, AV_OPT_TYPE_CONST, {.i64=MORELAND},  0, 0, FLAGS, "color" },          { "nebulae",   "nebulae based coloring",          0, AV_OPT_TYPE_CONST, {.i64=NEBULAE},   0, 0, FLAGS, "color" }, +        { "fire",      "fire based coloring",             0, AV_OPT_TYPE_CONST, {.i64=FIRE},      0, 0, FLAGS, "color" },      { "scale", "set display scale", OFFSET(scale), AV_OPT_TYPE_INT, {.i64=SQRT}, LINEAR, NB_SCALES-1, FLAGS, "scale" },          { "sqrt", "square root", 0, AV_OPT_TYPE_CONST, {.i64=SQRT},   0, 0, FLAGS, "scale" },          { "cbrt", "cubic root",  0, AV_OPT_TYPE_CONST, {.i64=CBRT},   0, 0, FLAGS, "scale" }, @@ -154,6 +155,15 @@ static const struct ColorTable {      { 0.77,           120/256.,     (105-128)/256.,      (188-128)/256. },      { 0.87,           140/256.,     (105-128)/256.,      (188-128)/256. },      {    1,                  1,                  0,                   0 }}, +    [FIRE] = { +    {    0,                  0,                  0,                   0 }, +    { 0.23,            44/256.,     (132-128)/256.,      (127-128)/256. }, +    { 0.45,            62/256.,     (116-128)/256.,      (140-128)/256. }, +    { 0.57,            75/256.,     (105-128)/256.,      (152-128)/256. }, +    { 0.67,            95/256.,      (91-128)/256.,      (166-128)/256. }, +    { 0.77,           126/256.,      (74-128)/256.,      (172-128)/256. }, +    { 0.87,           164/256.,      (73-128)/256.,      (162-128)/256. }, +    {    1,                  1,                  0,                   0 }},  };  static av_cold void uninit(AVFilterContext *ctx) @@ -403,6 +413,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples)              case RAINBOW:              case MORELAND:              case NEBULAE: +            case FIRE:              case INTENSITY:                  uf = yf;                  vf = yf;  | 
