December 2016 - ffmpeg-cvslog

avfilter/avf_aphasemeter: make video output optional
by git＠videolan.org 01 Jan '17

01 Jan '17

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Dec 28 16:52:32 2016 +0100| [49abd5dbb8d1aea03e713bef4706e5171ea313da] | committer: Paul B Mahol avfilter/avf_aphasemeter: make video output optional Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49abd5dbb8d1aea03… --- libavfilter/avf_aphasemeter.c | 117 ++++++++++++++------- tests/fate/filter-video.mak | 4 +- .../ref/fate/filter-metadata-avf-aphase-meter-mono | 64 +++++++---- .../filter-metadata-avf-aphase-meter-out-of-phase | 30 ++---- 4 files changed, 131 insertions(+), 84 deletions(-) diff --git a/libavfilter/avf_aphasemeter.c b/libavfilter/avf_aphasemeter.c index 8e8b292..fb5c1d4 100644 --- a/libavfilter/avf_aphasemeter.c +++ b/libavfilter/avf_aphasemeter.c @@ -37,6 +37,7 @@ typedef struct AudioPhaseMeterContext { const AVClass *class; AVFrame *out; + int do_video; int w, h; AVRational frame_rate; int contrast[4]; @@ -57,6 +58,7 @@ static const AVOption aphasemeter_options[] = { { "gc", "set green contrast", OFFSET(contrast[1]), AV_OPT_TYPE_INT, {.i64=7}, 0, 255, FLAGS }, { "bc", "set blue contrast", OFFSET(contrast[2]), AV_OPT_TYPE_INT, {.i64=1}, 0, 255, FLAGS }, { "mpc", "set median phase color", OFFSET(mpc_str), AV_OPT_TYPE_STRING, {.str = "none"}, 0, 0, FLAGS }, + { "video", "set video output", OFFSET(do_video), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, FLAGS }, { NULL } }; @@ -64,6 +66,7 @@ AVFILTER_DEFINE_CLASS(aphasemeter); static int query_formats(AVFilterContext *ctx) { + AudioPhaseMeterContext *s = ctx->priv; AVFilterFormats *formats = NULL; AVFilterChannelLayouts *layout = NULL; AVFilterLink *inlink = ctx->inputs[0]; @@ -74,17 +77,24 @@ static int query_formats(AVFilterContext *ctx) formats = ff_make_format_list(sample_fmts); if ((ret = ff_formats_ref (formats, &inlink->out_formats )) < 0 || + (ret = ff_formats_ref (formats, &outlink->in_formats )) < 0 || (ret = ff_add_channel_layout (&layout, AV_CH_LAYOUT_STEREO )) < 0 || - (ret = ff_channel_layouts_ref (layout , &inlink->out_channel_layouts)) < 0) + (ret = ff_channel_layouts_ref (layout , &inlink->out_channel_layouts)) < 0 || + (ret = ff_channel_layouts_ref (layout , &outlink->in_channel_layouts)) < 0) return ret; formats = ff_all_samplerates(); - if ((ret = ff_formats_ref(formats, &inlink->out_samplerates)) < 0) + if ((ret = ff_formats_ref(formats, &inlink->out_samplerates)) < 0 || + (ret = ff_formats_ref(formats, &outlink->in_samplerates)) < 0) return ret; - formats = ff_make_format_list(pix_fmts); - if ((ret = ff_formats_ref(formats, &outlink->in_formats)) < 0) - return ret; + if (s->do_video) { + AVFilterLink *outlink = ctx->outputs[1]; + + formats = ff_make_format_list(pix_fmts); + if ((ret = ff_formats_ref(formats, &outlink->in_formats)) < 0) + return ret; + } return 0; } @@ -95,15 +105,17 @@ static int config_input(AVFilterLink *inlink) AudioPhaseMeterContext *s = ctx->priv; int nb_samples; - nb_samples = FFMAX(1024, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5); - inlink->partial_buf_size = - inlink->min_samples = - inlink->max_samples = nb_samples; + if (s->do_video) { + nb_samples = FFMAX(1024, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5); + inlink->partial_buf_size = + inlink->min_samples = + inlink->max_samples = nb_samples; + } return 0; } -static int config_output(AVFilterLink *outlink) +static int config_video_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; AudioPhaseMeterContext *s = ctx->priv; @@ -131,8 +143,9 @@ static inline int get_x(float phase, int w) static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; - AVFilterLink *outlink = ctx->outputs[0]; AudioPhaseMeterContext *s = ctx->priv; + AVFilterLink *outlink = s->do_video ? ctx->outputs[1] : NULL; + AVFilterLink *aoutlink = ctx->outputs[0]; AVDictionary **metadata; const int rc = s->contrast[0]; const int gc = s->contrast[1]; @@ -142,8 +155,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) uint8_t *dst; int i; - if (!s->out || s->out->width != outlink->w || - s->out->height != outlink->h) { + if (s->do_video && (!s->out || s->out->width != outlink->w || + s->out->height != outlink->h)) { av_frame_free(&s->out); s->out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!s->out) { @@ -154,7 +167,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) out = s->out; for (i = 0; i < outlink->h; i++) memset(out->data[0] + i * out->linesize[0], 0, outlink->w * 4); - } else { + } else if (s->do_video) { out = s->out; for (i = outlink->h - 1; i >= 10; i--) memmove(out->data[0] + (i ) * out->linesize[0], @@ -163,7 +176,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) for (i = 0; i < outlink->w; i++) AV_WL32(out->data[0] + i * 4, 0); } - s->out->pts = in->pts; for (i = 0; i < in->nb_samples; i++) { const float *src = (float *)in->data[0] + i * 2; @@ -171,24 +183,28 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) const float phase = isnan(f) ? 1 : f; const int x = get_x(phase, s->w); - dst = out->data[0] + x * 4; - dst[0] = FFMIN(255, dst[0] + rc); - dst[1] = FFMIN(255, dst[1] + gc); - dst[2] = FFMIN(255, dst[2] + bc); - dst[3] = 255; + if (s->do_video) { + dst = out->data[0] + x * 4; + dst[0] = FFMIN(255, dst[0] + rc); + dst[1] = FFMIN(255, dst[1] + gc); + dst[2] = FFMIN(255, dst[2] + bc); + dst[3] = 255; + } fphase += phase; } fphase /= in->nb_samples; - if (s->draw_median_phase) { - dst = out->data[0] + get_x(fphase, s->w) * 4; - AV_WL32(dst, AV_RL32(s->mpc)); - } + if (s->do_video) { + if (s->draw_median_phase) { + dst = out->data[0] + get_x(fphase, s->w) * 4; + AV_WL32(dst, AV_RL32(s->mpc)); + } - for (i = 1; i < 10 && i < outlink->h; i++) - memcpy(out->data[0] + i * out->linesize[0], out->data[0], outlink->w * 4); + for (i = 1; i < 10 && i < outlink->h; i++) + memcpy(out->data[0] + i * out->linesize[0], out->data[0], outlink->w * 4); + } - metadata = avpriv_frame_get_metadatap(out); + metadata = avpriv_frame_get_metadatap(in); if (metadata) { uint8_t value[128]; @@ -196,8 +212,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) av_dict_set(metadata, "lavfi.aphasemeter.phase", value, 0); } - av_frame_free(&in); - return ff_filter_frame(outlink, av_frame_clone(s->out)); + if (s->do_video) { + s->out->pts = in->pts; + ff_filter_frame(outlink, av_frame_clone(s->out)); + } + return ff_filter_frame(aoutlink, in); } static av_cold void uninit(AVFilterContext *ctx) @@ -207,6 +226,33 @@ static av_cold void uninit(AVFilterContext *ctx) av_frame_free(&s->out); } +static av_cold int init(AVFilterContext *ctx) +{ + AudioPhaseMeterContext *s = ctx->priv; + AVFilterPad pad; + + pad = (AVFilterPad){ + .name = av_strdup("out0"), + .type = AVMEDIA_TYPE_AUDIO, + }; + if (!pad.name) + return AVERROR(ENOMEM); + ff_insert_outpad(ctx, 0, &pad); + + if (s->do_video) { + pad = (AVFilterPad){ + .name = av_strdup("out1"), + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_video_output, + }; + if (!pad.name) + return AVERROR(ENOMEM); + ff_insert_outpad(ctx, 1, &pad); + } + + return 0; +} + static const AVFilterPad inputs[] = { { .name = "default", @@ -217,22 +263,15 @@ static const AVFilterPad inputs[] = { { NULL } }; -static const AVFilterPad outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - }, - { NULL } -}; - AVFilter ff_avf_aphasemeter = { .name = "aphasemeter", .description = NULL_IF_CONFIG_SMALL("Convert input audio to phase meter video output."), + .init = init, .uninit = uninit, .query_formats = query_formats, .priv_size = sizeof(AudioPhaseMeterContext), .inputs = inputs, - .outputs = outputs, + .outputs = NULL, .priv_class = &aphasemeter_class, + .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, }; diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index a9094b4..c57c9c7 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -665,11 +665,11 @@ fate-filter-metadata-readvitc-thr: CMD = run $(FILTER_METADATA_COMMAND) "movie=' AVF_PHASE_METER_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER FLAC_DEMUXER FLAC_DECODER SINE_FILTER APHASEMETER_FILTER FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-metadata-avf-aphase-meter-mono -fate-filter-metadata-avf-aphase-meter-mono: CMD = run $(FILTER_METADATA_COMMAND) sine="frequency=1000:sample_rate=48000:duration=1,aphasemeter" +fate-filter-metadata-avf-aphase-meter-mono: CMD = run $(FILTER_METADATA_COMMAND) sine="frequency=1000:sample_rate=48000:duration=1,aphasemeter=video=0" FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-metadata-avf-aphase-meter-out-of-phase fate-filter-metadata-avf-aphase-meter-out-of-phase: SRC = $(TARGET_SAMPLES)/filter/out-of-phase-1000hz.flac -fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter" +fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter=video=0" tests/data/file4560-override2rotate0.mov: TAG = GEN tests/data/file4560-override2rotate0.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data diff --git a/tests/ref/fate/filter-metadata-avf-aphase-meter-mono b/tests/ref/fate/filter-metadata-avf-aphase-meter-mono index 3c72375..4a53755 100644 --- a/tests/ref/fate/filter-metadata-avf-aphase-meter-mono +++ b/tests/ref/fate/filter-metadata-avf-aphase-meter-mono @@ -1,25 +1,47 @@ pkt_pts=0|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=1920|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=3840|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=5760|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=7680|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=9600|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=11520|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=13440|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=1024|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=2048|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=3072|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=4096|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=5120|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=6144|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=7168|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=8192|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=9216|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=10240|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=11264|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=12288|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=13312|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=14336|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=15360|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=17280|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=19200|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=21120|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=23040|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=24960|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=26880|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=28800|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=16384|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=17408|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=18432|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=19456|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=20480|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=21504|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=22528|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=23552|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=24576|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=25600|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=26624|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=27648|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=28672|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=29696|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=30720|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=32640|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=34560|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=36480|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=38400|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=40320|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=42240|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=44160|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=31744|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=32768|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=33792|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=34816|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=35840|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=36864|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=37888|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=38912|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=39936|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=40960|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=41984|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=43008|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=44032|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=45056|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=46080|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=47104|tag:lavfi.aphasemeter.phase=1.000000 diff --git a/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase b/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase index 425b2ae..a200e93 100644 --- a/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase +++ b/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase @@ -1,25 +1,11 @@ pkt_pts=0|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=1920|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=3840|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=5760|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=7680|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=9600|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=11520|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=13440|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=15360|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=17280|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=19200|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=21120|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=4608|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=9216|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=13824|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=18432|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=23040|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=24960|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=26880|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=28800|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=30720|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=32640|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=34560|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=36480|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=38400|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=40320|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=42240|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=44160|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=27648|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=32256|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=36864|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=41472|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=46080|tag:lavfi.aphasemeter.phase=-1.000000

