December 2015 - ffmpeg-cvslog

avfilter/avf_showspectrum: add nebulae color map
by git＠videolan.org 30 Dec '15

30 Dec '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Dec 30 21:20:16 2015 +0100| [0f387f2b6265e963d9cfd71239da3d8afa854b86] | committer: Paul B Mahol avfilter/avf_showspectrum: add nebulae color map Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f387f2b6265e963d… --- doc/filters.texi | 2 ++ libavfilter/avf_showspectrum.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 9fca4a1..2e52c44 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14619,6 +14619,8 @@ each channel is displayed using the same color scheme each channel is displayed using the rainbow color scheme @item moreland each channel is displayed using the moreland color scheme +@item nebulae +each channel is displayed using the nebulae color scheme @end table Default value is @samp{channel}. diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index fbb0f78..227aff8 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, NB_CLMODES }; +enum ColorMode { CHANNEL, INTENSITY, RAINBOW, MORELAND, NEBULAE, NB_CLMODES }; enum SlideMode { REPLACE, SCROLL, FULLFRAME, RSCROLL, NB_SLIDES }; enum Orientation { VERTICAL, HORIZONTAL, NB_ORIENTATIONS }; @@ -84,6 +84,7 @@ static const AVOption showspectrum_options[] = { { "intensity", "intensity based coloring", 0, AV_OPT_TYPE_CONST, {.i64=INTENSITY}, 0, 0, FLAGS, "color" }, { "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" }, { "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" }, @@ -144,6 +145,15 @@ static const struct ColorTable { { 0.73, 177/256., (103-128)/256., (165-128)/256. }, { 0.86, 136/256., (100-128)/256., (183-128)/256. }, { 1, 68/256., (117-128)/256., (203-128)/256. }}, + [NEBULAE] = { + { 0, 10/256., (134-128)/256., (132-128)/256. }, + { 0.23, 21/256., (137-128)/256., (130-128)/256. }, + { 0.45, 35/256., (134-128)/256., (134-128)/256. }, + { 0.57, 51/256., (130-128)/256., (139-128)/256. }, + { 0.67, 104/256., (116-128)/256., (162-128)/256. }, + { 0.77, 120/256., (105-128)/256., (188-128)/256. }, + { 0.87, 140/256., (105-128)/256., (188-128)/256. }, + { 1, 1, 0, 0 }}, }; static av_cold void uninit(AVFilterContext *ctx) @@ -392,6 +402,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) switch (s->color_mode) { case RAINBOW: case MORELAND: + case NEBULAE: case INTENSITY: uf = yf; vf = yf;

1 0

mips: put "disable mipsfpu" in a better place for loongson
by git＠videolan.org 30 Dec '15

30 Dec '15

ffmpeg | branch: master | Vicente Olivert Riera <Vincent.Riera(a)imgtec.com> | Thu Dec 3 13:22:25 2015 +0000| [dde994751b16913afb59fbea2e0294e1e6468ef4] | committer: Michael Niedermayer mips: put "disable mipsfpu" in a better place for loongson Let's disable the ISAs first, and then the core capabilities, as we do for the rest of the cores. This way the code is better organized. Signed-off-by: Vicente Olivert Riera <Vincent.Riera(a)imgtec.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dde994751b16913af… --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 6d21e4a..7fee737 100755 --- a/configure +++ b/configure @@ -4198,11 +4198,11 @@ elif enabled mips; then add_asflags "-mfp64" ;; loongson*) - disable mipsfpu disable mips32r2 disable mips32r6 disable mips64r2 disable mips64r6 + disable mipsfpu disable mipsdsp disable mipsdspr2 disable msa

1 0

mips: add mips32r6 architecture variant
by git＠videolan.org 30 Dec '15

30 Dec '15

