December 2015 - ffmpeg-cvslog

ffprobe: avoid unnecessary pow and exp2 calls
by git＠videolan.org 29 Dec '15

29 Dec '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Wed Dec 23 09:49:00 2015 -0800| [4a44bc5588944cb8a81e0896bc97643e0c894989] | committer: Ganesh Ajjanagadde ffprobe: avoid unnecessary pow and exp2 calls These are just for prefixes and may be hardcoded easily; see lavu/eval for this approach. Reviewed-by: Stefano Sabatini <stefasab(a)gmail.com> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a44bc5588944cb8a… --- ffprobe.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/ffprobe.c b/ffprobe.c index 0b672ff..c352b44 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -218,8 +218,19 @@ static AVInputFormat *iformat = NULL; static struct AVHashContext *hash; -static const char *const binary_unit_prefixes [] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" }; -static const char *const decimal_unit_prefixes[] = { "", "K" , "M" , "G" , "T" , "P" }; +static const struct { + double bin_val; + double dec_val; + const char *bin_str; + const char *dec_str; +} si_prefixes[] = { + { 1.0, 1.0, "", "" }, + { 1.024e3, 1e3, "Ki", "K" }, + { 1.048576e6, 1e6, "Mi", "M" }, + { 1.073741824e9, 1e9, "Gi", "G" }, + { 1.099511627776e12, 1e12, "Ti", "T" }, + { 1.125899906842624e15, 1e15, "Pi", "P" }, +}; static const char unit_second_str[] = "s" ; static const char unit_hertz_str[] = "Hz" ; @@ -273,14 +284,14 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv) if (uv.unit == unit_byte_str && use_byte_value_binary_prefix) { index = (long long int) (log2(vald)) / 10; - index = av_clip(index, 0, FF_ARRAY_ELEMS(binary_unit_prefixes) - 1); - vald /= exp2(index * 10); - prefix_string = binary_unit_prefixes[index]; + index = av_clip(index, 0, FF_ARRAY_ELEMS(si_prefixes) - 1); + vald /= si_prefixes[index].bin_val; + prefix_string = si_prefixes[index].bin_str; } else { index = (long long int) (log10(vald)) / 3; - index = av_clip(index, 0, FF_ARRAY_ELEMS(decimal_unit_prefixes) - 1); - vald /= pow(10, index * 3); - prefix_string = decimal_unit_prefixes[index]; + index = av_clip(index, 0, FF_ARRAY_ELEMS(si_prefixes) - 1); + vald /= si_prefixes[index].dec_val; + prefix_string = si_prefixes[index].dec_str; } vali = vald; }

1 0

ffserver: Cast time_t value when using it in a format string.
by git＠videolan.org 29 Dec '15

29 Dec '15

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Tue Dec 29 16:00:34 2015 +0100| [e5c16e38fe15a40b2d38bd7ab83e1243012a2077] | committer: Carl Eugen Hoyos ffserver: Cast time_t value when using it in a format string. Fixes ticket #5103. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5c16e38fe15a40b2… --- ffserver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffserver.c b/ffserver.c index 889dbd4..bc7dbee 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3934,7 +3934,7 @@ static void handle_child_exit(int sig) fprintf(stderr, "%s: Pid %"PRId64" exited with status %d after %"PRId64" " "seconds\n", - feed->filename, (int64_t) pid, status, uptime); + feed->filename, (int64_t) pid, status, (int64_t)uptime); if (uptime < 30) /* Turn off any more restarts */

1 0

lavf/qtpalette: Treat 1-bit video as palettized
by git＠videolan.org 29 Dec '15

29 Dec '15