2 1

libavutil/random_seed: Ensure that get_generic_seed() spends at least 1/ 32 sec gathering entropy
by git＠videolan.org 31 Dec '16

31 Dec '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Dec 29 00:34:57 2016 +0100| [7525517593dff427021c893a1b21333510b7803b] | committer: Michael Niedermayer libavutil/random_seed: Ensure that get_generic_seed() spends at least 1/32 sec gathering entropy This may fix the failures on windows Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7525517593dff4270… --- libavutil/random_seed.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c index 0c58c8f..d1c9a3f 100644 --- a/libavutil/random_seed.c +++ b/libavutil/random_seed.c @@ -68,6 +68,7 @@ static uint32_t get_generic_seed(void) struct AVSHA *sha = (void*)tmp; clock_t last_t = 0; clock_t last_td = 0; + clock_t init_t = 0; static uint64_t i = 0; static uint32_t buffer[512] = { 0 }; unsigned char digest[20]; @@ -93,10 +94,13 @@ static uint32_t get_generic_seed(void) } else { last_td = t - last_t; buffer[++i & 511] += last_td % 3294638521U; - if (last_i && i - last_i > 4 || i - last_i > 64 || TEST && i - last_i > 8) - break; + if ((t - init_t) >= CLOCKS_PER_SEC>>5) + if (last_i && i - last_i > 4 || i - last_i > 64 || TEST && i - last_i > 8) + break; } last_t = t; + if (!init_t) + init_t = t; } if(TEST) {