ffmpeg | branch: master | Vicente Olivert Riera <Vincent.Riera(a)imgtec.com> | Thu Dec 3 13:22:24 2015 +0000| [6a7e94cb14f31013261c337e217ca38c37fd9efd] | committer: Michael Niedermayer mips: add mips32r6 architecture variant Signed-off-by: Vicente Olivert Riera <Vincent.Riera(a)imgtec.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6a7e94cb14f310132… --- configure | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configure b/configure index 779ce77..6d21e4a 100755 --- a/configure +++ b/configure @@ -1666,6 +1666,7 @@ ARCH_EXT_LIST_MIPS=" mipsfpu mips32r2 mips64r2 + mips32r6 mips64r6 mipsdsp mipsdspr2 @@ -2155,6 +2156,7 @@ mipsfpu_deps="mips" mipsdsp_deps="mips" mipsdspr2_deps="mips" mips32r2_deps="mips" +mips32r6_deps="mips" mips64r2_deps="mips" mips64r6_deps="mips" msa_deps="mips" @@ -4130,6 +4132,7 @@ elif enabled mips; then case $cpu in 24kc) + disable mips32r6 disable mips64r2 disable mips64r6 disable mipsfpu @@ -4138,6 +4141,7 @@ elif enabled mips; then disable msa ;; 24kf*) + disable mips32r6 disable mips64r2 disable mips64r6 disable mipsdsp @@ -4145,6 +4149,7 @@ elif enabled mips; then disable msa ;; 24kec|34kc|1004kc) + disable mips32r6 disable mips64r2 disable mips64r6 disable mipsfpu @@ -4152,23 +4157,27 @@ elif enabled mips; then disable msa ;; 24kef*|34kf*|1004kf*) + disable mips32r6 disable mips64r2 disable mips64r6 disable mipsdspr2 disable msa ;; 74kc) + disable mips32r6 disable mips64r2 disable mips64r6 disable mipsfpu disable msa ;; 74kf) + disable mips32r6 disable mips64r2 disable mips64r6 disable msa ;; p5600) + disable mips32r6 disable mips64r2 disable mips64r6 disable mipsdsp @@ -4179,6 +4188,7 @@ elif enabled mips; then ;; i6400) disable mips32r2 + disable mips32r6 disable mips64r2 disable mipsdsp disable mipsdspr2 @@ -4190,6 +4200,7 @@ elif enabled mips; then loongson*) disable mipsfpu disable mips32r2 + disable mips32r6 disable mips64r2 disable mips64r6 disable mipsdsp @@ -4221,6 +4232,7 @@ elif enabled mips; then *) disable mipsfpu disable mips32r2 + disable mips32r6 disable mips64r2 disable mips64r6 disable mipsdsp

1 0

avformat/movenc: Use strict_std_compliance from the muxer layer instead of the encoder layer
by git＠videolan.org 30 Dec '15

30 Dec '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed May 27 01:58:24 2015 +0200| [389ce22b5f093e9eff3dc11ab7dd72fd12dcc17c] | committer: Michael Niedermayer avformat/movenc: Use strict_std_compliance from the muxer layer instead of the encoder layer Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=389ce22b5f093e9ef… --- libavformat/movenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index c059407..5594c6d 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5274,7 +5274,7 @@ static int mov_write_header(AVFormatContext *s) } if (track->mode != MODE_MOV && track->enc->codec_id == AV_CODEC_ID_MP3 && track->timescale < 16000) { - if (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL) { + if (s->strict_std_compliance >= FF_COMPLIANCE_NORMAL) { av_log(s, AV_LOG_ERROR, "track %d: muxing mp3 at %dhz is not standard, to mux anyway set strict to -1\n", i, track->enc->sample_rate); ret = AVERROR(EINVAL);

1 0

avfilter/avf_showspectrum: add moreland color map
by git＠videolan.org 30 Dec '15

