August 2016 - ffmpeg-cvslog - lists.ffmpeg.org

cmdutils: fix implicit declaration of SetDllDirectory function
by git＠videolan.org 30 Aug '16

30 Aug '16

ffmpeg | branch: release/2.8 | Tobias Rapp <t.rapp(a)noa-archive.com> | Mon Aug 29 15:25:58 2016 +0200| [c32ce247a026eda99b3ea5ad46c6bbc5c5907e1a] | committer: James Almer cmdutils: fix implicit declaration of SetDllDirectory function Pre-processor check changed by commiter. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c32ce247a026eda99… --- cmdutils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmdutils.c b/cmdutils.c index 380ca1b..bc57be7 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -60,6 +60,9 @@ #include <sys/time.h> #include <sys/resource.h> #endif +#if HAVE_SETDLLDIRECTORY +#include <windows.h> +#endif static int init_report(const char *env);

1 0

cmdutils: fix implicit declaration of SetDllDirectory function
by git＠videolan.org 30 Aug '16

30 Aug '16

ffmpeg | branch: master | Tobias Rapp <t.rapp(a)noa-archive.com> | Mon Aug 29 15:25:58 2016 +0200| [a64839189622f2a4cc3c62168ae5037b6aab6992] | committer: James Almer cmdutils: fix implicit declaration of SetDllDirectory function Signed-off-by: Tobias Rapp <t.rapp(a)noa-archive.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a64839189622f2a4c… --- cmdutils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmdutils.c b/cmdutils.c index 6960f8c..44f44cd 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -61,6 +61,9 @@ #include <sys/time.h> #include <sys/resource.h> #endif +#ifdef _WIN32 +#include <windows.h> +#endif static int init_report(const char *env);

1 0

doc/APIChanges: mention nb_threads addition to AVFilterContext
by git＠videolan.org 30 Aug '16

30 Aug '16

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Aug 29 15:16:59 2016 -0300| [115a90a0dbeb3ddadec5d57c0c17dd9ce16580ed] | committer: James Almer doc/APIChanges: mention nb_threads addition to AVFilterContext Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=115a90a0dbeb3ddad… --- doc/APIchanges | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index 2572b1c..7ac809c 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2016-08-29 - 4493390 - lavfi 6.58.100 - avfilter.h + Add AVFilterContext.nb_threads. + 2016-08-15 - c3c4c72 - lavc 57.53.100 - avcodec.h Add trailing_padding to AVCodecContext to match the corresponding field in AVCodecParameters.

1 0

avisynth: support pix_fmts added to AviSynth+
by git＠videolan.org 29 Aug '16

29 Aug '16