1 0

doc: document cutoff option to ac3 and adjust the option' s global documentation
by git＠videolan.org 31 Dec '16

31 Dec '16

ffmpeg | branch: master | Moritz Barsnick <barsnick(a)gmx.net> | Fri Dec 30 18:08:14 2016 +0100| [5dbce5120b4e05dd6d784e7ed9921c1f276acea3] | committer: Michael Niedermayer doc: document cutoff option to ac3 and adjust the option's global documentation cutoff is implemented as an option global to lavc, but supported only by a few encoders. This fact is now reflected in its documentation. ac3's support of this option is added for completeness. Signed-off-by: Moritz Barsnick <barsnick(a)gmx.net> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5dbce5120b4e05dd6… --- doc/codecs.texi | 3 ++- doc/encoders.texi | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/codecs.texi b/doc/codecs.texi index 9a3a56d..6093605 100644 --- a/doc/codecs.texi +++ b/doc/codecs.texi @@ -138,7 +138,8 @@ Set audio sampling rate (in Hz). Set number of audio channels. @item cutoff @var{integer} (@emph{encoding,audio}) -Set cutoff bandwidth. +Set cutoff bandwidth. (Supported only by selected encoders, see +their respective documentation sections.) @item frame_size @var{integer} (@emph{encoding,audio}) Set audio frame size. diff --git a/doc/encoders.texi b/doc/encoders.texi index 5e311cb..8137465 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -488,6 +488,10 @@ is an optional AC-3 feature that increases quality by selectively encoding the left/right channels as mid/side. This option is enabled by default, and it is highly recommended that it be left as enabled except for testing purposes. +@item cutoff @var{frequency} +Set lowpass cutoff frequency. If unspecified, the encoder selects a default +determined by various other encoding parameters. + @end table @subsection Floating-Point-Only AC-3 Encoding Options