30 Dec '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Dec 30 18:35:17 2015 +0100| [2893dbfe2c316904de8a445c43f0e3089224e584] | committer: Paul B Mahol avfilter/avf_showspectrum: add moreland color map Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2893dbfe2c316904d… --- doc/filters.texi | 2 ++ libavfilter/avf_showspectrum.c | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 144ca36..9fca4a1 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14617,6 +14617,8 @@ each channel is displayed in a separate color each channel is displayed using the same color scheme @item rainbow each channel is displayed using the rainbow color scheme +@item moreland +each channel is displayed using the moreland color scheme @end table Default value is @samp{channel}. diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 1eec55c..fbb0f78 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, NB_CLMODES }; +enum ColorMode { CHANNEL, INTENSITY, RAINBOW, MORELAND, NB_CLMODES }; enum SlideMode { REPLACE, SCROLL, FULLFRAME, RSCROLL, NB_SLIDES }; enum Orientation { VERTICAL, HORIZONTAL, NB_ORIENTATIONS }; @@ -82,7 +82,8 @@ static const AVOption showspectrum_options[] = { { "color", "set channel coloring", OFFSET(color_mode), AV_OPT_TYPE_INT, {.i64=CHANNEL}, CHANNEL, NB_CLMODES-1, FLAGS, "color" }, { "channel", "separate color for each channel", 0, AV_OPT_TYPE_CONST, {.i64=CHANNEL}, 0, 0, FLAGS, "color" }, { "intensity", "intensity based coloring", 0, AV_OPT_TYPE_CONST, {.i64=INTENSITY}, 0, 0, FLAGS, "color" }, - { "rainbow", "rainbow based coloring", 0, AV_OPT_TYPE_CONST, {.i64=RAINBOW}, 0, 0, FLAGS, "color" }, + { "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" }, { "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" }, @@ -134,6 +135,15 @@ static const struct ColorTable { { 0.73, 205/256., (19-128)/256., (149-128)/256. }, { 0.86, 135/256., (83-128)/256., (200-128)/256. }, { 1, 73/256., (95-128)/256., (225-128)/256. }}, + [MORELAND] = { + { 0, 44/256., (181-128)/256., (112-128)/256. }, + { 0.13, 126/256., (177-128)/256., (106-128)/256. }, + { 0.25, 164/256., (163-128)/256., (109-128)/256. }, + { 0.38, 200/256., (140-128)/256., (120-128)/256. }, + { 0.60, 201/256., (117-128)/256., (141-128)/256. }, + { 0.73, 177/256., (103-128)/256., (165-128)/256. }, + { 0.86, 136/256., (100-128)/256., (183-128)/256. }, + { 1, 68/256., (117-128)/256., (203-128)/256. }}, }; static av_cold void uninit(AVFilterContext *ctx) @@ -381,6 +391,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) yf = 256.0f / s->nb_display_channels; switch (s->color_mode) { case RAINBOW: + case MORELAND: case INTENSITY: uf = yf; vf = yf; @@ -442,8 +453,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) av_assert0(0); } - if (s->color_mode == INTENSITY || - s->color_mode == RAINBOW) { + if (s->color_mode > CHANNEL) { const int cm = s->color_mode; float y, u, v; int i;

1 0

lavc/cook: get rid of wasteful pow in init_pow2table
by git＠videolan.org 30 Dec '15