ffmpeg | branch: master | Mats Peterson <matsp888(a)yahoo.com> | Tue Dec 29 07:35:00 2015 +0100| [bd03ee1184e404e8fc69f8ab4787b2ee02554d5b] | committer: Michael Niedermayer lavf/qtpalette: Treat 1-bit video as palettized This commit for qtpalette.c and qtpalette.h adds 1-bit video to the "palettized video" category, since if the video sample description contains a palette, the two colors in the palette can be any color, not necessarily black & white. Unfortunately, I've noticed that the qtrle (QuickTime Animation) decoder blindly assumes that 1-bit video is black & white. I don't have enough knowledge about the decoder to fix this, though. Below is a link to a sample 1-bit QuickTime Animation clip of a rotating earth that uses blueish colors, and they will be correctly rendered in QuickTime, but not in FFmpeg (which will use black & white). https://drive.google.com/open?id=0B3_pEBoLs0faUlItWm9KaGJSTEE Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd03ee1184e404e8f… --- libavformat/qtpalette.c | 8 +++++--- libavformat/qtpalette.h | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libavformat/qtpalette.c b/libavformat/qtpalette.c index 770df56..6544a55 100644 --- a/libavformat/qtpalette.c +++ b/libavformat/qtpalette.c @@ -46,8 +46,8 @@ int ff_get_qtpalette(int codec_id, AVIOContext *pb, uint32_t *palette) if (greyscale && codec_id == AV_CODEC_ID_CINEPAK) return 0; - /* If the depth is 2, 4, or 8 bpp, file is palettized. */ - if ((bit_depth == 2 || bit_depth == 4 || bit_depth == 8)) { + /* If the depth is 1, 2, 4, or 8 bpp, file is palettized. */ + if ((bit_depth == 1 || bit_depth == 2 || bit_depth == 4 || bit_depth == 8)) { int color_count, color_start, color_end; uint32_t a, r, g, b; @@ -70,7 +70,9 @@ int ff_get_qtpalette(int codec_id, AVIOContext *pb, uint32_t *palette) * color table */ const uint8_t *color_table; color_count = 1 << bit_depth; - if (bit_depth == 2) + if (bit_depth == 1) + color_table = ff_qt_default_palette_2; + else if (bit_depth == 2) color_table = ff_qt_default_palette_4; else if (bit_depth == 4) color_table = ff_qt_default_palette_16; diff --git a/libavformat/qtpalette.h b/libavformat/qtpalette.h index da83421..b2bd360 100644 --- a/libavformat/qtpalette.h +++ b/libavformat/qtpalette.h @@ -26,6 +26,11 @@ #include <stdint.h> #include "avformat.h" +static const uint8_t ff_qt_default_palette_2[2 * 3] = { + 0xFF, 0xFF, 0xFF, + 0x00, 0x00, 0x00 +}; + static const uint8_t ff_qt_default_palette_4[4 * 3] = { 0x93, 0x65, 0x5E, 0xFF, 0xFF, 0xFF,

1 0

avcodec: Use get_ue_golomb_long() when needed
by git＠videolan.org 29 Dec '15

29 Dec '15