1 0

lavc/libmp3lame: add support for cutoff
by git＠videolan.org 31 Dec '16

31 Dec '16

ffmpeg | branch: master | Moritz Barsnick <barsnick(a)gmx.net> | Fri Dec 30 18:08:13 2016 +0100| [6c442e1584599471d1d43df2880feb9bda215163] | committer: Michael Niedermayer lavc/libmp3lame: add support for cutoff Pass the cutoff option from lavc's avcodec_options[] to libmp3lame's lowpass option, without allowing to adjust its default behavior. Signed-off-by: Moritz Barsnick <barsnick(a)gmx.net> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c442e1584599471d… --- doc/encoders.texi | 4 ++++ libavcodec/libmp3lame.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index cbb8d8e..5e311cb 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -817,6 +817,10 @@ Set algorithm quality. Valid arguments are integers in the 0-9 range, with 0 meaning highest quality but slowest, and 9 meaning fastest while producing the worst quality. +@item cutoff (@emph{--lowpass}) +Set lowpass cutoff frequency. If unspecified, the encoder dynamically +adjusts the cutoff. + @item reservoir Enable use of bit reservoir when set to 1. Default value is 1. LAME has this enabled by default, but can be overridden by use diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index e55aa85..5e26743 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -125,6 +125,10 @@ static av_cold int mp3lame_encode_init(AVCodecContext *avctx) } } + /* lowpass cutoff frequency */ + if (avctx->cutoff) + lame_set_lowpassfreq(s->gfp, avctx->cutoff); + /* do not get a Xing VBR header frame from LAME */ lame_set_bWriteVbrTag(s->gfp,0);

1 0

avutil/tests/audio_fifo.c: Memory leak and tab space fixes
by git＠videolan.org 31 Dec '16

