February 2020 - ffmpeg-cvslog

mailmap: add entry for myself
by Thilo Borgmann 27 Feb '20

27 Feb '20

ffmpeg | branch: master | Thilo Borgmann <thilo.borgmann(a)mail.de> | Thu Feb 27 12:24:20 2020 +0100| [b870a6bffa914ec63a5c08a66bde69f604c5dfb1] | committer: Thilo Borgmann mailmap: add entry for myself > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b870a6bffa914ec63… --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index b01074c638..59819a1453 100644 --- a/.mailmap +++ b/.mailmap @@ -15,3 +15,4 @@ <zhong.li(a)intel.com> <zhongli_dev(a)126.com> <andreas.rheinhardt(a)gmail.com> <andreas.rheinhardt(a)googlemail.com> rcombs <rcombs(a)rcombs.me> <rodger.combs(a)gmail.com> +<thilo.borgmann(a)mail.de> <thilo.borgmann(a)googlemail.com>

1 0

mailmap: add entry for myself
by rcombs 27 Feb '20

27 Feb '20

ffmpeg | branch: master | rcombs <rcombs(a)rcombs.me> | Thu Feb 27 01:22:17 2020 -0600| [bdab3e810878f9520a9ec664f177e7e43fc6515b] | committer: rcombs mailmap: add entry for myself > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bdab3e810878f9520… --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 4f711c7825..b01074c638 100644 --- a/.mailmap +++ b/.mailmap @@ -14,3 +14,4 @@ <atomnuker(a)gmail.com> <rpehlivanov(a)obe.tv> <zhong.li(a)intel.com> <zhongli_dev(a)126.com> <andreas.rheinhardt(a)gmail.com> <andreas.rheinhardt(a)googlemail.com> +rcombs <rcombs(a)rcombs.me> <rodger.combs(a)gmail.com>

1 0

Add .mailmap
by Josh de Kock 27 Feb '20

27 Feb '20

ffmpeg | branch: master | Josh de Kock <josh(a)itanimul.li> | Sat Feb 22 21:11:31 2020 +0000| [a439acee3f27655be805d9129ba53ac46716d7c6] | committer: Josh de Kock Add .mailmap This allows for easy shortlog/log parsing, useful in determining eligible members of the general assembly for the new FFmpeg voting system. Signed-off-by: Josh de Kock <josh(a)itanimul.li> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a439acee3f27655be… --- .mailmap | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000000..4f711c7825 --- /dev/null +++ b/.mailmap @@ -0,0 +1,16 @@ +<james.darnley(a)gmail.com> <jdarnley(a)obe.tv> +<jeebjp(a)gmail.com> <jan.ekstrom(a)aminocom.com> +<sw(a)jkqxz.net> <mrt(a)jkqxz.net> +<u(a)pkh.me> <cboesch(a)gopro.com> +<zhilizhao(a)tencent.com> <quinkblack(a)foxmail.com> <wantlamy(a)gmail.com> +<modmaker(a)google.com> <modmaker-at-google.com(a)ffmpeg.org> +<stebbins(a)jetheaddev.com> <jstebbins(a)jetheaddev.com> +<barryjzhao(a)tencent.com> <mypopydev(a)gmail.com> <jun.zhao(a)intel.com> +<josh(a)itanimul.li> <joshdk(a)obe.tv> +<michael(a)niedermayer.cc> <michaelni(a)gmx.at> +<linjie.fu(a)intel.com> <fulinjie(a)zju.edu.cn> +<ceffmpeg(a)gmail.com> <cehoyos(a)ag.or.at> +<ffmpeg(a)gyani.pro> <gyandoshi(a)gmail.com> +<atomnuker(a)gmail.com> <rpehlivanov(a)obe.tv> +<zhong.li(a)intel.com> <zhongli_dev(a)126.com> +<andreas.rheinhardt(a)gmail.com> <andreas.rheinhardt(a)googlemail.com>

1 0

avdevice/decklink: add support for SDK version 11.5
by Marton Balint 26 Feb '20