ffmpeg | branch: master | Stephen Hutchinson <qyot27(a)gmail.com> | Tue Aug 16 18:45:21 2016 -0400| [92916e8542e425ca20daddb490261a5818643206] | committer: Michael Niedermayer avisynth: support pix_fmts added to AviSynth+ A number of new pix_fmts have been added to AviSynth+: 16-bit packed RGB and RGBA 10-, 12-, 14, and 16-bit YUV 4:2:0, 4:2:2, and 4:4:4 8-, 10-, 12-, 14-, and 16-bit Planar RGB 8-, 10-, 12-, 14-, and 16-bit Planar YUVA and Planar RGBA* 10-, 12-, 14-, and 16-bit GRAY variants* 32-bit floating point Planar YUV(A), Planar RGB(A), and GRAY* *some of which are not currently available pix_fmts here and were not added to the demuxer due to this Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92916e8542e425ca2… --- libavformat/avisynth.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 182 insertions(+), 1 deletion(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 04ac257..1fe8e08 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -68,6 +68,8 @@ typedef struct AviSynthLibrary { AVSC_DECLARE_FUNC(avs_get_pitch_p); AVSC_DECLARE_FUNC(avs_get_read_ptr_p); AVSC_DECLARE_FUNC(avs_get_row_size_p); + AVSC_DECLARE_FUNC(avs_is_planar_rgb); + AVSC_DECLARE_FUNC(avs_is_planar_rgba); #endif #undef AVSC_DECLARE_FUNC } AviSynthLibrary; @@ -95,6 +97,14 @@ static const int avs_planes_packed[1] = { 0 }; static const int avs_planes_grey[1] = { AVS_PLANAR_Y }; static const int avs_planes_yuv[3] = { AVS_PLANAR_Y, AVS_PLANAR_U, AVS_PLANAR_V }; +#ifdef USING_AVISYNTH +static const int avs_planes_rgb[3] = { AVS_PLANAR_G, AVS_PLANAR_B, + AVS_PLANAR_R }; +static const int avs_planes_yuva[4] = { AVS_PLANAR_Y, AVS_PLANAR_U, + AVS_PLANAR_V, AVS_PLANAR_A }; +static const int avs_planes_rgba[4] = { AVS_PLANAR_G, AVS_PLANAR_B, + AVS_PLANAR_R, AVS_PLANAR_A }; +#endif /* A conflict between C++ global objects, atexit, and dynamic loading requires * us to register our own atexit handler to prevent double freeing. */ @@ -138,6 +148,8 @@ static av_cold int avisynth_load_library(void) LOAD_AVS_FUNC(avs_get_pitch_p, 1); LOAD_AVS_FUNC(avs_get_read_ptr_p, 1); LOAD_AVS_FUNC(avs_get_row_size_p, 1); + LOAD_AVS_FUNC(avs_is_planar_rgb, 1); + LOAD_AVS_FUNC(avs_is_planar_rgba, 1); #endif #undef LOAD_AVS_FUNC @@ -222,7 +234,7 @@ static av_cold void avisynth_atexit_handler(void) static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) { AviSynthContext *avs = s->priv_data; - int planar = 0; // 0: packed, 1: YUV, 2: Y8 + int planar = 0; // 0: packed, 1: YUV, 2: Y8, 3: Planar RGB, 4: YUVA, 5: Planar RGBA st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO; @@ -238,6 +250,136 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) switch (avs->vi->pixel_type) { #ifdef USING_AVISYNTH +/* 10~16-bit YUV pix_fmts (AviSynth+) */ + case AVS_CS_YUV444P10: + st->codecpar->format = AV_PIX_FMT_YUV444P10; + planar = 1; + break; + case AVS_CS_YUV422P10: + st->codecpar->format = AV_PIX_FMT_YUV422P10; + planar = 1; + break; + case AVS_CS_YUV420P10: + st->codecpar->format = AV_PIX_FMT_YUV420P10; + planar = 1; + break; + case AVS_CS_YUV444P12: + st->codecpar->format = AV_PIX_FMT_YUV444P12; + planar = 1; + break; + case AVS_CS_YUV422P12: + st->codecpar->format = AV_PIX_FMT_YUV422P12; + planar = 1; + break; + case AVS_CS_YUV420P12: + st->codecpar->format = AV_PIX_FMT_YUV420P12; + planar = 1; + break; + case AVS_CS_YUV444P14: + st->codecpar->format = AV_PIX_FMT_YUV444P14; + planar = 1; + break; + case AVS_CS_YUV422P14: + st->codecpar->format = AV_PIX_FMT_YUV422P14; + planar = 1; + break; + case AVS_CS_YUV420P14: + st->codecpar->format = AV_PIX_FMT_YUV420P14; + planar = 1; + break; + case AVS_CS_YUV444P16: + st->codecpar->format = AV_PIX_FMT_YUV444P16; + planar = 1; + break; + case AVS_CS_YUV422P16: + st->codecpar->format = AV_PIX_FMT_YUV422P16; + planar = 1; + break; + case AVS_CS_YUV420P16: + st->codecpar->format = AV_PIX_FMT_YUV420P16; + planar = 1; + break; +/* 8~16-bit YUV pix_fmts with Alpha (AviSynth+) */ + case AVS_CS_YUVA444: + st->codecpar->format = AV_PIX_FMT_YUVA444P; + planar = 4; + break; + case AVS_CS_YUVA422: + st->codecpar->format = AV_PIX_FMT_YUVA422P; + planar = 4; + break; + case AVS_CS_YUVA420: + st->codecpar->format = AV_PIX_FMT_YUVA420P; + planar = 4; + break; + case AVS_CS_YUVA444P10: + st->codecpar->format = AV_PIX_FMT_YUVA444P10; + planar = 4; + break; + case AVS_CS_YUVA422P10: + st->codecpar->format = AV_PIX_FMT_YUVA422P10; + planar = 4; + break; + case AVS_CS_YUVA420P10: + st->codecpar->format = AV_PIX_FMT_YUVA420P10; + planar = 4; + break; + case AVS_CS_YUVA444P16: + st->codecpar->format = AV_PIX_FMT_YUVA444P16; + planar = 4; + break; + case AVS_CS_YUVA422P16: + st->codecpar->format = AV_PIX_FMT_YUVA422P16; + planar = 4; + break; + case AVS_CS_YUVA420P16: + st->codecpar->format = AV_PIX_FMT_YUVA420P16; + planar = 4; + break; +/* Planar RGB pix_fmts (AviSynth+) */ + case AVS_CS_RGBP: + st->codecpar->format = AV_PIX_FMT_GBRP; + planar = 3; + break; + case AVS_CS_RGBP10: + st->codecpar->format = AV_PIX_FMT_GBRP10; + planar = 3; + break; + case AVS_CS_RGBP12: + st->codecpar->format = AV_PIX_FMT_GBRP12; + planar = 3; + break; + case AVS_CS_RGBP14: + st->codecpar->format = AV_PIX_FMT_GBRP14; + planar = 3; + break; + case AVS_CS_RGBP16: + st->codecpar->format = AV_PIX_FMT_GBRP16; + planar = 3; + break; +/* Planar RGB pix_fmts with Alpha (AviSynth+) */ + case AVS_CS_RGBAP: + st->codecpar->format = AV_PIX_FMT_GBRAP; + planar = 5; + break; + case AVS_CS_RGBAP10: + st->codecpar->format = AV_PIX_FMT_GBRAP10; + planar = 5; + break; + case AVS_CS_RGBAP12: + st->codecpar->format = AV_PIX_FMT_GBRAP12; + planar = 5; + break; + case AVS_CS_RGBAP16: + st->codecpar->format = AV_PIX_FMT_GBRAP16; + planar = 5; + break; +/* GRAY16 (AviSynth+) */ + case AVS_CS_Y16: + st->codecpar->format = AV_PIX_FMT_GRAY16; + planar = 2; + break; +/* pix_fmts added in AviSynth 2.6 */ case AVS_CS_YV24: st->codecpar->format = AV_PIX_FMT_YUV444P; planar = 1; @@ -254,7 +396,15 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) st->codecpar->format = AV_PIX_FMT_GRAY8; planar = 2; break; +/* 16-bit packed RGB pix_fmts (AviSynth+) */ + case AVS_CS_BGR48: + st->codecpar->format = AV_PIX_FMT_BGR48; + break; + case AVS_CS_BGR64: + st->codecpar->format = AV_PIX_FMT_BGRA64; + break; #endif +/* AviSynth 2.5 and AvxSynth pix_fmts */ case AVS_CS_BGR24: st->codecpar->format = AV_PIX_FMT_BGR24; break; @@ -280,6 +430,20 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) } switch (planar) { +#ifdef USING_AVISYNTH + case 5: // Planar RGB + Alpha + avs->n_planes = 4; + avs->planes = avs_planes_rgba; + break; + case 4: // YUV + Alpha + avs->n_planes = 4; + avs->planes = avs_planes_yuva; + break; + case 3: // Planar RGB + avs->n_planes = 3; + avs->planes = avs_planes_rgb; + break; +#endif case 2: // Y8 avs->n_planes = 1; avs->planes = avs_planes_grey; @@ -457,6 +621,16 @@ static int avisynth_read_packet_video(AVFormatContext *s, AVPacket *pkt, return 0; #ifdef USING_AVISYNTH + /* Detect whether we're using AviSynth 2.6 or AviSynth+ by + * looking for whether avs_is_planar_rgb exists. */ + + int avsplus; + + if (GetProcAddress(avs_library.library, "avs_is_planar_rgb") == NULL) + avsplus = 0; + else + avsplus = 1; + /* avs_bits_per_pixel changed to AVSC_API with AviSynth 2.6, which * requires going through avs_library, while AvxSynth has it under * the older AVSC_INLINE type, so special-case this. */ @@ -513,6 +687,13 @@ static int avisynth_read_packet_video(AVFormatContext *s, AVPacket *pkt, pitch = -pitch; } +#ifdef USING_AVISYNTH + /* Flip Planar RGB video. */ + if (avsplus && (avs_library.avs_is_planar_rgb(avs->vi) || + avs_library.avs_is_planar_rgba(avs->vi))) + pitch = -pitch; +#endif + avs_library.avs_bit_blt(avs->env, dst_p, rowsize, src_p, pitch, rowsize, planeheight); dst_p += rowsize * planeheight;

1 0

avutil/version: Improve lib versioning scheme for release branches with the next major release
by git＠videolan.org 29 Aug '16

29 Aug '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Aug 6 12:49:56 2016 +0200| [ac028794ad702375c27143bd86d459534ef6fc2f] | committer: Michael Niedermayer avutil/version: Improve lib versioning scheme for release branches with the next major release Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac028794ad702375c… --- libavutil/version.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavutil/version.h b/libavutil/version.h index dec1b1b..7d32c7b 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -41,6 +41,15 @@ * and its value is reset to 100 instead of 0 to keep it above or equal to 100. * Also we do not increase MICRO for every bugfix or change in git master. * + * Prior to FFmpeg 3.2 point releases did not change any lib version number to + * avoid aliassing different git master checkouts. + * Starting with FFmpeg 3.2, the released library versions will occupy + * a separate MAJOR.MINOR that is not used on the master development branch. + * That is if we branch a release of master 55.10.123 we will bump to 55.11.100 + * for the release and master will continue at 55.12.100 after it. Each new + * point release will then bump the MICRO improving the usefulness of the lib + * versions. + * * @{ */

1 0

avutil/version: Mention similarities and differences to semver
by git＠videolan.org 29 Aug '16

29 Aug '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Aug 6 12:44:18 2016 +0200| [adbf1c905447ca95a5cb7578ec3cf87da97f5025] | committer: Michael Niedermayer avutil/version: Mention similarities and differences to semver Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=adbf1c905447ca95a… --- libavutil/version.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavutil/version.h b/libavutil/version.h index 3e94a23..dec1b1b 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -35,6 +35,12 @@ * Useful to check and match library version in order to maintain * backward compatibility. * + * The FFmpeg libraries follow a versioning sheme very similar to + * Semantic Versioning (http://semver.org/) + * The difference is that the component called PATCH is called MICRO in FFmpeg + * and its value is reset to 100 instead of 0 to keep it above or equal to 100. + * Also we do not increase MICRO for every bugfix or change in git master. + * * @{ */

1 0

avfilter/vf_minterpolate: do not right shift negative numbers
by git＠videolan.org 29 Aug '16

29 Aug '16

ffmpeg | branch: master | Davinder Singh <ds.mudhar(a)gmail.com> | Mon Aug 29 17:04:54 2016 +0200| [11a631d4a76859e09cd413856e32df6363d25eea] | committer: Paul B Mahol avfilter/vf_minterpolate: do not right shift negative numbers It was source of crashes. Use division instead. Original patch by author. Log message by comitter. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11a631d4a76859e09… --- libavfilter/vf_minterpolate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_minterpolate.c b/libavfilter/vf_minterpolate.c index 5b41cd8..76a546f 100644 --- a/libavfilter/vf_minterpolate.c +++ b/libavfilter/vf_minterpolate.c @@ -936,8 +936,8 @@ static void set_frame_data(MIContext *mi_ctx, int alpha, AVFrame *avf_out) for (i = 0; i < pixel->nb; i++) { Frame *frame = &mi_ctx->frames[pixel->refs[i]]; if (chroma) { - x_mv = (x >> mi_ctx->chroma_h_shift) + (pixel->mvs[i][0] >> mi_ctx->chroma_h_shift); - y_mv = (y >> mi_ctx->chroma_v_shift) + (pixel->mvs[i][1] >> mi_ctx->chroma_v_shift); + x_mv = (x >> mi_ctx->chroma_h_shift) + (pixel->mvs[i][0] / (1 << mi_ctx->chroma_h_shift)); + y_mv = (y >> mi_ctx->chroma_v_shift) + (pixel->mvs[i][1] / (1 << mi_ctx->chroma_v_shift)); } else { x_mv = x + pixel->mvs[i][0]; y_mv = y + pixel->mvs[i][1];

1 0

avfilter: make use of ff_filter_get_nb_threads
by git＠videolan.org 29 Aug '16

29 Aug '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Aug 27 22:44:42 2016 +0200| [a0a57072c93be397afe346d03b907397d6b88396] | committer: Paul B Mahol avfilter: make use of ff_filter_get_nb_threads > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0a57072c93be397a… --- Changelog | 1 + libavfilter/vf_atadenoise.c | 2 +- libavfilter/vf_blend.c | 2 +- libavfilter/vf_bwdif.c | 2 +- libavfilter/vf_chromakey.c | 2 +- libavfilter/vf_colorkey.c | 2 +- libavfilter/vf_colormatrix.c | 8 ++++---- libavfilter/vf_colorspace.c | 2 +- libavfilter/vf_curves.c | 2 +- libavfilter/vf_datascope.c | 2 +- libavfilter/vf_dctdnoiz.c | 4 ++-- libavfilter/vf_deband.c | 2 +- libavfilter/vf_fade.c | 8 ++++---- libavfilter/vf_hflip.c | 2 +- libavfilter/vf_hqx.c | 2 +- libavfilter/vf_lenscorrection.c | 2 +- libavfilter/vf_lut3d.c | 2 +- libavfilter/vf_noise.c | 2 +- libavfilter/vf_perspective.c | 2 +- libavfilter/vf_removegrain.c | 2 +- libavfilter/vf_rotate.c | 2 +- libavfilter/vf_selectivecolor.c | 2 +- libavfilter/vf_signalstats.c | 6 +++--- libavfilter/vf_stereo3d.c | 2 +- libavfilter/vf_transpose.c | 2 +- libavfilter/vf_w3fdif.c | 2 +- libavfilter/vf_xbr.c | 2 +- libavfilter/vf_yadif.c | 2 +- 28 files changed, 37 insertions(+), 36 deletions(-) diff --git a/Changelog b/Changelog index 79e0800..7dcec3c 100644 --- a/Changelog +++ b/Changelog @@ -23,6 +23,7 @@ version <next>: - lut2 filter - yuvtestsrc filter - vaguedenoiser filter +- added threads option per filter instance version 3.1: diff --git a/libavfilter/vf_atadenoise.c b/libavfilter/vf_atadenoise.c index 07da792..bf75d53 100644 --- a/libavfilter/vf_atadenoise.c +++ b/libavfilter/vf_atadenoise.c @@ -357,7 +357,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) ctx->internal->execute(ctx, s->filter_slice, &td, NULL, FFMIN3(s->planeheight[1], s->planeheight[2], - ctx->graph->nb_threads)); + ff_filter_get_nb_threads(ctx))); av_frame_copy_props(out, in); } else { out = av_frame_clone(in); diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index a121267..2731ec8 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -393,7 +393,7 @@ static AVFrame *blend_frame(AVFilterContext *ctx, AVFrame *top_buf, .w = outw, .h = outh, .param = param, .plane = plane, .inlink = inlink }; - ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outh, ctx->graph->nb_threads)); + ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outh, ff_filter_get_nb_threads(ctx))); } if (!s->tblend) diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c index 595b825..b691983 100644 --- a/libavfilter/vf_bwdif.c +++ b/libavfilter/vf_bwdif.c @@ -278,7 +278,7 @@ static void filter(AVFilterContext *ctx, AVFrame *dstpic, td.h = h; td.plane = i; - ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(h, ctx->graph->nb_threads)); + ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(h, ff_filter_get_nb_threads(ctx))); } if (!bwdif->inter_field) { bwdif->inter_field = 1; diff --git a/libavfilter/vf_chromakey.c b/libavfilter/vf_chromakey.c index 3309748..8841478 100644 --- a/libavfilter/vf_chromakey.c +++ b/libavfilter/vf_chromakey.c @@ -108,7 +108,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) AVFilterContext *avctx = link->dst; int res; - if (res = avctx->internal->execute(avctx, do_chromakey_slice, frame, NULL, FFMIN(frame->height, avctx->graph->nb_threads))) + if (res = avctx->internal->execute(avctx, do_chromakey_slice, frame, NULL, FFMIN(frame->height, ff_filter_get_nb_threads(avctx)))) return res; return ff_filter_frame(avctx->outputs[0], frame); diff --git a/libavfilter/vf_colorkey.c b/libavfilter/vf_colorkey.c index 2f670d9..3d65e59 100644 --- a/libavfilter/vf_colorkey.c +++ b/libavfilter/vf_colorkey.c @@ -85,7 +85,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) if (res = av_frame_make_writable(frame)) return res; - if (res = avctx->internal->execute(avctx, do_colorkey_slice, frame, NULL, FFMIN(frame->height, avctx->graph->nb_threads))) + if (res = avctx->internal->execute(avctx, do_colorkey_slice, frame, NULL, FFMIN(frame->height, ff_filter_get_nb_threads(avctx)))) return res; return ff_filter_frame(avctx->outputs[0], frame); diff --git a/libavfilter/vf_colormatrix.c b/libavfilter/vf_colormatrix.c index 15fb680..d237baa 100644 --- a/libavfilter/vf_colormatrix.c +++ b/libavfilter/vf_colormatrix.c @@ -474,16 +474,16 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) if (in->format == AV_PIX_FMT_YUV444P) ctx->internal->execute(ctx, process_slice_yuv444p, &td, NULL, - FFMIN(in->height, ctx->graph->nb_threads)); + FFMIN(in->height, ff_filter_get_nb_threads(ctx))); else if (in->format == AV_PIX_FMT_YUV422P) ctx->internal->execute(ctx, process_slice_yuv422p, &td, NULL, - FFMIN(in->height, ctx->graph->nb_threads)); + FFMIN(in->height, ff_filter_get_nb_threads(ctx))); else if (in->format == AV_PIX_FMT_YUV420P) ctx->internal->execute(ctx, process_slice_yuv420p, &td, NULL, - FFMIN(in->height / 2, ctx->graph->nb_threads)); + FFMIN(in->height / 2, ff_filter_get_nb_threads(ctx))); else ctx->internal->execute(ctx, process_slice_uyvy422, &td, NULL, - FFMIN(in->height, ctx->graph->nb_threads)); + FFMIN(in->height, ff_filter_get_nb_threads(ctx))); av_frame_free(&in); return ff_filter_frame(outlink, out); diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c index 37e77d1..e4022f8 100644 --- a/libavfilter/vf_colorspace.c +++ b/libavfilter/vf_colorspace.c @@ -947,7 +947,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) return res; } else { ctx->internal->execute(ctx, convert, &td, NULL, - FFMIN((in->height + 1) >> 1, ctx->graph->nb_threads)); + FFMIN((in->height + 1) >> 1, ff_filter_get_nb_threads(ctx))); } av_frame_free(&in); diff --git a/libavfilter/vf_curves.c b/libavfilter/vf_curves.c index fef9a0e..69ec108 100644 --- a/libavfilter/vf_curves.c +++ b/libavfilter/vf_curves.c @@ -647,7 +647,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) td.in = in; td.out = out; - ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outlink->h, ctx->graph->nb_threads)); + ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outlink->h, ff_filter_get_nb_threads(ctx))); if (out != in) av_frame_free(&in); diff --git a/libavfilter/vf_datascope.c b/libavfilter/vf_datascope.c index 3c82a0e..76134c2 100644 --- a/libavfilter/vf_datascope.c +++ b/libavfilter/vf_datascope.c @@ -328,7 +328,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } td.in = in; td.out = out, td.yoff = xmaxlen, td.xoff = ymaxlen; - ctx->internal->execute(ctx, s->filter, &td, NULL, FFMIN(ctx->graph->nb_threads, FFMAX(outlink->w / 20, 1))); + ctx->internal->execute(ctx, s->filter, &td, NULL, FFMIN(ff_filter_get_nb_threads(ctx), FFMAX(outlink->w / 20, 1))); av_frame_free(&in); return ff_filter_frame(outlink, out); diff --git a/libavfilter/vf_dctdnoiz.c b/libavfilter/vf_dctdnoiz.c index 6957f19..62763bf 100644 --- a/libavfilter/vf_dctdnoiz.c +++ b/libavfilter/vf_dctdnoiz.c @@ -507,9 +507,9 @@ static int config_input(AVFilterLink *inlink) inlink->h - s->pr_height); max_slice_h = s->pr_height / ((s->bsize - 1) * 2); - s->nb_threads = FFMIN3(MAX_THREADS, ctx->graph->nb_threads, max_slice_h); + s->nb_threads = FFMIN3(MAX_THREADS, ff_filter_get_nb_threads(ctx), max_slice_h); av_log(ctx, AV_LOG_DEBUG, "threads: [max=%d hmax=%d user=%d] => %d\n", - MAX_THREADS, max_slice_h, ctx->graph->nb_threads, s->nb_threads); + MAX_THREADS, max_slice_h, ff_filter_get_nb_threads(ctx), s->nb_threads); s->p_linesize = linesize = FFALIGN(s->pr_width, 32); for (i = 0; i < 2; i++) { diff --git a/libavfilter/vf_deband.c b/libavfilter/vf_deband.c index 01728b1..3a1cfb8 100644 --- a/libavfilter/vf_deband.c +++ b/libavfilter/vf_deband.c @@ -267,7 +267,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) td.in = in; td.out = out; ctx->internal->execute(ctx, s->deband, &td, NULL, FFMIN3(s->planeheight[1], s->planeheight[2], - ctx->graph->nb_threads)); + ff_filter_get_nb_threads(ctx))); av_frame_free(&in); return ff_filter_frame(outlink, out); diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c index cf77d87..0496645 100644 --- a/libavfilter/vf_fade.c +++ b/libavfilter/vf_fade.c @@ -347,19 +347,19 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) if (s->factor < UINT16_MAX) { if (s->alpha) { ctx->internal->execute(ctx, filter_slice_alpha, frame, NULL, - FFMIN(frame->height, ctx->graph->nb_threads)); + FFMIN(frame->height, ff_filter_get_nb_threads(ctx))); } else if (s->is_packed_rgb && !s->black_fade) { ctx->internal->execute(ctx, filter_slice_rgb, frame, NULL, - FFMIN(frame->height, ctx->graph->nb_threads)); + FFMIN(frame->height, ff_filter_get_nb_threads(ctx))); } else { /* luma, or rgb plane in case of black */ ctx->internal->execute(ctx, filter_slice_luma, frame, NULL, - FFMIN(frame->height, ctx->graph->nb_threads)); + FFMIN(frame->height, ff_filter_get_nb_threads(ctx))); if (frame->data[1] && frame->data[2]) { /* chroma planes */ ctx->internal->execute(ctx, filter_slice_chroma, frame, NULL, - FFMIN(frame->height, ctx->graph->nb_threads)); + FFMIN(frame->height, ff_filter_get_nb_threads(ctx))); } } } diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c index 3e502e3..cf20c19 100644 --- a/libavfilter/vf_hflip.c +++ b/libavfilter/vf_hflip.c @@ -174,7 +174,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) memcpy(out->data[1], in->data[1], AVPALETTE_SIZE); td.in = in, td.out = out; - ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outlink->h, ctx->graph->nb_threads)); + ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outlink->h, ff_filter_get_nb_threads(ctx))); av_frame_free(&in); return ff_filter_frame(outlink, out); diff --git a/libavfilter/vf_hqx.c b/libavfilter/vf_hqx.c index d1e360f..5f63b2a 100644 --- a/libavfilter/vf_hqx.c +++ b/libavfilter/vf_hqx.c @@ -502,7 +502,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) td.in = in; td.out = out; td.rgbtoyuv = hqx->rgbtoyuv; - ctx->internal->execute(ctx, hqx->func, &td, NULL, FFMIN(inlink->h, ctx->graph->nb_threads)); + ctx->internal->execute(ctx, hqx->func, &td, NULL, FFMIN(inlink->h, ff_filter_get_nb_threads(ctx))); av_frame_free(&in); return ff_filter_frame(outlink, out); diff --git a/libavfilter/vf_lenscorrection.c b/libavfilter/vf_lenscorrection.c index 9db483d..239fe19 100644 --- a/libavfilter/vf_lenscorrection.c +++ b/libavfilter/vf_lenscorrection.c @@ -193,7 +193,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } td.correction = rect->correction[plane]; - ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(h, ctx->graph->nb_threads)); + ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(h, ff_filter_get_nb_threads(ctx))); } av_frame_free(&in); diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 2b8e027..b136cda 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -531,7 +531,7 @@ static AVFrame *apply_lut(AVFilterLink *inlink, AVFrame *in) td.in = in; td.out = out; - ctx->internal->execute(ctx, lut3d->interp, &td, NULL, FFMIN(outlink->h, ctx->graph->nb_threads)); + ctx->internal->execute(ctx, lut3d->interp, &td, NULL, FFMIN(outlink->h, ff_filter_get_nb_threads(ctx))); if (out != in) av_frame_free(&in); diff --git a/libavfilter/vf_noise.c b/libavfilter/vf_noise.c index fa3863e..abdf047 100644 --- a/libavfilter/vf_noise.c +++ b/libavfilter/vf_noise.c @@ -272,7 +272,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) } td.in = inpicref; td.out = out; - ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(n->height[0], ctx->graph->nb_threads)); + ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(n->height[0], ff_filter_get_nb_threads(ctx))); emms_c(); if (inpicref != out) diff --git a/libavfilter/vf_perspective.c b/libavfilter/vf_perspective.c index 2b5afce..287db68 100644 --- a/libavfilter/vf_perspective.c +++ b/libavfilter/vf_perspective.c @@ -478,7 +478,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) .h = s->height[plane], .hsub = hsub, .vsub = vsub }; - ctx->internal->execute(ctx, s->perspective, &td, NULL, FFMIN(td.h, ctx->graph->nb_threads)); + ctx->internal->execute(ctx, s->perspective, &td, NULL, FFMIN(td.h, ff_filter_get_nb_threads(ctx))); } av_frame_free(&frame); diff --git a/libavfilter/vf_removegrain.c b/libavfilter/vf_removegrain.c index 8ef0974..bc45076 100644 --- a/libavfilter/vf_removegrain.c +++ b/libavfilter/vf_removegrain.c @@ -619,7 +619,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) td.in = in; td.out = out; td.plane = i; ctx->internal->execute(ctx, filter_slice, &td, NULL, - FFMIN(s->planeheight[i], ctx->graph->nb_threads)); + FFMIN(s->planeheight[i], ff_filter_get_nb_threads(ctx))); src = in->data[i] + (s->planeheight[i] - 1) * in->linesize[i]; dst = out->data[i] + (s->planeheight[i] - 1) * out->linesize[i]; diff --git a/libavfilter/vf_rotate.c b/libavfilter/vf_rotate.c index b37685a..42e725a 100644 --- a/libavfilter/vf_rotate.c +++ b/libavfilter/vf_rotate.c @@ -553,7 +553,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) .plane = plane, .c = c, .s = s }; - ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outh, ctx->graph->nb_threads)); + ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outh, ff_filter_get_nb_threads(ctx))); } av_frame_free(&in); diff --git a/libavfilter/vf_selectivecolor.c b/libavfilter/vf_selectivecolor.c index 33716ec..a5cb533 100644 --- a/libavfilter/vf_selectivecolor.c +++ b/libavfilter/vf_selectivecolor.c @@ -471,7 +471,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) td.in = in; td.out = out; ctx->internal->execute(ctx, funcs[s->is_16bit][direct][s->correction_method], - &td, NULL, FFMIN(inlink->h, ctx->graph->nb_threads)); + &td, NULL, FFMIN(inlink->h, ff_filter_get_nb_threads(ctx))); if (!direct) av_frame_free(&in); diff --git a/libavfilter/vf_signalstats.c b/libavfilter/vf_signalstats.c index 6796af8..22a1db1 100644 --- a/libavfilter/vf_signalstats.c +++ b/libavfilter/vf_signalstats.c @@ -185,7 +185,7 @@ static int config_props(AVFilterLink *outlink) s->fs = inlink->w * inlink->h; s->cfs = s->chromaw * s->chromah; - s->nb_jobs = FFMAX(1, FFMIN(inlink->h, ctx->graph->nb_threads)); + s->nb_jobs = FFMAX(1, FFMIN(inlink->h, ff_filter_get_nb_threads(ctx))); s->jobs_rets = av_malloc_array(s->nb_jobs, sizeof(*s->jobs_rets)); if (!s->jobs_rets) return AVERROR(ENOMEM); @@ -602,7 +602,7 @@ static int filter_frame8(AVFilterLink *link, AVFrame *in) } ctx->internal->execute(ctx, compute_sat_hue_metrics8, &td_huesat, - NULL, FFMIN(s->chromah, ctx->graph->nb_threads)); + NULL, FFMIN(s->chromah, ff_filter_get_nb_threads(ctx))); // Calculate luma histogram and difference with previous frame or field. for (j = 0; j < link->h; j++) { @@ -820,7 +820,7 @@ static int filter_frame16(AVFilterLink *link, AVFrame *in) } ctx->internal->execute(ctx, compute_sat_hue_metrics16, &td_huesat, - NULL, FFMIN(s->chromah, ctx->graph->nb_threads)); + NULL, FFMIN(s->chromah, ff_filter_get_nb_threads(ctx))); // Calculate luma histogram and difference with previous frame or field. memset(s->histy, 0, (1 << s->depth) * sizeof(*s->histy)); diff --git a/libavfilter/vf_stereo3d.c b/libavfilter/vf_stereo3d.c index 2036c94..3e23890 100644 --- a/libavfilter/vf_stereo3d.c +++ b/libavfilter/vf_stereo3d.c @@ -935,7 +935,7 @@ copy: td.ileft = ileft; td.iright = iright; td.out = out; ctx->internal->execute(ctx, filter_slice, &td, NULL, - FFMIN(s->out.height, ctx->graph->nb_threads)); + FFMIN(s->out.height, ff_filter_get_nb_threads(ctx))); } break; } diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index 9555ff2..28226c3 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -250,7 +250,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } td.in = in, td.out = out; - ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outlink->h, ctx->graph->nb_threads)); + ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(outlink->h, ff_filter_get_nb_threads(ctx))); av_frame_free(&in); return ff_filter_frame(outlink, out); } diff --git a/libavfilter/vf_w3fdif.c b/libavfilter/vf_w3fdif.c index e6f6628..cde17d2 100644 --- a/libavfilter/vf_w3fdif.c +++ b/libavfilter/vf_w3fdif.c @@ -170,7 +170,7 @@ static int config_input(AVFilterLink *inlink) s->planeheight[0] = s->planeheight[3] = inlink->h; s->nb_planes = av_pix_fmt_count_planes(inlink->format); - s->nb_threads = ctx->graph->nb_threads; + s->nb_threads = ff_filter_get_nb_threads(ctx); s->work_line = av_calloc(s->nb_threads, sizeof(*s->work_line)); if (!s->work_line) return AVERROR(ENOMEM); diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c index c92e9a8..9893e0c 100644 --- a/libavfilter/vf_xbr.c +++ b/libavfilter/vf_xbr.c @@ -367,7 +367,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) td.in = in; td.out = out; td.rgbtoyuv = s->rgbtoyuv; - ctx->internal->execute(ctx, s->func, &td, NULL, FFMIN(inlink->h, ctx->graph->nb_threads)); + ctx->internal->execute(ctx, s->func, &td, NULL, FFMIN(inlink->h, ff_filter_get_nb_threads(ctx))); out->width = outlink->w; out->height = outlink->h; diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 8e6522c..694ac44 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -242,7 +242,7 @@ static void filter(AVFilterContext *ctx, AVFrame *dstpic, td.h = h; td.plane = i; - ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(h, ctx->graph->nb_threads)); + ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(h, ff_filter_get_nb_threads(ctx))); } emms_c();

1 0

avfilter: add ff_filter_get_nb_threads()
by git＠videolan.org 29 Aug '16

29 Aug '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Aug 27 22:22:58 2016 +0200| [5b1907142dca052c3254d0b4ca3e2ff7ddc7d96b] | committer: Paul B Mahol avfilter: add ff_filter_get_nb_threads() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b1907142dca052c3… --- libavfilter/avfilter.c | 7 +++++++ libavfilter/internal.h | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index a8e5a5a..b236535 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -783,6 +783,13 @@ void avfilter_free(AVFilterContext *filter) av_free(filter); } +int ff_filter_get_nb_threads(AVFilterContext *ctx) +{ + if (ctx->nb_threads > 0) + return FFMIN(ctx->nb_threads, ctx->graph->nb_threads); + return ctx->graph->nb_threads; +} + static int process_options(AVFilterContext *ctx, AVDictionary **options, const char *args) { diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 769e65b..3856012 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -402,4 +402,10 @@ static inline int ff_norm_qscale(int qscale, int type) return qscale; } +/** + * Get number of threads for current filter instance. + * This number is always same or less than graph->nb_threads. + */ +int ff_filter_get_nb_threads(AVFilterContext *ctx); + #endif /* AVFILTER_INTERNAL_H */

1 0

avfilter: add nb_threads to AVFilterContext
by git＠videolan.org 29 Aug '16

29 Aug '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Aug 27 22:10:10 2016 +0200| [449339084fb2fe9259d8612a9c8c2a886022d1f5] | committer: Paul B Mahol avfilter: add nb_threads to AVFilterContext To be used in following commits. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=449339084fb2fe925… --- libavfilter/avfilter.c | 2 ++ libavfilter/avfilter.h | 7 +++++++ libavfilter/version.h | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 21f8d9e..a8e5a5a 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -616,6 +616,8 @@ static const AVOption avfilter_options[] = { { .i64 = AVFILTER_THREAD_SLICE }, 0, INT_MAX, FLAGS, "thread_type" }, { "slice", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AVFILTER_THREAD_SLICE }, .unit = "thread_type" }, { "enable", "set enable expression", OFFSET(enable_str), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS }, + { "threads", "Allowed number of threads", OFFSET(nb_threads), AV_OPT_TYPE_INT, + { .i64 = 0 }, 0, INT_MAX, FLAGS }, { NULL }, }; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index d804c89..15d00f7 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -361,6 +361,13 @@ struct AVFilterContext { * hardware context information. */ AVBufferRef *hw_device_ctx; + + /** + * Max number of threads allowed in this filter instance. + * If <= 0, its value is ignored. + * Overrides global number of threads set per filter graph. + */ + int nb_threads; }; /** diff --git a/libavfilter/version.h b/libavfilter/version.h index e3e3ed0..1b91d60 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 6 -#define LIBAVFILTER_VERSION_MINOR 57 +#define LIBAVFILTER_VERSION_MINOR 58 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \

1 0