30 Dec '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Wed Dec 16 17:39:28 2015 -0800| [05434b0eea3f959b8b44be97c56bad6ab6a0dc22] | committer: Ganesh Ajjanagadde lavc/cook: get rid of wasteful pow in init_pow2table The table is highly structured, so pow (or exp2 for that matter) can entirely be avoided, yielding a ~ 40x speedup with no loss of accuracy. sample benchmark (Haswell, GNU/Linux): new: 4449 decicycles in init_pow2table(loop 1000), 254 runs, 2 skips 4411 decicycles in init_pow2table(loop 1000), 510 runs, 2 skips 4391 decicycles in init_pow2table(loop 1000), 1022 runs, 2 skips old: 183673 decicycles in init_pow2table(loop 1000), 256 runs, 0 skips 182142 decicycles in init_pow2table(loop 1000), 512 runs, 0 skips 182104 decicycles in init_pow2table(loop 1000), 1024 runs, 0 skips Reviewed-by: Clément Bœsch <u(a)pkh.me> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=05434b0eea3f959b8… --- libavcodec/cook.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavcodec/cook.c b/libavcodec/cook.c index d8fb736..1b38019 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -166,10 +166,17 @@ static float rootpow2tab[127]; /* table generator */ static av_cold void init_pow2table(void) { + /* fast way of computing 2^i and 2^(0.5*i) for -63 <= i < 64 */ int i; + static const float exp2_tab[2] = {1, M_SQRT2}; + float exp2_val = powf(2, -63); + float root_val = powf(2, -32); for (i = -63; i < 64; i++) { - pow2tab[63 + i] = pow(2, i); - rootpow2tab[63 + i] = sqrt(pow(2, i)); + if (!(i & 1)) + root_val *= 2; + pow2tab[63 + i] = exp2_val; + rootpow2tab[63 + i] = root_val * exp2_tab[i & 1]; + exp2_val *= 2; } }

1 0

lavc/dsd_tablegen: speed up table generation
by git＠videolan.org 30 Dec '15

30 Dec '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Tue Dec 29 08:18:44 2015 -0800| [b272c3a5aabeafb37d5aeecc4524e8a8aeecf9da] | committer: Ganesh Ajjanagadde lavc/dsd_tablegen: speed up table generation Tables are bit identical. Sample benchmark (Haswell, GNU/Linux+gcc): old: 814485 decicycles in dsd_ctables_tableinit, 512 runs, 0 skips new: 356808 decicycles in dsd_ctable_tableinit, 512 runs, 0 skips Binary size should essentially be identical, and is in fact identical on the configuration I tested on. Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b272c3a5aabeafb37… --- libavcodec/dsd_tablegen.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libavcodec/dsd_tablegen.h b/libavcodec/dsd_tablegen.h index 6afb416..d4ef302 100644 --- a/libavcodec/dsd_tablegen.h +++ b/libavcodec/dsd_tablegen.h @@ -78,16 +78,17 @@ static float ctables[CTABLES][256]; static av_cold void dsd_ctables_tableinit(void) { - int t, e, m, k; - double acc; - for (t = 0; t < CTABLES; ++t) { - k = FFMIN(HTAPS - t * 8, 8); - for (e = 0; e < 256; ++e) { - acc = 0.0; - for (m = 0; m < k; ++m) - acc += (((e >> (7 - m)) & 1) * 2 - 1) * htaps[t * 8 + m]; - ctables[CTABLES - 1 - t][e] = (float)acc; + int t, e, m, sign; + double acc[CTABLES]; + for (e = 0; e < 256; ++e) { + memset(acc, 0, sizeof(acc)); + for (m = 0; m < 8; ++m) { + sign = (((e >> (7 - m)) & 1) * 2 - 1); + for (t = 0; t < CTABLES; ++t) + acc[t] += sign * htaps[t * 8 + m]; } + for (t = 0; t < CTABLES; ++t) + ctables[CTABLES - 1 - t][e] = acc[t]; } } #endif /* CONFIG_HARDCODED_TABLES */

1 0

configure: make gcc 2 detection more robust
by git＠videolan.org 30 Dec '15

30 Dec '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Tue Dec 29 19:01:39 2015 -0800| [29bc293297a6edb44114818b3485f50c137d428d] | committer: Ganesh Ajjanagadde configure: make gcc 2 detection more robust Solves an issue that will get triggered when gcc 20 rolls in. Found-by: Hendrik Leppkes <h.leppkes(a)gmail.com> Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29bc293297a6edb44… --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index c986aba..779ce77 100755 --- a/configure +++ b/configure @@ -3699,7 +3699,8 @@ probe_cc(){ gcc_ext_ver=$(expr "$gcc_version" : ".*$gcc_pkg_ver $gcc_basever \$.*\$") _ident=$(cleanws "gcc $gcc_basever $gcc_pkg_ver $gcc_ext_ver") case $gcc_basever in - 2*) ;; + 2) ;; + 2.*) ;; *) _depflags='-MMD -MF $(@:.o=.d) -MT $@' ;; esac if [ "$first" = true ]; then