26 Feb '20

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Fri Feb 21 22:30:16 2020 +0100| [f32f9231dd4f74d9f95eef575b838bdc3e06a234] | committer: Marton Balint avdevice/decklink: add support for SDK version 11.5 Fixes ticket #8534. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f32f9231dd4f74d9f… --- libavdevice/decklink_common.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp index 04c0f99edc..53b57ffe4e 100644 --- a/libavdevice/decklink_common.cpp +++ b/libavdevice/decklink_common.cpp @@ -269,7 +269,22 @@ int ff_decklink_set_format(AVFormatContext *avctx, if (ctx->bmd_mode == bmdModeUnknown) return -1; -#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000 +#if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b050000 + if (direction == DIRECTION_IN) { + BMDDisplayMode actualMode = ctx->bmd_mode; + if (ctx->dli->DoesSupportVideoMode(ctx->video_input, ctx->bmd_mode, (BMDPixelFormat) cctx->raw_format, + bmdNoVideoInputConversion, bmdSupportedVideoModeDefault, + &actualMode, &support) != S_OK || !support || ctx->bmd_mode != actualMode) + return -1; + } else { + BMDDisplayMode actualMode = ctx->bmd_mode; + if (ctx->dlo->DoesSupportVideoMode(bmdVideoConnectionUnspecified, ctx->bmd_mode, ctx->raw_format, + bmdNoVideoOutputConversion, bmdSupportedVideoModeDefault, + &actualMode, &support) != S_OK || !support || ctx->bmd_mode != actualMode) + return -1; + } + return 0; +#elif BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000 if (direction == DIRECTION_IN) { if (ctx->dli->DoesSupportVideoMode(ctx->video_input, ctx->bmd_mode, (BMDPixelFormat) cctx->raw_format, bmdSupportedVideoModeDefault,

1 0

avdevice/decklink_dec: fix stopping streams in read_close
by Marton Balint 26 Feb '20