ffmpeg | branch: master | Mark Harris <mark.hsj(a)gmail.com> | Mon Dec 28 23:04:08 2015 -0800| [c51c08e0e70c186971385bdbb225f69edd4e3375] | committer: Michael Niedermayer avcodec: Use get_ue_golomb_long() when needed get_ue_golomb() cannot decode values larger than 8190 (the maximum value that can be golomb encoded in 25 bits) and produces the error "Invalid UE golomb code" if a larger value is encountered. Use get_ue_golomb_long() instead (which supports 63 bits, up to 4294967294) when valid h264/hevc values can exceed 8190. This updates decoding of the following values: (maximum) first_mb_in_slice 36863* for level 5.2 abs_diff_pic_num_minus1 131071 difference_of_pic_nums_minus1 131071 idr_pic_id 65535 recovery_frame_cnt 65535 frame_packing_arrangement_id 4294967294 frame_packing_arrangement_repetition_period 16384 display_orientation_repetition_period 16384 An alternative would be to modify get_ue_golomb() to handle encoded values of up to 49 bits as was done for get_se_golomb() in a92816c. In that case get_ue_golomb() could continue to be used for all of these except frame_packing_arrangement_id. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c51c08e0e70c18697… --- libavcodec/golomb.h | 2 +- libavcodec/h264.c | 2 +- libavcodec/h264_parser.c | 6 +++--- libavcodec/h264_refs.c | 4 ++-- libavcodec/h264_sei.c | 10 +++++----- libavcodec/h264_slice.c | 2 +- libavcodec/hevc_sei.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 5136a04..d4df0b3 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -48,7 +48,7 @@ extern const int8_t ff_interleaved_se_golomb_vlc_code[256]; extern const uint8_t ff_interleaved_dirac_golomb_vlc_code[256]; /** - * read unsigned exp golomb code. + * Read an unsigned Exp-Golomb code in the range 0 to 8190. */ static inline int get_ue_golomb(GetBitContext *gb) { diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 089a86f..139011b 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1365,7 +1365,7 @@ static int get_last_needed_nal(H264Context *h, const uint8_t *buf, int buf_size) case NAL_IDR_SLICE: case NAL_SLICE: init_get_bits(&gb, ptr, bit_length); - if (!get_ue_golomb(&gb) || + if (!get_ue_golomb_long(&gb) || // first_mb_in_slice !first_slice || first_slice != h->nal_unit_type) nals_needed = nal_index; diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 19d1aa3..12d6397 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -152,7 +152,7 @@ static int scan_mmco_reset(AVCodecParserContext *s) unsigned int reordering_of_pic_nums_idc = get_ue_golomb_31(&sl->gb); if (reordering_of_pic_nums_idc < 3) - get_ue_golomb(&sl->gb); + get_ue_golomb_long(&sl->gb); else if (reordering_of_pic_nums_idc > 3) { av_log(h->avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc %d\n", @@ -191,7 +191,7 @@ static int scan_mmco_reset(AVCodecParserContext *s) return 1; if (opcode == MMCO_SHORT2UNUSED || opcode == MMCO_SHORT2LONG) - get_ue_golomb(&sl->gb); + get_ue_golomb_long(&sl->gb); // difference_of_pic_nums_minus1 if (opcode == MMCO_SHORT2LONG || opcode == MMCO_LONG2UNUSED || opcode == MMCO_LONG || opcode == MMCO_SET_MAX_LONG) get_ue_golomb_31(&sl->gb); @@ -373,7 +373,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, } if (h->nal_unit_type == NAL_IDR_SLICE) - get_ue_golomb(&sl->gb); /* idr_pic_id */ + get_ue_golomb_long(&sl->gb); /* idr_pic_id */ if (h->sps.poc_type == 0) { h->poc_lsb = get_bits(&sl->gb, h->sps.log2_max_poc_lsb); diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index fbdcbd6..52fedc1 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -266,7 +266,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl) switch (modification_of_pic_nums_idc) { case 0: case 1: { - const unsigned int abs_diff_pic_num = get_ue_golomb(&sl->gb) + 1; + const unsigned int abs_diff_pic_num = get_ue_golomb_long(&sl->gb) + 1; int frame_num; if (abs_diff_pic_num > h->max_pic_num) { @@ -843,7 +843,7 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb, mmco[i].opcode = opcode; if (opcode == MMCO_SHORT2UNUSED || opcode == MMCO_SHORT2LONG) { mmco[i].short_pic_num = - (h->curr_pic_num - get_ue_golomb(gb) - 1) & + (h->curr_pic_num - get_ue_golomb_long(gb) - 1) & (h->max_pic_num - 1); #if 0 if (mmco[i].short_pic_num >= h->short_ref_count || diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 0411b87..77dd7b2 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -253,7 +253,7 @@ static int decode_unregistered_user_data(H264Context *h, int size) static int decode_recovery_point(H264Context *h) { - h->sei_recovery_frame_cnt = get_ue_golomb(&h->gb); + h->sei_recovery_frame_cnt = get_ue_golomb_long(&h->gb); /* 1b exact_match_flag, * 1b broken_link_flag, @@ -306,7 +306,7 @@ static int decode_buffering_period(H264Context *h) static int decode_frame_packing_arrangement(H264Context *h) { - h->sei_fpa.frame_packing_arrangement_id = get_ue_golomb(&h->gb); + h->sei_fpa.frame_packing_arrangement_id = get_ue_golomb_long(&h->gb); h->sei_fpa.frame_packing_arrangement_cancel_flag = get_bits1(&h->gb); h->sei_frame_packing_present = !h->sei_fpa.frame_packing_arrangement_cancel_flag; @@ -326,7 +326,7 @@ static int decode_frame_packing_arrangement(H264Context *h) if (!h->quincunx_subsampling && h->frame_packing_arrangement_type != 5) skip_bits(&h->gb, 16); // frame[01]_grid_position_[xy] skip_bits(&h->gb, 8); // frame_packing_arrangement_reserved_byte - h->sei_fpa.frame_packing_arrangement_repetition_period = get_ue_golomb(&h->gb) /* frame_packing_arrangement_repetition_period */; + h->sei_fpa.frame_packing_arrangement_repetition_period = get_ue_golomb_long(&h->gb); } skip_bits1(&h->gb); // frame_packing_arrangement_extension_flag @@ -351,8 +351,8 @@ static int decode_display_orientation(H264Context *h) h->sei_vflip = get_bits1(&h->gb); // ver_flip h->sei_anticlockwise_rotation = get_bits(&h->gb, 16); - get_ue_golomb(&h->gb); // display_orientation_repetition_period - skip_bits1(&h->gb); // display_orientation_extension_flag + get_ue_golomb_long(&h->gb); // display_orientation_repetition_period + skip_bits1(&h->gb); // display_orientation_extension_flag } return 0; diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 2db7ca2..318302f 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1688,7 +1688,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } if (h->nal_unit_type == NAL_IDR_SLICE) - get_ue_golomb(&sl->gb); /* idr_pic_id */ + get_ue_golomb_long(&sl->gb); /* idr_pic_id */ if (h->sps.poc_type == 0) { int poc_lsb = get_bits(&sl->gb, h->sps.log2_max_poc_lsb); diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index 46cd06b..07856f2 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -82,7 +82,7 @@ static int decode_nal_sei_frame_packing_arrangement(HEVCContext *s) { GetBitContext *gb = &s->HEVClc->gb; - get_ue_golomb(gb); // frame_packing_arrangement_id + get_ue_golomb_long(gb); // frame_packing_arrangement_id s->sei_frame_packing_present = !get_bits1(gb); if (s->sei_frame_packing_present) {

1 0

avfilter/avf_showspectrum: add horizontal orientation support
by git＠videolan.org 29 Dec '15

29 Dec '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Dec 29 09:45:44 2015 +0100| [e30e5c83aed79f1ecde064c36b952aee4fc7827b] | committer: Paul B Mahol avfilter/avf_showspectrum: add horizontal orientation support Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e30e5c83aed79f1ec… --- doc/filters.texi | 4 ++ libavfilter/avf_showspectrum.c | 152 +++++++++++++++++++++++++++++----------- 2 files changed, 115 insertions(+), 41 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 1d14bc9..e1b3c69 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14665,6 +14665,10 @@ It accepts the following values: @end table Default value is @code{hann}. + +@item orientation +Set orientation of time vs frequency axis. Can be @code{vertical} or +@code{horizontal}. Default is @code{vertical}. @end table The usage is very similar to the showwaves filter; see the examples in that diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 55cc668..fa99457 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -39,12 +39,15 @@ enum DisplayMode { COMBINED, SEPARATE, NB_MODES }; enum DisplayScale { LINEAR, SQRT, CBRT, LOG, NB_SCALES }; enum ColorMode { CHANNEL, INTENSITY, NB_CLMODES }; enum SlideMode { REPLACE, SCROLL, FULLFRAME, RSCROLL, NB_SLIDES }; +enum Orientation { VERTICAL, HORIZONTAL, NB_ORIENTATIONS }; typedef struct { const AVClass *class; int w, h; AVFrame *outpicref; int nb_display_channels; + int orientation; + int channel_width; int channel_height; int sliding; ///< 1 if sliding mode, 0 otherwise int mode; ///< channel display mode @@ -100,6 +103,9 @@ static const AVOption showspectrum_options[] = { { "nuttall", "Nuttall", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_NUTTALL}, 0, 0, FLAGS, "win_func" }, { "lanczos", "Lanczos", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_LANCZOS}, 0, 0, FLAGS, "win_func" }, { "gauss", "Gauss", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_GAUSS}, 0, 0, FLAGS, "win_func" }, + { "orientation", "set orientation", OFFSET(orientation), AV_OPT_TYPE_INT, {.i64=VERTICAL}, 0, NB_ORIENTATIONS-1, FLAGS, "orientation" }, + { "vertical", NULL, 0, AV_OPT_TYPE_CONST, {.i64=VERTICAL}, 0, 0, FLAGS, "orientation" }, + { "horizontal", NULL, 0, AV_OPT_TYPE_CONST, {.i64=HORIZONTAL}, 0, 0, FLAGS, "orientation" }, { NULL } }; @@ -168,16 +174,23 @@ static int config_output(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; AVFilterLink *inlink = ctx->inputs[0]; ShowSpectrumContext *s = ctx->priv; - int i, rdft_bits, win_size, h; + int i, rdft_bits, win_size, h, w; outlink->w = s->w; outlink->h = s->h; - h = (s->mode == COMBINED) ? outlink->h : outlink->h / inlink->channels; + h = (s->mode == COMBINED || s->orientation == HORIZONTAL) ? outlink->h : outlink->h / inlink->channels; + w = (s->mode == COMBINED || s->orientation == VERTICAL) ? outlink->w : outlink->w / inlink->channels; s->channel_height = h; - - /* RDFT window size (precision) according to the requested output frame height */ - for (rdft_bits = 1; 1 << rdft_bits < 2 * h; rdft_bits++); + s->channel_width = w; + + if (s->orientation == VERTICAL) { + /* RDFT window size (precision) according to the requested output frame height */ + for (rdft_bits = 1; 1 << rdft_bits < 2 * h; rdft_bits++); + } else { + /* RDFT window size (precision) according to the requested output frame width */ + for (rdft_bits = 1; 1 << rdft_bits < 2 * w; rdft_bits++); + } win_size = 1 << rdft_bits; /* (re-)configuration if the video output changed (or first init) */ @@ -232,19 +245,28 @@ static int config_output(AVFilterLink *outlink) } } - if (s->xpos >= outlink->w) + if ((s->orientation == VERTICAL && s->xpos >= outlink->w) || + (s->orientation == HORIZONTAL && s->xpos >= outlink->h)) s->xpos = 0; outlink->frame_rate = av_make_q(inlink->sample_rate, win_size); - if (s->sliding == FULLFRAME) + if (s->orientation == VERTICAL && s->sliding == FULLFRAME) outlink->frame_rate.den *= outlink->w; + if (s->orientation == HORIZONTAL && s->sliding == FULLFRAME) + outlink->frame_rate.den *= outlink->h; inlink->min_samples = inlink->max_samples = inlink->partial_buf_size = win_size; - s->combine_buffer = - av_realloc_f(s->combine_buffer, outlink->h * 3, - sizeof(*s->combine_buffer)); + if (s->orientation == VERTICAL) { + s->combine_buffer = + av_realloc_f(s->combine_buffer, outlink->h * 3, + sizeof(*s->combine_buffer)); + } else { + s->combine_buffer = + av_realloc_f(s->combine_buffer, outlink->w * 3, + sizeof(*s->combine_buffer)); + } av_log(ctx, AV_LOG_VERBOSE, "s:%dx%d RDFT window size:%d\n", s->w, s->h, win_size); @@ -261,10 +283,18 @@ static int request_frame(AVFilterLink *outlink) ret = ff_request_frame(inlink); if (ret == AVERROR_EOF && s->sliding == FULLFRAME && s->xpos > 0 && s->outpicref) { - for (i = 0; i < outlink->h; i++) { - memset(s->outpicref->data[0] + i * s->outpicref->linesize[0] + s->xpos, 0, outlink->w - s->xpos); - memset(s->outpicref->data[1] + i * s->outpicref->linesize[1] + s->xpos, 128, outlink->w - s->xpos); - memset(s->outpicref->data[2] + i * s->outpicref->linesize[2] + s->xpos, 128, outlink->w - s->xpos); + if (s->orientation == VERTICAL) { + for (i = 0; i < outlink->h; i++) { + memset(s->outpicref->data[0] + i * s->outpicref->linesize[0] + s->xpos, 0, outlink->w - s->xpos); + memset(s->outpicref->data[1] + i * s->outpicref->linesize[1] + s->xpos, 128, outlink->w - s->xpos); + memset(s->outpicref->data[2] + i * s->outpicref->linesize[2] + s->xpos, 128, outlink->w - s->xpos); + } + } else { + for (i = s->xpos; i < outlink->h; i++) { + memset(s->outpicref->data[0] + i * s->outpicref->linesize[0], 0, outlink->w); + memset(s->outpicref->data[1] + i * s->outpicref->linesize[1], 128, outlink->w); + memset(s->outpicref->data[2] + i * s->outpicref->linesize[2], 128, outlink->w); + } } ret = ff_filter_frame(outlink, s->outpicref); s->outpicref = NULL; @@ -286,9 +316,9 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) const int nb_freq = 1 << (s->rdft_bits - 1); const int win_size = nb_freq << 1; const double w = 1. / (sqrt(nb_freq) * 32768.); - int h = s->channel_height; + int h = s->orientation == VERTICAL ? s->channel_height : s->channel_width; - int ch, plane, n, y; + int ch, plane, n, x, y; av_assert0(insamples->nb_samples == win_size); @@ -310,10 +340,18 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) #define MAGNITUDE(y, ch) hypot(RE(y, ch), IM(y, ch)) /* initialize buffer for combining to black */ - for (y = 0; y < outlink->h; y++) { - s->combine_buffer[3 * y ] = 0; - s->combine_buffer[3 * y + 1] = 127.5; - s->combine_buffer[3 * y + 2] = 127.5; + if (s->orientation == VERTICAL) { + for (y = 0; y < outlink->h; y++) { + s->combine_buffer[3 * y ] = 0; + s->combine_buffer[3 * y + 1] = 127.5; + s->combine_buffer[3 * y + 2] = 127.5; + } + } else { + for (y = 0; y < outlink->w; y++) { + s->combine_buffer[3 * y ] = 0; + s->combine_buffer[3 * y + 1] = 127.5; + s->combine_buffer[3 * y + 2] = 127.5; + } } for (ch = 0; ch < s->nb_display_channels; ch++) { @@ -427,32 +465,62 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) } /* copy to output */ - if (s->sliding == SCROLL) { - for (plane = 0; plane < 3; plane++) { - for (y = 0; y < outlink->h; y++) { - uint8_t *p = outpicref->data[plane] + - y * outpicref->linesize[plane]; - memmove(p, p + 1, outlink->w - 1); + if (s->orientation == VERTICAL) { + if (s->sliding == SCROLL) { + for (plane = 0; plane < 3; plane++) { + for (y = 0; y < outlink->h; y++) { + uint8_t *p = outpicref->data[plane] + + y * outpicref->linesize[plane]; + memmove(p, p + 1, outlink->w - 1); + } } + s->xpos = outlink->w - 1; + } else if (s->sliding == RSCROLL) { + for (plane = 0; plane < 3; plane++) { + for (y = 0; y < outlink->h; y++) { + uint8_t *p = outpicref->data[plane] + + y * outpicref->linesize[plane]; + memmove(p + 1, p, outlink->w - 1); + } + } + s->xpos = 0; } - s->xpos = outlink->w - 1; - } else if (s->sliding == RSCROLL) { for (plane = 0; plane < 3; plane++) { + uint8_t *p = outpicref->data[plane] + + (outlink->h - 1) * outpicref->linesize[plane] + + s->xpos; for (y = 0; y < outlink->h; y++) { - uint8_t *p = outpicref->data[plane] + - y * outpicref->linesize[plane]; - memmove(p + 1, p, outlink->w - 1); + *p = lrint(FFMAX(0, FFMIN(s->combine_buffer[3 * y + plane], 255))); + p -= outpicref->linesize[plane]; } } - s->xpos = 0; - } - for (plane = 0; plane < 3; plane++) { - uint8_t *p = outpicref->data[plane] + - (outlink->h - 1) * outpicref->linesize[plane] + - s->xpos; - for (y = 0; y < outlink->h; y++) { - *p = lrint(FFMAX(0, FFMIN(s->combine_buffer[3 * y + plane], 255))); - p -= outpicref->linesize[plane]; + } else { + if (s->sliding == SCROLL) { + for (plane = 0; plane < 3; plane++) { + for (y = 1; y < outlink->h; y++) { + memmove(outpicref->data[plane] + (y-1) * outpicref->linesize[plane], + outpicref->data[plane] + (y ) * outpicref->linesize[plane], + outlink->w); + } + } + s->xpos = outlink->h - 1; + } else if (s->sliding == RSCROLL) { + for (plane = 0; plane < 3; plane++) { + for (y = outlink->h - 1; y >= 1; y--) { + memmove(outpicref->data[plane] + (y ) * outpicref->linesize[plane], + outpicref->data[plane] + (y-1) * outpicref->linesize[plane], + outlink->w); + } + } + s->xpos = 0; + } + for (plane = 0; plane < 3; plane++) { + uint8_t *p = outpicref->data[plane] + + s->xpos * outpicref->linesize[plane]; + for (x = 0; x < outlink->w; x++) { + *p = lrint(FFMAX(0, FFMIN(s->combine_buffer[3 * x + plane], 255))); + p++; + } } } @@ -460,7 +528,9 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) outpicref->pts = insamples->pts; s->xpos++; - if (s->xpos >= outlink->w) + if (s->orientation == VERTICAL && s->xpos >= outlink->w) + s->xpos = 0; + if (s->orientation == HORIZONTAL && s->xpos >= outlink->h) s->xpos = 0; if (s->sliding != FULLFRAME || s->xpos == 0) { ret = ff_filter_frame(outlink, av_frame_clone(s->outpicref));

1 0

avfilter/avf_showspectrum: properly calculate w factor
by git＠videolan.org 29 Dec '15

29 Dec '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Dec 28 23:45:34 2015 +0100| [efa666e0da5e5fd2ded2e7dce4191bf04ac35952] | committer: Paul B Mahol avfilter/avf_showspectrum: properly calculate w factor It is used in calculating loudness of each frequency bin. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efa666e0da5e5fd2d… --- libavfilter/avf_showspectrum.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index fa99457..1872135 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -60,6 +60,7 @@ typedef struct { FFTSample **rdft_data; ///< bins holder for each (displayed) channels float *window_func_lut; ///< Window function LUT int win_func; + double win_scale; float overlap; float *combine_buffer; ///< color combining buffer (3 * h items) } ShowSpectrumContext; @@ -231,6 +232,11 @@ static int config_output(AVFilterLink *outlink) return AVERROR(ENOMEM); ff_generate_window_func(s->window_func_lut, win_size, s->win_func, &s->overlap); + for (s->win_scale = 0, i = 0; i < win_size; i++) { + s->win_scale += s->window_func_lut[i] * s->window_func_lut[i]; + } + s->win_scale = 1. / (sqrt(s->win_scale) * 32768.); + /* prepare the initial picref buffer (black frame) */ av_frame_free(&s->outpicref); s->outpicref = outpicref = @@ -315,7 +321,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) * height (or half the RDFT window size) */ const int nb_freq = 1 << (s->rdft_bits - 1); const int win_size = nb_freq << 1; - const double w = 1. / (sqrt(nb_freq) * 32768.); + const double w = s->win_scale; int h = s->orientation == VERTICAL ? s->channel_height : s->channel_width; int ch, plane, n, x, y;

1 0

lavfi/af_anequalizer: replace pow(x, -2) by 1/(x*x)
by git＠videolan.org 29 Dec '15

29 Dec '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Sun Dec 27 16:50:09 2015 -0800| [9f4c7b4df7f31755b7caf4d080c7577c787c1e72] | committer: Ganesh Ajjanagadde lavfi/af_anequalizer: replace pow(x,-2) by 1/(x*x) Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f4c7b4df7f31755b… --- libavfilter/af_anequalizer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_anequalizer.c b/libavfilter/af_anequalizer.c index d7b5b6c..649c0b9 100644 --- a/libavfilter/af_anequalizer.c +++ b/libavfilter/af_anequalizer.c @@ -391,8 +391,8 @@ static void chebyshev1_bp_filter(EqualizatorFilter *f, epsilon = sqrt((G*G - Gb*Gb) / (Gb*Gb - G0*G0)); g0 = pow(G0,1.0/N); - alfa = pow(1.0/epsilon + sqrt(1 + pow(epsilon,-2.0)), 1.0/N); - beta = pow(G/epsilon + Gb * sqrt(1 + pow(epsilon,-2.0)), 1.0/N); + alfa = pow(1.0/epsilon + sqrt(1 + 1/(epsilon*epsilon)), 1.0/N); + beta = pow(G/epsilon + Gb * sqrt(1 + 1/(epsilon*epsilon)), 1.0/N); a = 0.5 * (alfa - 1.0/alfa); b = 0.5 * (beta - g0*g0*(1/beta)); tetta_b = tan(wb/2);

1 0

lavfi/af_anequalizer: remove cabs, cexp dependencies
by git＠videolan.org 29 Dec '15

29 Dec '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Sat Dec 26 21:51:28 2015 -0800| [63702014fa4e4bb812fa984ca748f3178bd1174f] | committer: Ganesh Ajjanagadde lavfi/af_anequalizer: remove cabs, cexp dependencies Replaces by real arithmetic. Tested the validity of these transformations separately. Numerical differences are ~1e-15, and should not matter: it is not even clear which is more precise mathematically. Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63702014fa4e4bb81… --- configure | 1 - libavfilter/af_anequalizer.c | 25 +++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/configure b/configure index a510e8f..c986aba 100755 --- a/configure +++ b/configure @@ -2839,7 +2839,6 @@ unix_protocol_select="network" # filters amovie_filter_deps="avcodec avformat" -anequalizer_filter_deps="cabs cexp" aresample_filter_deps="swresample" ass_filter_deps="libass" asyncts_filter_deps="avresample" diff --git a/libavfilter/af_anequalizer.c b/libavfilter/af_anequalizer.c index e817fdc..e45c108 100644 --- a/libavfilter/af_anequalizer.c +++ b/libavfilter/af_anequalizer.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <complex.h> - #include "libavutil/intreadwrite.h" #include "libavutil/avstring.h" #include "libavutil/opt.h" @@ -114,13 +112,17 @@ static void draw_curves(AVFilterContext *ctx, AVFilterLink *inlink, AVFrame *out av_parse_color(fg, color, -1, ctx); for (f = 0; f < s->w; f++) { - double complex z; - double complex H = 1; + double zr, zi, zr2, zi2; + double Hr, Hi; + double Hmag = 1; double w; int v, y, x; w = M_PI * (s->fscale ? pow(s->w - 1, f / s->w) : f) / (s->w - 1); - z = 1. / cexp(I * w); + zr = cos(w); + zr2 = zr * zr; + zi = -sin(w); + zi2 = zi * zi; for (n = 0; n < s->nb_filters; n++) { if (s->filters[n].channel != ch || @@ -130,12 +132,19 @@ static void draw_curves(AVFilterContext *ctx, AVFilterLink *inlink, AVFrame *out for (i = 0; i < FILTER_ORDER / 2; i++) { FoSection *S = &s->filters[n].section[i]; - H *= (((((S->b4 * z + S->b3) * z + S->b2) * z + S->b1) * z + S->b0) / - ((((S->a4 * z + S->a3) * z + S->a2) * z + S->a1) * z + S->a0)); + /* H *= (((((S->b4 * z + S->b3) * z + S->b2) * z + S->b1) * z + S->b0) / + ((((S->a4 * z + S->a3) * z + S->a2) * z + S->a1) * z + S->a0)); */ + + Hr = S->b4*(1-8*zr2*zi2) + S->b2*(zr2-zi2) + zr*(S->b1+S->b3*(zr2-3*zi2))+ S->b0; + Hi = zi*(S->b3*(3*zr2-zi2) + S->b1 + 2*zr*(2*S->b4*(zr2-zi2) + S->b2)); + Hmag *= hypot(Hr, Hi); + Hr = S->a4*(1-8*zr2*zi2) + S->a2*(zr2-zi2) + zr*(S->a1+S->a3*(zr2-3*zi2))+ S->a0; + Hi = zi*(S->a3*(3*zr2-zi2) + S->a1 + 2*zr*(2*S->a4*(zr2-zi2) + S->a2)); + Hmag /= hypot(Hr, Hi); } } - v = av_clip((1. + -20 * log10(cabs(H)) / s->mag) * s->h / 2, 0, s->h - 1); + v = av_clip((1. + -20 * log10(Hmag) / s->mag) * s->h / 2, 0, s->h - 1); x = lrint(f); if (prev_v == -1) prev_v = v;

1 0

lavfi/af_anequalizer: replace pow(10, x) by ff_exp10(x)
by git＠videolan.org 29 Dec '15

29 Dec '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Sun Dec 27 16:48:52 2015 -0800| [59ac7ce4dac5b2a68c4afb827b03a595e2d2f32e] | committer: Ganesh Ajjanagadde lavfi/af_anequalizer: replace pow(10,x) by ff_exp10(x) Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59ac7ce4dac5b2a68… --- libavfilter/af_anequalizer.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavfilter/af_anequalizer.c b/libavfilter/af_anequalizer.c index e45c108..d7b5b6c 100644 --- a/libavfilter/af_anequalizer.c +++ b/libavfilter/af_anequalizer.c @@ -316,9 +316,9 @@ static void butterworth_bp_filter(EqualizatorFilter *f, return; } - G = pow(10, G/20); - Gb = pow(10, Gb/20); - G0 = pow(10, G0/20); + G = ff_exp10(G/20); + Gb = ff_exp10(Gb/20); + G0 = ff_exp10(G0/20); epsilon = sqrt((G * G - Gb * Gb) / (Gb * Gb - G0 * G0)); g = pow(G, 1.0 / N); @@ -385,9 +385,9 @@ static void chebyshev1_bp_filter(EqualizatorFilter *f, return; } - G = pow(10, G/20); - Gb = pow(10, Gb/20); - G0 = pow(10, G0/20); + G = ff_exp10(G/20); + Gb = ff_exp10(Gb/20); + G0 = ff_exp10(G0/20); epsilon = sqrt((G*G - Gb*Gb) / (Gb*Gb - G0*G0)); g0 = pow(G0,1.0/N); @@ -458,9 +458,9 @@ static void chebyshev2_bp_filter(EqualizatorFilter *f, return; } - G = pow(10, G/20); - Gb = pow(10, Gb/20); - G0 = pow(10, G0/20); + G = ff_exp10(G/20); + Gb = ff_exp10(Gb/20); + G0 = ff_exp10(G0/20); epsilon = sqrt((G*G - Gb*Gb) / (Gb*Gb - G0*G0)); g = pow(G, 1.0 / N);

1 0

avfilter/avf_showspectrum: use FF_ARRAY_ELEMS()
by git＠videolan.org 28 Dec '15

28 Dec '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Dec 28 23:04:40 2015 +0100| [a7bf5f4117b449954e4a91098e2f982a7e536865] | committer: Paul B Mahol avfilter/avf_showspectrum: use FF_ARRAY_ELEMS() Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7bf5f4117b449954… --- libavfilter/avf_showspectrum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 0e2e84b..55cc668 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -390,7 +390,7 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) float y, u, v; int i; - for (i = 1; i < sizeof(intensity_color_table) / sizeof(*intensity_color_table) - 1; i++) + for (i = 1; i < FF_ARRAY_ELEMS(intensity_color_table) - 1; i++) if (intensity_color_table[i].a >= a) break; // i now is the first item >= the color

1 0