1 0

avfilter/avf_showspectrum: add rainbow colormap
by git＠videolan.org 29 Dec '15

29 Dec '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Dec 29 19:47:32 2015 +0100| [b0e23f2a37b45e8fa7e9ae91301d0ef572e80181] | committer: Paul B Mahol avfilter/avf_showspectrum: add rainbow colormap Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0e23f2a37b45e8fa… --- doc/filters.texi | 4 ++- libavfilter/avf_showspectrum.c | 60 +++++++++++++++++++++++++--------------- 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index e1b3c69..144ca36 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14614,7 +14614,9 @@ It accepts the following values: @item channel each channel is displayed in a separate color @item intensity -each channel is is displayed using the same color scheme +each channel is displayed using the same color scheme +@item rainbow +each channel is displayed using the rainbow color scheme @end table Default value is @samp{channel}. diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 1872135..1eec55c 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, NB_CLMODES }; +enum ColorMode { CHANNEL, INTENSITY, RAINBOW, NB_CLMODES }; enum SlideMode { REPLACE, SCROLL, FULLFRAME, RSCROLL, NB_SLIDES }; enum Orientation { VERTICAL, HORIZONTAL, NB_ORIENTATIONS }; @@ -82,6 +82,7 @@ static const AVOption showspectrum_options[] = { { "color", "set channel coloring", OFFSET(color_mode), AV_OPT_TYPE_INT, {.i64=CHANNEL}, CHANNEL, NB_CLMODES-1, FLAGS, "color" }, { "channel", "separate color for each channel", 0, AV_OPT_TYPE_CONST, {.i64=CHANNEL}, 0, 0, FLAGS, "color" }, { "intensity", "intensity based coloring", 0, AV_OPT_TYPE_CONST, {.i64=INTENSITY}, 0, 0, FLAGS, "color" }, + { "rainbow", "rainbow based coloring", 0, AV_OPT_TYPE_CONST, {.i64=RAINBOW}, 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" }, @@ -112,9 +113,10 @@ static const AVOption showspectrum_options[] = { AVFILTER_DEFINE_CLASS(showspectrum); -static const struct { +static const struct ColorTable { float a, y, u, v; -} intensity_color_table[] = { +} color_table[][8] = { + [INTENSITY] = { { 0, 0, 0, 0 }, { 0.13, .03587126228984074, .1573300977624594, -.02548747583751842 }, { 0.30, .18572281794568020, .1772436246393981, .17475554840414750 }, @@ -122,7 +124,16 @@ static const struct { { 0.73, .65830621175547810, -.3716070802232764, .24352759331252930 }, { 0.78, .76318535758242900, -.4307467689263783, .16866496622310430 }, { 0.91, .95336363636363640, -.2045454545454546, .03313636363636363 }, - { 1, 1, 0, 0 } + { 1, 1, 0, 0 }}, + [RAINBOW] = { + { 0, 0, 0, 0 }, + { 0.13, 44/256., (189-128)/256., (138-128)/256. }, + { 0.25, 29/256., (186-128)/256., (119-128)/256. }, + { 0.38, 119/256., (194-128)/256., (53-128)/256. }, + { 0.60, 111/256., (73-128)/256., (59-128)/256. }, + { 0.73, 205/256., (19-128)/256., (149-128)/256. }, + { 0.86, 135/256., (83-128)/256., (200-128)/256. }, + { 1, 73/256., (95-128)/256., (225-128)/256. }}, }; static av_cold void uninit(AVFilterContext *ctx) @@ -369,6 +380,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) // reduce range by channel count yf = 256.0f / s->nb_display_channels; switch (s->color_mode) { + case RAINBOW: case INTENSITY: uf = yf; vf = yf; @@ -430,33 +442,35 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) av_assert0(0); } - if (s->color_mode == INTENSITY) { + if (s->color_mode == INTENSITY || + s->color_mode == RAINBOW) { + const int cm = s->color_mode; float y, u, v; int i; - for (i = 1; i < FF_ARRAY_ELEMS(intensity_color_table) - 1; i++) - if (intensity_color_table[i].a >= a) + for (i = 1; i < FF_ARRAY_ELEMS(color_table[cm]) - 1; i++) + if (color_table[cm][i].a >= a) break; // i now is the first item >= the color // now we know to interpolate between item i - 1 and i - if (a <= intensity_color_table[i - 1].a) { - y = intensity_color_table[i - 1].y; - u = intensity_color_table[i - 1].u; - v = intensity_color_table[i - 1].v; - } else if (a >= intensity_color_table[i].a) { - y = intensity_color_table[i].y; - u = intensity_color_table[i].u; - v = intensity_color_table[i].v; + if (a <= color_table[cm][i - 1].a) { + y = color_table[cm][i - 1].y; + u = color_table[cm][i - 1].u; + v = color_table[cm][i - 1].v; + } else if (a >= color_table[cm][i].a) { + y = color_table[cm][i].y; + u = color_table[cm][i].u; + v = color_table[cm][i].v; } else { - float start = intensity_color_table[i - 1].a; - float end = intensity_color_table[i].a; + float start = color_table[cm][i - 1].a; + float end = color_table[cm][i].a; float lerpfrac = (a - start) / (end - start); - y = intensity_color_table[i - 1].y * (1.0f - lerpfrac) - + intensity_color_table[i].y * lerpfrac; - u = intensity_color_table[i - 1].u * (1.0f - lerpfrac) - + intensity_color_table[i].u * lerpfrac; - v = intensity_color_table[i - 1].v * (1.0f - lerpfrac) - + intensity_color_table[i].v * lerpfrac; + y = color_table[cm][i - 1].y * (1.0f - lerpfrac) + + color_table[cm][i].y * lerpfrac; + u = color_table[cm][i - 1].u * (1.0f - lerpfrac) + + color_table[cm][i].u * lerpfrac; + v = color_table[cm][i - 1].v * (1.0f - lerpfrac) + + color_table[cm][i].v * lerpfrac; } out[0] += y * yf;