31 Dec '16

ffmpeg | branch: master | Thomas Turner <thomastdt(a)googlemail.com> | Tue Dec 27 18:43:19 2016 -0800| [1bfb4587a2e5b25ed15f742149e555efc8f305ae] | committer: Michael Niedermayer avutil/tests/audio_fifo.c: Memory leak and tab space fixes Prevents memory leak when read_samples_from_audio_fifo() is called more than once by deallocating before reallocating more memory. Fixes space indentation for contents in ERROR(). Signed-off-by: Thomas Turner <thomastdt(a)googlemail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1bfb4587a2e5b25ed… --- libavutil/tests/audio_fifo.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libavutil/tests/audio_fifo.c b/libavutil/tests/audio_fifo.c index 4a82a50..861cebb 100644 --- a/libavutil/tests/audio_fifo.c +++ b/libavutil/tests/audio_fifo.c @@ -45,10 +45,19 @@ static const TestStruct test_struct[] = { {.format = AV_SAMPLE_FMT_FLTP , .nb_ch = 2, .data_planes = {data_FLT, data_FLT+6, }, .nb_samples_pch = 6 } }; +static void free_data_planes(AVAudioFifo *afifo, void **output_data) +{ + int i; + for (i = 0; i < afifo->nb_buffers; ++i){ + av_freep(&output_data[i]); + } + av_freep(&output_data); +} + static void ERROR(const char *str) { - fprintf(stderr, "%s\n", str); - exit(1); + fprintf(stderr, "%s\n", str); + exit(1); } static void print_audio_bytes(const TestStruct *test_sample, void **data_planes, int nb_samples) @@ -80,6 +89,8 @@ static int read_samples_from_audio_fifo(AVAudioFifo* afifo, void ***output, int void **data_planes = av_malloc_array(afifo->nb_buffers, sizeof(void*)); if (!data_planes) ERROR("failed to allocate memory!"); + if (*output) + free_data_planes(afifo, *output); *output = data_planes; for (i = 0; i < afifo->nb_buffers; ++i){ @@ -173,10 +184,7 @@ static void test_function(const TestStruct test_sample) } /* deallocate */ - for (i = 0; i < afifo->nb_buffers; ++i){ - av_freep(&output_data[i]); - } - av_freep(&output_data); + free_data_planes(afifo, output_data); av_audio_fifo_free(afifo); }

1 0

avutil/tests/audio_fifo.c: use av_malloc() family of functions
by git＠videolan.org 31 Dec '16

31 Dec '16

ffmpeg | branch: master | Thomas Turner <thomastdt(a)googlemail.com> | Tue Dec 27 18:43:18 2016 -0800| [11b7cad3dc1797ed76725ba3cfba2df1a987eec7] | committer: Michael Niedermayer avutil/tests/audio_fifo.c: use av_malloc() family of functions Signed-off-by: Thomas Turner <thomastdt(a)googlemail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11b7cad3dc1797ed7… --- libavutil/tests/audio_fifo.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/libavutil/tests/audio_fifo.c b/libavutil/tests/audio_fifo.c index 381f709..4a82a50 100644 --- a/libavutil/tests/audio_fifo.c +++ b/libavutil/tests/audio_fifo.c @@ -19,6 +19,7 @@ #include <stdlib.h> #include <stdio.h> #include <inttypes.h> +#include "libavutil/mem.h" #include "libavutil/audio_fifo.c" #define MAX_CHANNELS 32 @@ -50,15 +51,6 @@ static void ERROR(const char *str) exit(1); } -static void* allocate_memory(size_t size) -{ - void *ptr = malloc(size); - if (ptr == NULL){ - ERROR("failed to allocate memory!"); - } - return ptr; -} - static void print_audio_bytes(const TestStruct *test_sample, void **data_planes, int nb_samples) { int p, b, f; @@ -85,11 +77,15 @@ static int read_samples_from_audio_fifo(AVAudioFifo* afifo, void ***output, int int samples = FFMIN(nb_samples, afifo->nb_samples); int tot_elements = !av_sample_fmt_is_planar(afifo->sample_fmt) ? samples : afifo->channels * samples; - void **data_planes = allocate_memory(sizeof(void*) * afifo->nb_buffers); + void **data_planes = av_malloc_array(afifo->nb_buffers, sizeof(void*)); + if (!data_planes) + ERROR("failed to allocate memory!"); *output = data_planes; for (i = 0; i < afifo->nb_buffers; ++i){ - data_planes[i] = allocate_memory(afifo->sample_size * tot_elements); + data_planes[i] = av_malloc_array(tot_elements, afifo->sample_size); + if (!data_planes[i]) + ERROR("failed to allocate memory!"); } return av_audio_fifo_read(afifo, *output, nb_samples); @@ -178,9 +174,9 @@ static void test_function(const TestStruct test_sample) /* deallocate */ for (i = 0; i < afifo->nb_buffers; ++i){ - free(output_data[i]); + av_freep(&output_data[i]); } - free(output_data); + av_freep(&output_data); av_audio_fifo_free(afifo); }

