RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/avf_showspectrum: add cividis colormap

This commit is contained in:
Paul B Mahol 2018-11-08 15:08:43 +01:00
parent 5ff080fdfa
commit 09fdfc11b7
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/filters.texi
View File

@ -21722,6 +21722,8 @@ each channel is displayed using the green color scheme
each channel is displayed using the viridis color scheme
@item plasma
each channel is displayed using the plasma color scheme
@item cividis
each channel is displayed using the cividis color scheme
@end table
Default value is @samp{channel}.
@ -21892,6 +21894,8 @@ each channel is displayed using the green color scheme
each channel is displayed using the viridis color scheme
@item plasma
each channel is displayed using the plasma color scheme
@item cividis
each channel is displayed using the cividis color scheme
@end table
Default value is @samp{intensity}.

13
libavfilter/avf_showspectrum.c
View File

@ -46,7 +46,7 @@
enum DisplayMode { COMBINED, SEPARATE, NB_MODES };
enum DataMode { D_MAGNITUDE, D_PHASE, NB_DMODES };
enum DisplayScale { LINEAR, SQRT, CBRT, LOG, FOURTHRT, FIFTHRT, NB_SCALES };
enum ColorMode { CHANNEL, INTENSITY, RAINBOW, MORELAND, NEBULAE, FIRE, FIERY, FRUIT, COOL, MAGMA, GREEN, VIRIDIS, PLASMA, NB_CLMODES };
enum ColorMode { CHANNEL, INTENSITY, RAINBOW, MORELAND, NEBULAE, FIRE, FIERY, FRUIT, COOL, MAGMA, GREEN, VIRIDIS, PLASMA, CIVIDIS, NB_CLMODES };
enum SlideMode { REPLACE, SCROLL, FULLFRAME, RSCROLL, NB_SLIDES };
enum Orientation { VERTICAL, HORIZONTAL, NB_ORIENTATIONS };
@ -125,6 +125,7 @@ static const AVOption showspectrum_options[] = {
{ "green", "green based coloring", 0, AV_OPT_TYPE_CONST, {.i64=GREEN}, 0, 0, FLAGS, "color" },
{ "viridis", "viridis based coloring", 0, AV_OPT_TYPE_CONST, {.i64=VIRIDIS}, 0, 0, FLAGS, "color" },
{ "plasma", "plasma based coloring", 0, AV_OPT_TYPE_CONST, {.i64=PLASMA}, 0, 0, FLAGS, "color" },
{ "cividis", "cividis based coloring", 0, AV_OPT_TYPE_CONST, {.i64=CIVIDIS}, 0, 0, FLAGS, "color" },
{ "scale", "set display scale", OFFSET(scale), AV_OPT_TYPE_INT, {.i64=SQRT}, LINEAR, NB_SCALES-1, FLAGS, "scale" },
{ "lin", "linear", 0, AV_OPT_TYPE_CONST, {.i64=LINEAR}, 0, 0, FLAGS, "scale" },
{ "sqrt", "square root", 0, AV_OPT_TYPE_CONST, {.i64=SQRT}, 0, 0, FLAGS, "scale" },
@ -273,6 +274,14 @@ static const struct ColorTable {
{ 0.80, 0xB4/255., (0x2B -128)/255., (0x9E -128)/255. },
{ 0.91, 0xD2/255., (0x38 -128)/255., (0x92 -128)/255. },
{ 1, 1, 0, 0. }},
[CIVIDIS] = {
{ 0, 0, 0, 0 },
{ 0.20, 0x28/255., (0x98 -128)/255., (0x6F -128)/255. },
{ 0.50, 0x48/255., (0x95 -128)/255., (0x74 -128)/255. },
{ 0.63, 0x69/255., (0x84 -128)/255., (0x7F -128)/255. },
{ 0.76, 0x89/255., (0x75 -128)/255., (0x84 -128)/255. },
{ 0.90, 0xCE/255., (0x35 -128)/255., (0x95 -128)/255. },
{ 1, 1, 0, 0. }},
};
static av_cold void uninit(AVFilterContext *ctx)
@ -504,6 +513,7 @@ static void color_range(ShowSpectrumContext *s, int ch,
case GREEN:
case VIRIDIS:
case PLASMA:
case CIVIDIS:
case MAGMA:
case INTENSITY:
*uf = *yf;
@ -1420,6 +1430,7 @@ static const AVOption showspectrumpic_options[] = {
{ "green", "green based coloring", 0, AV_OPT_TYPE_CONST, {.i64=GREEN}, 0, 0, FLAGS, "color" },
{ "viridis", "viridis based coloring", 0, AV_OPT_TYPE_CONST, {.i64=VIRIDIS}, 0, 0, FLAGS, "color" },
{ "plasma", "plasma based coloring", 0, AV_OPT_TYPE_CONST, {.i64=PLASMA}, 0, 0, FLAGS, "color" },
{ "cividis", "cividis based coloring", 0, AV_OPT_TYPE_CONST, {.i64=CIVIDIS}, 0, 0, FLAGS, "color" },
{ "scale", "set display scale", OFFSET(scale), AV_OPT_TYPE_INT, {.i64=LOG}, 0, NB_SCALES-1, FLAGS, "scale" },
{ "lin", "linear", 0, AV_OPT_TYPE_CONST, {.i64=LINEAR}, 0, 0, FLAGS, "scale" },
{ "sqrt", "square root", 0, AV_OPT_TYPE_CONST, {.i64=SQRT}, 0, 0, FLAGS, "scale" },