1 0

oggparsedaala: check number of planes in pixel format map
by git＠videolan.org 29 Dec '15

29 Dec '15

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Tue Dec 29 16:38:26 2015 +0100| [b4466c9c1a82ce72011ed72e1221a30b15f73adb] | committer: Andreas Cadhalpun oggparsedaala: check number of planes in pixel format map This fixes crashes caused by out-of-bounds writes. Reviewed-by: Rostislav Pehlivanov <atomnuker(a)gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4466c9c1a82ce720… --- libavformat/oggparsedaala.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/oggparsedaala.c b/libavformat/oggparsedaala.c index dda8d70..24567f9 100644 --- a/libavformat/oggparsedaala.c +++ b/libavformat/oggparsedaala.c @@ -130,6 +130,12 @@ static int daala_header(AVFormatContext *s, int idx) hdr->fpr = bytestream2_get_byte(&gb); hdr->format.planes = bytestream2_get_byte(&gb); + if (hdr->format.planes > 4) { + av_log(s, AV_LOG_ERROR, + "Invalid number of planes %d in daala pixel format map.\n", + hdr->format.planes); + return AVERROR_INVALIDDATA; + } for (i = 0; i < hdr->format.planes; i++) { hdr->format.xdec[i] = bytestream2_get_byte(&gb); hdr->format.ydec[i] = bytestream2_get_byte(&gb);

1 0