1 0

configure: Check build with some header not just preprocessing for testing --std=c11
by git＠videolan.org 31 Dec '16

31 Dec '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Dec 28 23:41:29 2016 +0100| [af7a75cb517141f649cbbe0a9dcdb4854359b740] | committer: Michael Niedermayer configure: Check build with some header not just preprocessing for testing --std=c11 Fixes build failure on FreeBSD with gcc 4.7 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af7a75cb517141f64… --- configure | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 56a0b65..f035f35 100755 --- a/configure +++ b/configure @@ -1201,13 +1201,15 @@ check_cpp_condition(){ EOF } -test_cflags_cpp(){ - log test_cflags_cpp "$@" +test_cflags_cc(){ + log test_cflags_cc "$@" flags=$1 - condition=$2 - shift 2 + header=$2 + condition=$3 + shift 3 set -- $($cflags_filter "$flags") - check_cpp "$@" <<EOF + check_cc "$@" <<EOF +#include <$header> #if !($condition) #error "unsatisfied condition: $condition" #endif @@ -4625,7 +4627,7 @@ add_cxxflags -std=c++98 # some compilers silently accept -std=c11, so we also need to check that the # version macro is defined properly -if test_cflags_cpp -std=c11 "__STDC_VERSION__ >= 201112L"; then +if test_cflags_cc -std=c11 ctype.h "__STDC_VERSION__ >= 201112L"; then add_cflags -std=c11 else check_cflags -std=c99

1 0

lavfi/selectivecolor: rename adjust_range to scale
by git＠videolan.org 31 Dec '16

31 Dec '16

