generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/avf_showspectrum: add cool color map

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-01-08 17:09:46 +01:00
parent b7b4d99a18
commit a69cf50dca
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/filters.texi
View File

@ -14642,6 +14642,8 @@ each channel is displayed using the fire color scheme
each channel is displayed using the fiery color scheme each channel is displayed using the fiery color scheme
@item fruit @item fruit
each channel is displayed using the fruit color scheme each channel is displayed using the fruit color scheme
@item cool
each channel is displayed using the cool color scheme
@end table @end table
Default value is @samp{channel}. Default value is @samp{channel}.
@ -14778,6 +14780,8 @@ each channel is displayed using the fire color scheme
each channel is displayed using the fiery color scheme each channel is displayed using the fiery color scheme
@item fruit @item fruit
each channel is displayed using the fruit color scheme each channel is displayed using the fruit color scheme
@item cool
each channel is displayed using the cool color scheme
@end table @end table
Default value is @samp{intensity}. Default value is @samp{intensity}.

18
libavfilter/avf_showspectrum.c
View File

@ -43,7 +43,7 @@
enum DisplayMode { COMBINED, SEPARATE, NB_MODES }; enum DisplayMode { COMBINED, SEPARATE, NB_MODES };
enum DisplayScale { LINEAR, SQRT, CBRT, LOG, FOURTHRT, FIFTHRT, NB_SCALES }; enum DisplayScale { LINEAR, SQRT, CBRT, LOG, FOURTHRT, FIFTHRT, NB_SCALES };
enum ColorMode { CHANNEL, INTENSITY, RAINBOW, MORELAND, NEBULAE, FIRE, FIERY, FRUIT, NB_CLMODES }; enum ColorMode { CHANNEL, INTENSITY, RAINBOW, MORELAND, NEBULAE, FIRE, FIERY, FRUIT, COOL, NB_CLMODES };
enum SlideMode { REPLACE, SCROLL, FULLFRAME, RSCROLL, NB_SLIDES }; enum SlideMode { REPLACE, SCROLL, FULLFRAME, RSCROLL, NB_SLIDES };
enum Orientation { VERTICAL, HORIZONTAL, NB_ORIENTATIONS }; enum Orientation { VERTICAL, HORIZONTAL, NB_ORIENTATIONS };
@ -103,6 +103,7 @@ static const AVOption showspectrum_options[] = {
{ "fire", "fire based coloring", 0, AV_OPT_TYPE_CONST, {.i64=FIRE}, 0, 0, FLAGS, "color" }, { "fire", "fire based coloring", 0, AV_OPT_TYPE_CONST, {.i64=FIRE}, 0, 0, FLAGS, "color" },
{ "fiery", "fiery based coloring", 0, AV_OPT_TYPE_CONST, {.i64=FIERY}, 0, 0, FLAGS, "color" }, { "fiery", "fiery based coloring", 0, AV_OPT_TYPE_CONST, {.i64=FIERY}, 0, 0, FLAGS, "color" },
{ "fruit", "fruit based coloring", 0, AV_OPT_TYPE_CONST, {.i64=FRUIT}, 0, 0, FLAGS, "color" }, { "fruit", "fruit based coloring", 0, AV_OPT_TYPE_CONST, {.i64=FRUIT}, 0, 0, FLAGS, "color" },
{ "cool", "cool based coloring", 0, AV_OPT_TYPE_CONST, {.i64=COOL}, 0, 0, FLAGS, "color" },
{ "scale", "set display scale", OFFSET(scale), AV_OPT_TYPE_INT, {.i64=SQRT}, LINEAR, NB_SCALES-1, FLAGS, "scale" }, { "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" }, { "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" }, { "cbrt", "cubic root", 0, AV_OPT_TYPE_CONST, {.i64=CBRT}, 0, 0, FLAGS, "scale" },
@ -204,6 +205,10 @@ static const struct ColorTable {
{ 0.60, 151/256., (50-128)/256., (146-128)/256. }, { 0.60, 151/256., (50-128)/256., (146-128)/256. },
{ 0.70, 191/256., (63-128)/256., (178-128)/256. }, { 0.70, 191/256., (63-128)/256., (178-128)/256. },
{ 1, 98/256., (80-128)/256., (221-128)/256. }}, { 1, 98/256., (80-128)/256., (221-128)/256. }},
[COOL] = {
{ 0, 0, 0, 0 },
{ .15, 0, .5, -.5 },
{ 1, 1, -.5, .5 }},
}; };
static av_cold void uninit(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx)
@ -472,6 +477,7 @@ static void color_range(ShowSpectrumContext *s, int ch,
case FIRE: case FIRE:
case FIERY: case FIERY:
case FRUIT: case FRUIT:
case COOL:
case INTENSITY: case INTENSITY:
*uf = *yf; *uf = *yf;
*vf = *yf; *vf = *yf;
@ -599,18 +605,19 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples)
/* apply scale */ /* apply scale */
switch (s->scale) { switch (s->scale) {
case LINEAR: case LINEAR:
a = av_clipf(a, 0, 1);
break; break;
case SQRT: case SQRT:
a = sqrt(a); a = av_clipf(sqrt(a), 0, 1);
break; break;
case CBRT: case CBRT:
a = cbrt(a); a = av_clipf(cbrt(a), 0, 1);
break; break;
case FOURTHRT: case FOURTHRT:
a = sqrt(sqrt(a)); a = av_clipf(sqrt(sqrt(a)), 0, 1);
break; break;
case FIFTHRT: case FIFTHRT:
a = pow(a, 0.20); a = av_clipf(pow(a, 0.20), 0, 1);
break; break;
case LOG: case LOG:
a = 1 + log10(av_clipd(a * w, 1e-6, 1)) / 6; // zero = -120dBFS a = 1 + log10(av_clipd(a * w, 1e-6, 1)) / 6; // zero = -120dBFS
@ -820,6 +827,7 @@ static const AVOption showspectrumpic_options[] = {
{ "fire", "fire based coloring", 0, AV_OPT_TYPE_CONST, {.i64=FIRE}, 0, 0, FLAGS, "color" }, { "fire", "fire based coloring", 0, AV_OPT_TYPE_CONST, {.i64=FIRE}, 0, 0, FLAGS, "color" },
{ "fiery", "fiery based coloring", 0, AV_OPT_TYPE_CONST, {.i64=FIERY}, 0, 0, FLAGS, "color" }, { "fiery", "fiery based coloring", 0, AV_OPT_TYPE_CONST, {.i64=FIERY}, 0, 0, FLAGS, "color" },
{ "fruit", "fruit based coloring", 0, AV_OPT_TYPE_CONST, {.i64=FRUIT}, 0, 0, FLAGS, "color" }, { "fruit", "fruit based coloring", 0, AV_OPT_TYPE_CONST, {.i64=FRUIT}, 0, 0, FLAGS, "color" },
{ "cool", "cool based coloring", 0, AV_OPT_TYPE_CONST, {.i64=COOL}, 0, 0, FLAGS, "color" },
{ "scale", "set display scale", OFFSET(scale), AV_OPT_TYPE_INT, {.i64=LOG}, 0, NB_SCALES-1, FLAGS, "scale" }, { "scale", "set display scale", OFFSET(scale), AV_OPT_TYPE_INT, {.i64=LOG}, 0, NB_SCALES-1, FLAGS, "scale" },
{ "sqrt", "square root", 0, AV_OPT_TYPE_CONST, {.i64=SQRT}, 0, 0, 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" }, { "cbrt", "cubic root", 0, AV_OPT_TYPE_CONST, {.i64=CBRT}, 0, 0, FLAGS, "scale" },