26 Feb '20

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Fri Feb 21 20:39:31 2020 +0100| [95324ecf235a467f6804019e250e59bca576922a] | committer: Marton Balint avdevice/decklink_dec: fix stopping streams in read_close The capture_started variable was never set, it is simpler to call the stop functions unconditionally if the interface is available. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=95324ecf235a467f6… --- libavdevice/decklink_common.h | 1 - libavdevice/decklink_dec.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h index 8b3dbce2fb..27ce6a8a40 100644 --- a/libavdevice/decklink_common.h +++ b/libavdevice/decklink_common.h @@ -115,7 +115,6 @@ struct decklink_ctx { /* Status */ int playback_started; - int capture_started; int64_t last_pts; unsigned long frameCount; unsigned int dropped; diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 1fd5adf515..c8d931517e 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -983,7 +983,7 @@ av_cold int ff_decklink_read_close(AVFormatContext *avctx) struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; - if (ctx->capture_started) { + if (ctx->dli) { ctx->dli->StopStreams(); ctx->dli->DisableVideoInput(); ctx->dli->DisableAudioInput();

1 0

doc/muxers: describe the default behavior of the write_prft dash muxer option
by James Almer 26 Feb '20

26 Feb '20

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Feb 26 11:03:45 2020 -0300| [3e9793cf383054c0e8656996231d006d67bb3067] | committer: James Almer doc/muxers: describe the default behavior of the write_prft dash muxer option Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e9793cf383054c0e… --- doc/muxers.texi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index c9adee98e7..72b8b54cb1 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -342,6 +342,8 @@ Publish master playlist repeatedly every after specified number of segment inter @item -write_prft @var{write_prft} Write Producer Reference Time elements on supported streams. This also enables writing prft boxes in the underlying muxer. Applicable only when the @var{utc_url} option is enabled. +It's set to auto by default, in which case the muxer will attempt to enable it only in modes +that require it. @item -mpd_profile @var{mpd_profile} Set one or more manifest profiles.

1 0

avformat/dashenc: use a quieter log lever when informing prft was automatically enabled
by James Almer 26 Feb '20

26 Feb '20

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Feb 26 10:50:16 2020 -0300| [e9aa1bfd8cc0b0335119ada66824130bdd1d2bc1] | committer: James Almer avformat/dashenc: use a quieter log lever when informing prft was automatically enabled Suggested-by: Anton Khirnov <anton(a)khirnov.net> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e9aa1bfd8cc0b0335… --- libavformat/dashenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 3d69fab5cd..94d463972a 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1397,7 +1397,7 @@ static int dash_init(AVFormatContext *s) if (c->write_prft < 0) { c->write_prft = c->ldash; if (c->ldash) - av_log(s, AV_LOG_INFO, "Enabling Producer Reference Time element for Low Latency mode\n"); + av_log(s, AV_LOG_VERBOSE, "Enabling Producer Reference Time element for Low Latency mode\n"); } if (c->write_prft && !c->utc_timing_url) {

1 0

avfilter/vf_v360: add barrel split format output support
by Paul B Mahol 26 Feb '20

26 Feb '20

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Feb 26 14:37:39 2020 +0100| [b0a9960a772a5f978fc9f52552932c6a2ab3405c] | committer: Paul B Mahol avfilter/vf_v360: add barrel split format output support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0a9960a772a5f978… --- doc/filters.texi | 3 +- libavfilter/v360.h | 1 + libavfilter/vf_v360.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 586ed9034b..1453ecd8b1 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -18932,7 +18932,8 @@ Default value is @b{@samp{0}}. @item barrel @item fb -Facebook's 360 format. +@item barrelsplit +Facebook's 360 formats. @item sg Stereographic format. diff --git a/libavfilter/v360.h b/libavfilter/v360.h index 97008fb3da..e1f131c9a8 100644 --- a/libavfilter/v360.h +++ b/libavfilter/v360.h @@ -48,6 +48,7 @@ enum Projections { CYLINDRICAL, PERSPECTIVE, TETRAHEDRON, + BARREL_SPLIT, NB_PROJECTIONS, }; diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index e946135f75..1dae2a3e4c 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -99,6 +99,7 @@ static const AVOption v360_options[] = { {"cylindrical", "cylindrical", 0, AV_OPT_TYPE_CONST, {.i64=CYLINDRICAL}, 0, 0, FLAGS, "out" }, {"perspective", "perspective", 0, AV_OPT_TYPE_CONST, {.i64=PERSPECTIVE}, 0, 0, FLAGS, "out" }, {"tetrahedron", "tetrahedron", 0, AV_OPT_TYPE_CONST, {.i64=TETRAHEDRON}, 0, 0, FLAGS, "out" }, + {"barrelsplit", "barrel split facebook's 360 format", 0, AV_OPT_TYPE_CONST, {.i64=BARREL_SPLIT}, 0, 0, FLAGS, "out" }, { "interp", "set interpolation method", OFFSET(interp), AV_OPT_TYPE_INT, {.i64=BILINEAR}, 0, NB_INTERP_METHODS-1, FLAGS, "interp" }, { "near", "nearest neighbour", 0, AV_OPT_TYPE_CONST, {.i64=NEAREST}, 0, 0, FLAGS, "interp" }, { "nearest", "nearest neighbour", 0, AV_OPT_TYPE_CONST, {.i64=NEAREST}, 0, 0, FLAGS, "interp" }, @@ -2997,6 +2998,93 @@ static int xyz_to_barrel(const V360Context *s, return 1; } +/** + * Calculate 3D coordinates on sphere for corresponding frame position in barrel split facebook's format. + * + * @param s filter private context + * @param i horizontal position on frame [0, width) + * @param j vertical position on frame [0, height) + * @param width frame width + * @param height frame height + * @param vec coordinates on sphere + */ +static int barrelsplit_to_xyz(const V360Context *s, + int i, int j, int width, int height, + float *vec) +{ + const float scale = 1.01f; + const float x = (i + 0.5f) / width; + const float y = (j + 0.5f) / height; + float l_x, l_y, l_z; + + if (x <= 2.f / 3.f) { + const float back = floorf(y * 2.f); + + const float phi = ((3.f / 2.f * x - 0.5f) * scale - back + 1.f) * M_PI; + const float theta = (y - 0.25f - 0.5f * back) * scale * M_PI; + + const float sin_phi = sinf(phi); + const float cos_phi = cosf(phi); + const float sin_theta = sinf(theta); + const float cos_theta = cosf(theta); + + l_x = -cos_theta * sin_phi; + l_y = -sin_theta; + l_z = cos_theta * cos_phi; + } else { + const int face = floorf(y * 4.f); + float uf, vf; + + uf = x * 3.f - 2.f; + uf = (uf - 0.5f) * scale + 0.5f; + + switch (face) { + case 0: + vf = y * 2.f; + uf = 1.f - uf; + vf = (0.5f - vf) * scale; + + l_x = 0.5f - uf; + l_y = 0.5f; + l_z = -0.5f + vf; + break; + case 1: + vf = y * 2.f; + uf = 1.f - uf; + vf = 1.f - (vf - 0.5f) * scale; + + l_x = 0.5f - uf; + l_y = -0.5f; + l_z = 0.5f - vf; + break; + case 2: + vf = y * 2.f - 0.5f; + vf = 1.f - (1.f - vf) * scale; + + l_x = 0.5f - uf; + l_y = 0.5f; + l_z = -0.5f + vf; + break; + case 3: + vf = y * 2.f - 1.5f; + vf = vf * scale; + + l_x = 0.5f - uf; + l_y = -0.5f; + l_z = 0.5f - vf; + break; + } + } + + vec[0] = l_x; + vec[1] = l_y; + vec[2] = l_z; + + normalize_vector(vec); + + return 1; +} + static void multiply_matrix(float c[3][3], const float a[3][3], const float b[3][3]) { for (int i = 0; i < 3; i++) { @@ -3368,6 +3456,7 @@ static int config_output(AVFilterLink *outlink) wf = w; hf = h; break; + case BARREL_SPLIT: case PERSPECTIVE: case PANNINI: av_log(ctx, AV_LOG_ERROR, "Supplied format is not accepted as input.\n"); @@ -3550,6 +3639,12 @@ static int config_output(AVFilterLink *outlink) w = lrintf(wf); h = lrintf(hf); break; + case BARREL_SPLIT: + s->out_transform = barrelsplit_to_xyz; + prepare_out = NULL; + w = lrintf(wf / 4.f * 3.f); + h = lrintf(hf); + break; default: av_log(ctx, AV_LOG_ERROR, "Specified output format is not handled.\n"); return AVERROR_BUG;

1 0

libswscale/x86/yuv2rgb: Fix Segmentation Fault when load unaligned data
by Ting Fu 26 Feb '20

26 Feb '20

ffmpeg | branch: master | Ting Fu <ting.fu(a)intel.com> | Wed Feb 26 10:54:29 2020 +0800| [828f7db5d9fdf9052bb4b6d1b528009fece5bb10] | committer: Carl Eugen Hoyos libswscale/x86/yuv2rgb: Fix Segmentation Fault when load unaligned data Fixes ticket #8532 Signed-off-by: Ting Fu <ting.fu(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=828f7db5d9fdf9052… --- libswscale/x86/yuv_2_rgb.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswscale/x86/yuv_2_rgb.asm b/libswscale/x86/yuv_2_rgb.asm index e05bbb89f5..575a84d921 100644 --- a/libswscale/x86/yuv_2_rgb.asm +++ b/libswscale/x86/yuv_2_rgb.asm @@ -139,7 +139,7 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parameters VBROADCASTSD vr_coff, [pointer_c_ditherq + 4 * 8] %endif %endif - mova m_y, [py_2indexq + 2 * indexq] + movu m_y, [py_2indexq + 2 * indexq] movh m_u, [pu_indexq + indexq] movh m_v, [pv_indexq + indexq] .loop0: @@ -347,7 +347,7 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parameters %endif ; PACK RGB15/16 %endif ; PACK RGB15/16/32 -mova m_y, [py_2indexq + 2 * indexq + 8 * time_num] +movu m_y, [py_2indexq + 2 * indexq + 8 * time_num] movh m_v, [pv_indexq + indexq + 4 * time_num] movh m_u, [pu_indexq + indexq + 4 * time_num] add imageq, 8 * depth * time_num

1 0

configure: Enable section_data_rel_ro for OpenBSD aarch64 / arm
by Brad Smith 25 Feb '20

25 Feb '20

ffmpeg | branch: master | Brad Smith <brad(a)comstyle.com> | Sun Feb 23 16:15:35 2020 -0500| [36451f916a93b7edd6e1810f4102b1e6269bea6a] | committer: Michael Niedermayer configure: Enable section_data_rel_ro for OpenBSD aarch64 / arm Signed-off-by: Brad Smith <brad(a)comstyle.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36451f916a93b7edd… --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index ab761c7183..06e3a7b2a8 100755 --- a/configure +++ b/configure @@ -5305,6 +5305,7 @@ case $target_os in ;; openbsd|bitrig) disable symver + enable section_data_rel_ro striptype="" SHFLAGS='-shared' SLIB_INSTALL_NAME='$(SLIBNAME).$(LIBMAJOR).$(LIBMINOR)'

1 0