ffmpeg | branch: master | Clément Bœsch <u(a)pkh.me> | Sat Dec 31 13:00:56 2016 +0100| [771b3a956e0c38e13fb6eaa506ac372fb33f51b1] | committer: Clément Bœsch lavfi/selectivecolor: rename adjust_range to scale This variable corresponds to the final scale of the adjustement for a given color range. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=771b3a956e0c38e13… --- libavfilter/vf_selectivecolor.c | 50 ++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/libavfilter/vf_selectivecolor.c b/libavfilter/vf_selectivecolor.c index 26fd8eb..5dce3eb 100644 --- a/libavfilter/vf_selectivecolor.c +++ b/libavfilter/vf_selectivecolor.c @@ -64,12 +64,12 @@ static const char *color_names[NB_RANGES] = { "red", "yellow", "green", "cyan", "blue", "magenta", "white", "neutral", "black" }; -typedef int (*get_adjust_range_func)(int r, int g, int b, int min_val, int max_val); +typedef int (*get_range_scale_func)(int r, int g, int b, int min_val, int max_val); struct process_range { int range_id; uint32_t mask; - get_adjust_range_func get_adjust_range; + get_range_scale_func get_scale; }; typedef struct ThreadData { @@ -113,38 +113,38 @@ static const AVOption selectivecolor_options[] = { AVFILTER_DEFINE_CLASS(selectivecolor); -static int get_rgb_adjust_range(int r, int g, int b, int min_val, int max_val) +static int get_rgb_scale(int r, int g, int b, int min_val, int max_val) { return max_val - mid_pred(r, g, b); } -static int get_cmy_adjust_range(int r, int g, int b, int min_val, int max_val) +static int get_cmy_scale(int r, int g, int b, int min_val, int max_val) { return mid_pred(r, g, b) - min_val; } -#define DECLARE_ADJUST_RANGE_FUNCS(nbits) \ -static int get_neutrals_adjust_range##nbits(int r, int g, int b, int min_val, int max_val) \ +#define DECLARE_RANGE_SCALE_FUNCS(nbits) \ +static int get_neutrals_scale##nbits(int r, int g, int b, int min_val, int max_val) \ { \ /* 1 - (|max-0.5| + |min-0.5|) */ \ return (((1<<nbits)-1)*2 - ( abs((max_val<<1) - ((1<<nbits)-1)) \ + abs((min_val<<1) - ((1<<nbits)-1))) + 1) >> 1; \ } \ \ -static int get_whites_adjust_range##nbits(int r, int g, int b, int min_val, int max_val) \ +static int get_whites_scale##nbits(int r, int g, int b, int min_val, int max_val) \ { \ /* (min - 0.5) * 2 */ \ return (min_val<<1) - ((1<<nbits)-1); \ } \ \ -static int get_blacks_adjust_range##nbits(int r, int g, int b, int min_val, int max_val) \ +static int get_blacks_scale##nbits(int r, int g, int b, int min_val, int max_val) \ { \ /* (0.5 - max) * 2 */ \ return ((1<<nbits)-1) - (max_val<<1); \ } \ -DECLARE_ADJUST_RANGE_FUNCS(8) -DECLARE_ADJUST_RANGE_FUNCS(16) +DECLARE_RANGE_SCALE_FUNCS(8) +DECLARE_RANGE_SCALE_FUNCS(16) static int register_range(SelectiveColorContext *s, int range_id) { @@ -167,14 +167,14 @@ static int register_range(SelectiveColorContext *s, int range_id) pr->range_id = range_id; pr->mask = 1 << range_id; - if (pr->mask & (1<<RANGE_REDS | 1<<RANGE_GREENS | 1<<RANGE_BLUES)) pr->get_adjust_range = get_rgb_adjust_range; - else if (pr->mask & (1<<RANGE_CYANS | 1<<RANGE_MAGENTAS | 1<<RANGE_YELLOWS)) pr->get_adjust_range = get_cmy_adjust_range; - else if (!s->is_16bit && (pr->mask & 1<<RANGE_WHITES)) pr->get_adjust_range = get_whites_adjust_range8; - else if (!s->is_16bit && (pr->mask & 1<<RANGE_NEUTRALS)) pr->get_adjust_range = get_neutrals_adjust_range8; - else if (!s->is_16bit && (pr->mask & 1<<RANGE_BLACKS)) pr->get_adjust_range = get_blacks_adjust_range8; - else if ( s->is_16bit && (pr->mask & 1<<RANGE_WHITES)) pr->get_adjust_range = get_whites_adjust_range16; - else if ( s->is_16bit && (pr->mask & 1<<RANGE_NEUTRALS)) pr->get_adjust_range = get_neutrals_adjust_range16; - else if ( s->is_16bit && (pr->mask & 1<<RANGE_BLACKS)) pr->get_adjust_range = get_blacks_adjust_range16; + if (pr->mask & (1<<RANGE_REDS | 1<<RANGE_GREENS | 1<<RANGE_BLUES)) pr->get_scale = get_rgb_scale; + else if (pr->mask & (1<<RANGE_CYANS | 1<<RANGE_MAGENTAS | 1<<RANGE_YELLOWS)) pr->get_scale = get_cmy_scale; + else if (!s->is_16bit && (pr->mask & 1<<RANGE_WHITES)) pr->get_scale = get_whites_scale8; + else if (!s->is_16bit && (pr->mask & 1<<RANGE_NEUTRALS)) pr->get_scale = get_neutrals_scale8; + else if (!s->is_16bit && (pr->mask & 1<<RANGE_BLACKS)) pr->get_scale = get_blacks_scale8; + else if ( s->is_16bit && (pr->mask & 1<<RANGE_WHITES)) pr->get_scale = get_whites_scale16; + else if ( s->is_16bit && (pr->mask & 1<<RANGE_NEUTRALS)) pr->get_scale = get_neutrals_scale16; + else if ( s->is_16bit && (pr->mask & 1<<RANGE_BLACKS)) pr->get_scale = get_blacks_scale16; else av_assert0(0); } @@ -302,14 +302,14 @@ static int query_formats(AVFilterContext *ctx) return ff_set_common_formats(ctx, fmts_list); } -static inline int comp_adjust(int adjust_range, float value, float adjust, float k, int correction_method) +static inline int comp_adjust(int scale, float value, float adjust, float k, int correction_method) { const float min = -value; const float max = 1. - value; float res = (-1. - adjust) * k - adjust; if (correction_method == CORRECTION_METHOD_RELATIVE) res *= max; - return lrint(av_clipf(res, min, max) * adjust_range); + return lrint(av_clipf(res, min, max) * scale); } #define DECLARE_SELECTIVE_COLOR_FUNC(nbits) \ @@ -364,18 +364,18 @@ static inline int selective_color_##nbits(AVFilterContext *ctx, ThreadData *td, const struct process_range *pr = &s->process_ranges[i]; \ \ if (range_flag & pr->mask) { \ - const int adjust_range = pr->get_adjust_range(r, g, b, min_color, max_color); \ + const int scale = pr->get_scale(r, g, b, min_color, max_color); \ \ - if (adjust_range > 0) { \ + if (scale > 0) { \ const float *cmyk_adjust = s->cmyk_adjust[pr->range_id]; \ const float adj_c = cmyk_adjust[0]; \ const float adj_m = cmyk_adjust[1]; \ const float adj_y = cmyk_adjust[2]; \ const float k = cmyk_adjust[3]; \ \ - adjust_r += comp_adjust(adjust_range, rnorm, adj_c, k, correction_method); \ - adjust_g += comp_adjust(adjust_range, gnorm, adj_m, k, correction_method); \ - adjust_b += comp_adjust(adjust_range, bnorm, adj_y, k, correction_method); \ + adjust_r += comp_adjust(scale, rnorm, adj_c, k, correction_method); \ + adjust_g += comp_adjust(scale, gnorm, adj_m, k, correction_method); \ + adjust_b += comp_adjust(scale, bnorm, adj_y, k, correction_method); \ } \ } \ } \

1 0

doc/filters: Slightly improve the smartblur documentation.
by git＠videolan.org 31 Dec '16

31 Dec '16

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Sat Dec 31 12:06:42 2016 +0100| [5ff6e8790a2c001103e39e3ccbdc09c5aafcd229] | committer: Carl Eugen Hoyos doc/filters: Slightly improve the smartblur documentation. Fixes ticket #6034. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ff6e8790a2c00110… --- doc/filters.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 45a7569..42cdd2e 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -12572,20 +12572,20 @@ in [-30,0] will filter edges. Default value is 0. @item chroma_radius, cr Set the chroma radius. The option value must be a float number in the range [0.1,5.0] that specifies the variance of the gaussian filter -used to blur the image (slower if larger). Default value is 1.0. +used to blur the image (slower if larger). Default value is @option{luma_radius}. @item chroma_strength, cs Set the chroma strength. The option value must be a float number in the range [-1.0,1.0] that configures the blurring. A value included in [0.0,1.0] will blur the image whereas a value included in -[-1.0,0.0] will sharpen the image. Default value is 1.0. +[-1.0,0.0] will sharpen the image. Default value is @option{luma_strength}. @item chroma_threshold, ct Set the chroma threshold used as a coefficient to determine whether a pixel should be blurred or not. The option value must be an integer in the range [-30,30]. A value of 0 will filter all the image, a value included in [0,30] will filter flat areas and a value included -in [-30,0] will filter edges. Default value is 0. +in [-30,0] will filter edges. Default value is @option{luma_threshold}. @end table If a chroma option is not explicitly set, the corresponding luma value

1 0

avcodec/mjpegdec: Check for rgb before flipping
by git＠videolan.org 31 Dec '16

31 Dec '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Dec 31 03:08:33 2016 +0100| [25d9643f1172ae6a210c671195ba3135895abaf3] | committer: Michael Niedermayer avcodec/mjpegdec: Check for rgb before flipping Fixes assertion failure due to unsupported case Fixes: 356/fuzz-1-ffmpeg_VIDEO_AV_CODEC_ID_MJPEG_fuzzer Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25d9643f1172ae6a2… --- libavcodec/mjpegdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 742e07c..eee8d58 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2386,7 +2386,7 @@ the_end: } } } - if (s->flipped) { + if (s->flipped && !s->rgb) { int j; avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &hshift, &vshift); av_assert0(s->nb_components == av_pix_fmt_count_planes(s->picture_ptr->format));

1 0