February 2020 - ffmpeg-cvslog

lavc/v4l2_context: fix compile warning for incompatible pointer type
by Linjie Fu 28 Feb '20

28 Feb '20

ffmpeg | branch: master | Linjie Fu <linjie.fu(a)intel.com> | Fri Feb 28 00:14:32 2020 +0800| [dfa1fc17a54a31e51f36f1f764dfdc76062ffe78] | committer: Michael Niedermayer lavc/v4l2_context: fix compile warning for incompatible pointer type Signed-off-by: Linjie Fu <linjie.fu(a)intel.com> Reviewed-by: Andriy Gelman <andriy.gelman(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dfa1fc17a54a31e51… --- libavcodec/v4l2_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/v4l2_context.c b/libavcodec/v4l2_context.c index 95a2bfa6a4..8110bbb555 100644 --- a/libavcodec/v4l2_context.c +++ b/libavcodec/v4l2_context.c @@ -48,7 +48,7 @@ static inline V4L2m2mContext *ctx_to_m2mctx(V4L2Context *ctx) container_of(ctx, V4L2m2mContext, capture); } -static inline AVClass *logger(V4L2Context *ctx) +static inline AVCodecContext *logger(V4L2Context *ctx) { return ctx_to_m2mctx(ctx)->avctx; }

1 0

lavc/avcodec.h: fix missing line breaks in API documentation
by Linjie Fu 28 Feb '20

28 Feb '20

ffmpeg | branch: master | Linjie Fu <linjie.fu(a)intel.com> | Fri Feb 28 00:13:28 2020 +0800| [220c7dadc4988e4ef52e93b098e6f02283f7852a] | committer: Michael Niedermayer lavc/avcodec.h: fix missing line breaks in API documentation "In both cases.." and "Repeat this call until.." would be better to be in a separate line. http://ffmpeg.org/doxygen/trunk/group__lavc__encdec.html Signed-off-by: Linjie Fu <linjie.fu(a)intel.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=220c7dadc4988e4ef… --- libavcodec/avcodec.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 894a9e5565..5a0fc3405c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -92,6 +92,7 @@ * compressed data in an AVPacket. * - For encoding, call avcodec_send_frame() to give the encoder an AVFrame * containing uncompressed audio or video. + * * In both cases, it is recommended that AVPackets and AVFrames are * refcounted, or libavcodec might have to copy the input data. (libavformat * always returns refcounted AVPackets, and av_frame_get_buffer() allocates @@ -102,6 +103,7 @@ * an AVFrame containing uncompressed audio or video data. * - For encoding, call avcodec_receive_packet(). On success, it will return * an AVPacket with a compressed frame. + * * Repeat this call until it returns AVERROR(EAGAIN) or an error. The * AVERROR(EAGAIN) return value means that new input data is required to * return new output. In this case, continue with sending input. For each

1 0

avformat/ivfenc: Don't use size_t for size of file
by Andreas Rheinhardt 28 Feb '20

28 Feb '20

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Thu Feb 27 06:33:50 2020 +0100| [7b79c59fba445d932aec6e553176821b187125ba] | committer: Michael Niedermayer avformat/ivfenc: Don't use size_t for size of file Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b79c59fba445d932… --- libavformat/ivfenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/ivfenc.c b/libavformat/ivfenc.c index eb70421c44..45e5b238dc 100644 --- a/libavformat/ivfenc.c +++ b/libavformat/ivfenc.c @@ -80,7 +80,7 @@ static int ivf_write_trailer(AVFormatContext *s) IVFEncContext *ctx = s->priv_data; if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && ctx->frame_cnt > 1) { - size_t end = avio_tell(pb); + int64_t end = avio_tell(pb); avio_seek(pb, 24, SEEK_SET); // overwrite the "length" field (duration)

1 0

avfilter/vf_v360: simplify code which handles interpolation points
by Paul B Mahol 28 Feb '20

28 Feb '20

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Feb 28 16:53:19 2020 +0100| [31ecfa95fbb6597a7e3be7ece6137938b7a0f96b] | committer: Paul B Mahol avfilter/vf_v360: simplify code which handles interpolation points > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31ecfa95fbb6597a7… --- libavfilter/vf_v360.c | 148 +++++++++++++++++++++++++------------------------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index eedf4fe8b2..068ba6dfce 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -1279,10 +1279,10 @@ static int xyz_to_cube3x2(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - int new_ui = ui + j; - int new_vi = vi + i; + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + int new_ui = ui + j - 1; + int new_vi = vi + i - 1; int u_shift, v_shift; int new_ewi, new_ehi; @@ -1316,8 +1316,8 @@ static int xyz_to_cube3x2(const V360Context *s, new_vi = av_clip(lrintf(0.5f * new_ehi * (vf + 1.f)), 0, new_ehi - 1); } - us[i + 1][j + 1] = u_shift + new_ui; - vs[i + 1][j + 1] = v_shift + new_vi; + us[i][j] = u_shift + new_ui; + vs[i][j] = v_shift + new_vi; } } @@ -1432,10 +1432,10 @@ static int xyz_to_cube1x6(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - int new_ui = ui + j; - int new_vi = vi + i; + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + int new_ui = ui + j - 1; + int new_vi = vi + i - 1; int v_shift; int new_ehi; @@ -1462,8 +1462,8 @@ static int xyz_to_cube1x6(const V360Context *s, new_vi = av_clip(lrintf(0.5f * new_ehi * (vf + 1.f)), 0, new_ehi - 1); } - us[i + 1][j + 1] = new_ui; - vs[i + 1][j + 1] = v_shift + new_vi; + us[i][j] = new_ui; + vs[i][j] = v_shift + new_vi; } } @@ -1512,10 +1512,10 @@ static int xyz_to_cube6x1(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - int new_ui = ui + j; - int new_vi = vi + i; + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + int new_ui = ui + j - 1; + int new_vi = vi + i - 1; int u_shift; int new_ewi; @@ -1542,8 +1542,8 @@ static int xyz_to_cube6x1(const V360Context *s, new_vi = av_clip(lrintf(0.5f * ehi * (vf + 1.f)), 0, ehi - 1); } - us[i + 1][j + 1] = u_shift + new_ui; - vs[i + 1][j + 1] = new_vi; + us[i][j] = u_shift + new_ui; + vs[i][j] = new_vi; } } @@ -1671,10 +1671,10 @@ static int xyz_to_stereographic(const V360Context *s, *du = visible ? uf - ui : 0.f; *dv = visible ? vf - vi : 0.f; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - us[i + 1][j + 1] = visible ? av_clip(ui + j, 0, width - 1) : 0; - vs[i + 1][j + 1] = visible ? av_clip(vi + i, 0, height - 1) : 0; + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + us[i][j] = visible ? av_clip(ui + j - 1, 0, width - 1) : 0; + vs[i][j] = visible ? av_clip(vi + i - 1, 0, height - 1) : 0; } } @@ -1710,10 +1710,10 @@ static int xyz_to_equirect(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - us[i + 1][j + 1] = mod(ui + j, width); - vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + us[i][j] = mod(ui + j - 1, width); + vs[i][j] = av_clip(vi + i - 1, 0, height - 1); } } @@ -1774,10 +1774,10 @@ static int xyz_to_flat(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - us[i + 1][j + 1] = visible ? av_clip(ui + j, 0, width - 1) : 0; - vs[i + 1][j + 1] = visible ? av_clip(vi + i, 0, height - 1) : 0; + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + us[i][j] = visible ? av_clip(ui + j - 1, 0, width - 1) : 0; + vs[i][j] = visible ? av_clip(vi + i - 1, 0, height - 1) : 0; } } @@ -1813,10 +1813,10 @@ static int xyz_to_mercator(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1); - vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + us[i][j] = av_clip(ui + j - 1, 0, width - 1); + vs[i][j] = av_clip(vi + i - 1, 0, height - 1); } } @@ -1883,10 +1883,10 @@ static int xyz_to_ball(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1); - vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + us[i][j] = av_clip(ui + j - 1, 0, width - 1); + vs[i][j] = av_clip(vi + i - 1, 0, height - 1); } } @@ -1998,10 +1998,10 @@ static int xyz_to_hammer(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1); - vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + us[i][j] = av_clip(ui + j - 1, 0, width - 1); + vs[i][j] = av_clip(vi + i - 1, 0, height - 1); } } @@ -2068,10 +2068,10 @@ static int xyz_to_sinusoidal(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1); - vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + us[i][j] = av_clip(ui + j - 1, 0, width - 1); + vs[i][j] = av_clip(vi + i - 1, 0, height - 1); } } @@ -2319,10 +2319,10 @@ static int xyz_to_eac(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - us[i + 1][j + 1] = av_clip(ui + j, 0, width - 1); - vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + us[i][j] = av_clip(ui + j - 1, 0, width - 1); + vs[i][j] = av_clip(vi + i - 1, 0, height - 1); } } @@ -2469,10 +2469,10 @@ static int xyz_to_fisheye(const V360Context *s, *du = visible ? uf - ui : 0.f; *dv = visible ? vf - vi : 0.f; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - us[i + 1][j + 1] = visible ? av_clip(ui + j, 0, width - 1) : 0; - vs[i + 1][j + 1] = visible ? av_clip(vi + i, 0, height - 1) : 0; + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + us[i][j] = visible ? av_clip(ui + j - 1, 0, width - 1) : 0; + vs[i][j] = visible ? av_clip(vi + i - 1, 0, height - 1) : 0; } } @@ -2614,10 +2614,10 @@ static int xyz_to_cylindrical(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - us[i + 1][j + 1] = visible ? av_clip(ui + j, 0, width - 1) : 0; - vs[i + 1][j + 1] = visible ? av_clip(vi + i, 0, height - 1) : 0; + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + us[i][j] = visible ? av_clip(ui + j - 1, 0, width - 1) : 0; + vs[i][j] = visible ? av_clip(vi + i - 1, 0, height - 1) : 0; } } @@ -2747,10 +2747,10 @@ static int xyz_to_tetrahedron(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - us[i + 1][j + 1] = mod(ui + j, width); - vs[i + 1][j + 1] = av_clip(vi + i, 0, height - 1); + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + us[i][j] = mod(ui + j - 1, width); + vs[i][j] = av_clip(vi + i - 1, 0, height - 1); } } @@ -2842,10 +2842,10 @@ static int xyz_to_dfisheye(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - us[i + 1][j + 1] = av_clip(u_shift + ui + j, 0, width - 1); - vs[i + 1][j + 1] = av_clip( vi + i, 0, height - 1); + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + us[i][j] = av_clip(u_shift + ui + j - 1, 0, width - 1); + vs[i][j] = av_clip( vi + i - 1, 0, height - 1); } } @@ -2989,10 +2989,10 @@ static int xyz_to_barrel(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - us[i + 1][j + 1] = u_shift + av_clip(ui + j, 0, ew - 1); - vs[i + 1][j + 1] = v_shift + av_clip(vi + i, 0, eh - 1); + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + us[i][j] = u_shift + av_clip(ui + j - 1, 0, ew - 1); + vs[i][j] = v_shift + av_clip(vi + i - 1, 0, eh - 1); } } @@ -3088,10 +3088,10 @@ static int xyz_to_barrelsplit(const V360Context *s, *du = uf - ui; *dv = vf - vi; - for (int i = -1; i < 3; i++) { - for (int j = -1; j < 3; j++) { - us[i + 1][j + 1] = u_shift + av_clip(ui + j, 0, ew - 1); - vs[i + 1][j + 1] = v_shift + av_clip(vi + i, 0, eh - 1); + for (int i = 0; i < 4; i++) { + for (int j = 0; j < 4; j++) { + us[i][j] = u_shift + av_clip(ui + j - 1, 0, ew - 1); + vs[i][j] = v_shift + av_clip(vi + i - 1, 0, eh - 1); } }

1 0

avfilter/vf_v360: add initial barrel split format input support
by Paul B Mahol 27 Feb '20

27 Feb '20

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Feb 26 21:23:59 2020 +0100| [9b22254331e9b83f7d0006b1559b39033d801959] | committer: Paul B Mahol avfilter/vf_v360: add initial barrel split format input support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b22254331e9b83f7… --- libavfilter/vf_v360.c | 148 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 128 insertions(+), 20 deletions(-) diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index 1dae2a3e4c..eedf4fe8b2 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -76,6 +76,7 @@ static const AVOption v360_options[] = { { "fisheye", "fisheye", 0, AV_OPT_TYPE_CONST, {.i64=FISHEYE}, 0, 0, FLAGS, "in" }, {"cylindrical", "cylindrical", 0, AV_OPT_TYPE_CONST, {.i64=CYLINDRICAL}, 0, 0, FLAGS, "in" }, {"tetrahedron", "tetrahedron", 0, AV_OPT_TYPE_CONST, {.i64=TETRAHEDRON}, 0, 0, FLAGS, "in" }, + {"barrelsplit", "barrel split facebook's 360 format", 0, AV_OPT_TYPE_CONST, {.i64=BARREL_SPLIT}, 0, 0, FLAGS, "in" }, { "output", "set output projection", OFFSET(out), AV_OPT_TYPE_INT, {.i64=CUBEMAP_3_2}, 0, NB_PROJECTIONS-1, FLAGS, "out" }, { "e", "equirectangular", 0, AV_OPT_TYPE_CONST, {.i64=EQUIRECTANGULAR}, 0, 0, FLAGS, "out" }, { "equirect", "equirectangular", 0, AV_OPT_TYPE_CONST, {.i64=EQUIRECTANGULAR}, 0, 0, FLAGS, "out" }, @@ -2892,7 +2893,7 @@ static int barrel_to_xyz(const V360Context *s, float uf, vf; if (j < eh) { // UP - uf = 2.f * (i - 4 * ew) / ew - 1.f; + uf = 2.f * (i - 4 * ew) / ew - 1.f; vf = 2.f * (j ) / eh - 1.f; uf /= scale; @@ -2998,6 +2999,105 @@ static int xyz_to_barrel(const V360Context *s, return 1; } +/** + * Calculate frame position in barrel split facebook's format for corresponding 3D coordinates on sphere. + * + * @param s filter private context + * @param vec coordinates on sphere + * @param width frame width + * @param height frame height + * @param us horizontal coordinates for interpolation window + * @param vs vertical coordinates for interpolation window + * @param du horizontal relative coordinate + * @param dv vertical relative coordinate + */ +static int xyz_to_barrelsplit(const V360Context *s, + const float *vec, int width, int height, + int16_t us[4][4], int16_t vs[4][4], float *du, float *dv) +{ + const float phi = atan2f(vec[0], -vec[2]) * s->input_mirror_modifier[0]; + const float theta = asinf(-vec[1]) * s->input_mirror_modifier[1]; + + const float theta_range = M_PI_4; + + int ew, eh; + int u_shift, v_shift; + float uf, vf; + int ui, vi; + + if (theta >= -theta_range && theta <= theta_range) { + const float scalew = s->fin_pad > 0 ? 1.f - s->fin_pad / (width * 2.f / 3.f) : 1.f - s->in_pad; + const float scaleh = s->fin_pad > 0 ? 1.f - s->fin_pad / (height / 2.f) : 1.f - s->in_pad; + + ew = width / 3 * 2; + eh = height / 2; + + u_shift = s->ih_flip ? width / 3 : 0; + v_shift = phi >= M_PI_2 || phi < -M_PI_2 ? eh : 0; + + uf = fmodf(phi, M_PI_2) / M_PI_2; + vf = theta / M_PI_4; + + if (v_shift) + uf = uf >= 0.f ? fmodf(uf - 1.f, 1.f) : fmodf(uf + 1.f, 1.f); + + uf = (uf * scalew + 1.f) * width / 3.f; + vf = (vf * scaleh + 1.f) * height / 4.f; + } else { + const float scalew = s->fin_pad > 0 ? 1.f - s->fin_pad / (width / 3.f) : 1.f - s->in_pad; + const float scaleh = s->fin_pad > 0 ? 1.f - s->fin_pad / (height / 4.f) : 1.f - s->in_pad; + int v_offset = 0; + + ew = width / 3; + eh = height / 4; + + u_shift = s->ih_flip ? 0 : 2 * ew; + + if (theta <= 0.f && theta >= -M_PI_2 && + phi <= M_PI_2 && phi >= -M_PI_2) { + uf = vec[0] / vec[1]; + vf = -vec[2] / vec[1]; + v_shift = 0; + v_offset = -eh; + } else if (theta >= 0.f && theta <= M_PI_2 && + phi <= M_PI_2 && phi >= -M_PI_2) { + uf = -vec[0] / vec[1]; + vf = -vec[2] / vec[1]; + v_shift = height * 0.25f; + } else if (theta <= 0.f && theta >= -M_PI_2) { + uf = -vec[0] / vec[1]; + vf = vec[2] / vec[1]; + v_shift = height * 0.5f; + v_offset = -eh; + } else { + uf = vec[0] / vec[1]; + vf = vec[2] / vec[1]; + v_shift = height * 0.75f; + } + + uf *= s->input_mirror_modifier[0] * s->input_mirror_modifier[1]; + vf *= s->input_mirror_modifier[1]; + + uf = 0.5f * width / 3.f * (uf * scalew + 1.f); + vf = height * 0.25f * (vf * scaleh + 1.f) + v_offset; + } + + ui = floorf(uf); + vi = floorf(vf); + + *du = uf - ui; + *dv = vf - vi; + + for (int i = -1; i < 3; i++) { + for (int j = -1; j < 3; j++) { + us[i + 1][j + 1] = u_shift + av_clip(ui + j, 0, ew - 1); + vs[i + 1][j + 1] = v_shift + av_clip(vi + i, 0, eh - 1); + } + } + + return 1; +} + /** * Calculate 3D coordinates on sphere for corresponding frame position in barrel split facebook's format. * @@ -3012,16 +3112,18 @@ 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) { + if (x < 2.f / 3.f) { + const float scalew = s->fout_pad > 0 ? 1.f - s->fout_pad / (width * 2.f / 3.f) : 1.f - s->out_pad; + const float scaleh = s->fout_pad > 0 ? 1.f - s->fout_pad / (height / 2.f) : 1.f - s->out_pad; + 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 phi = ((3.f / 2.f * x - 0.5f) / scalew - back + 1.f) * M_PI; + const float theta = (y - 0.25f - 0.5f * back) / scaleh * M_PI; const float sin_phi = sinf(phi); const float cos_phi = cosf(phi); @@ -3032,46 +3134,47 @@ static int barrelsplit_to_xyz(const V360Context *s, l_y = -sin_theta; l_z = cos_theta * cos_phi; } else { + const float scalew = s->fout_pad > 0 ? 1.f - s->fout_pad / (width / 3.f) : 1.f - s->out_pad; + const float scaleh = s->fout_pad > 0 ? 1.f - s->fout_pad / (height / 4.f) : 1.f - s->out_pad; + 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; + vf = 0.5f - vf; - l_x = 0.5f - uf; + l_x = (0.5f - uf) / scalew; l_y = 0.5f; - l_z = -0.5f + vf; + l_z = (-0.5f + vf) / scaleh; break; case 1: vf = y * 2.f; uf = 1.f - uf; - vf = 1.f - (vf - 0.5f) * scale; + vf = 1.f - (vf - 0.5f); - l_x = 0.5f - uf; + l_x = (0.5f - uf) / scalew; l_y = -0.5f; - l_z = 0.5f - vf; + l_z = (0.5f - vf) / scaleh; break; case 2: vf = y * 2.f - 0.5f; - vf = 1.f - (1.f - vf) * scale; + vf = 1.f - (1.f - vf); - l_x = 0.5f - uf; - l_y = 0.5f; - l_z = -0.5f + vf; + l_x = (0.5f - uf) / scalew; + l_y = 0.5f; + l_z = (-0.5f + vf) / scaleh; break; case 3: vf = y * 2.f - 1.5f; - vf = vf * scale; - l_x = 0.5f - uf; + l_x = (0.5f - uf) / scalew; l_y = -0.5f; - l_z = 0.5f - vf; + l_z = (0.5f - vf) / scaleh; break; } } @@ -3456,7 +3559,6 @@ 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"); @@ -3521,6 +3623,12 @@ static int config_output(AVFilterLink *outlink) wf = w; hf = h; break; + case BARREL_SPLIT: + s->in_transform = xyz_to_barrelsplit; + err = 0; + wf = w * 4.f / 3.f; + hf = h; + break; default: av_log(ctx, AV_LOG_ERROR, "Specified input format is not handled.\n"); return AVERROR_BUG;

1 0

avcodec/mpegaudioenc_template: fix invalid shift of sample
by Michael Niedermayer 27 Feb '20

27 Feb '20

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Jan 23 12:41:41 2020 +0100| [a2c97a8342fab6393280cc2f0e2ffb39c381d29c] | committer: Michael Niedermayer avcodec/mpegaudioenc_template: fix invalid shift of sample Fixes: Ticket8010 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2c97a8342fab6393… --- libavcodec/mpegaudioenc_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegaudioenc_template.c b/libavcodec/mpegaudioenc_template.c index 93363fe1d2..12f7a098e6 100644 --- a/libavcodec/mpegaudioenc_template.c +++ b/libavcodec/mpegaudioenc_template.c @@ -701,7 +701,7 @@ static void encode_frame(MpegAudioContext *s, /* normalize to P bits */ if (shift < 0) - q1 = sample << (-shift); + q1 = sample * (1 << -shift); else q1 = sample >> shift; q1 = (q1 * mult) >> P;

1 0

avcodec/motion_est_template: Fix invalid shifts in no_sub_motion_search()
by Michael Niedermayer 27 Feb '20

27 Feb '20

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Jan 23 12:50:30 2020 +0100| [e13eee37ee3268b0a985ddc74a9bde0179bd553c] | committer: Michael Niedermayer avcodec/motion_est_template: Fix invalid shifts in no_sub_motion_search() Fixes: Ticket8167 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e13eee37ee3268b0a… --- libavcodec/motion_est_template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index 014038e54f..13e73f2653 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -157,8 +157,8 @@ static int no_sub_motion_search(MpegEncContext * s, int src_index, int ref_index, int size, int h) { - (*mx_ptr)<<=1; - (*my_ptr)<<=1; + (*mx_ptr) *= 2; + (*my_ptr) *= 2; return dmin; }

1 0

libavformat/avienc: Check bits per sample for PAL8
by Michael Niedermayer 27 Feb '20

27 Feb '20

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Jan 26 22:19:48 2020 +0100| [35958782819c00211e247332ab18fbf2f28267e1] | committer: Michael Niedermayer libavformat/avienc: Check bits per sample for PAL8 Fixes: assertion failure Fixes: Ticket 8172 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35958782819c00211… --- libavformat/avienc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/avienc.c b/libavformat/avienc.c index d6cfb1b783..07e1c3319e 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -458,6 +458,14 @@ static int avi_write_header(AVFormatContext *s) && par->format != AV_PIX_FMT_NONE) av_log(s, AV_LOG_ERROR, "%s rawvideo cannot be written to avi, output file will be unreadable\n", av_get_pix_fmt_name(par->format)); + + if (par->format == AV_PIX_FMT_PAL8) { + if (par->bits_per_coded_sample < 0 || par->bits_per_coded_sample > 8) { + av_log(s, AV_LOG_ERROR, "PAL8 with %d bps is not allowed\n", par->bits_per_coded_sample); + return AVERROR(EINVAL); + } + } + break; case AVMEDIA_TYPE_AUDIO: flags = (avi->write_channel_mask == 0) ? FF_PUT_WAV_HEADER_SKIP_CHANNELMASK : 0;

1 0

avformat/mpegts: Improve the position determination for avpriv_mpegts_parse_packet()
by Michael Niedermayer 27 Feb '20

27 Feb '20

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Jan 27 19:07:00 2020 +0100| [e5bb48ae5990347dff22fc38ff5a1c1f7f60a1c5] | committer: Michael Niedermayer avformat/mpegts: Improve the position determination for avpriv_mpegts_parse_packet() Fixes: assertion failure Fixes: Ticket 8005 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5bb48ae5990347df… --- libavformat/mpegts.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index a90900127c..7f56bacb2c 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2643,13 +2643,12 @@ static int parse_pcr(int64_t *ppcr_high, int *ppcr_low, const uint8_t *packet); /* handle one TS packet */ -static int handle_packet(MpegTSContext *ts, const uint8_t *packet) +static int handle_packet(MpegTSContext *ts, const uint8_t *packet, int64_t pos) { MpegTSFilter *tss; int len, pid, cc, expected_cc, cc_ok, afc, is_start, is_discontinuity, has_adaptation, has_payload; const uint8_t *p, *p_end; - int64_t pos; pid = AV_RB16(packet + 1) & 0x1fff; is_start = packet[1] & 0x40; @@ -2716,7 +2715,6 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet) if (p >= p_end || !has_payload) return 0; - pos = avio_tell(ts->stream->pb); if (pos >= 0) { av_assert0(pos >= TS_PACKET_SIZE); ts->pos47_full = pos - TS_PACKET_SIZE; @@ -2927,7 +2925,7 @@ static int handle_packets(MpegTSContext *ts, int64_t nb_packets) ret = read_packet(s, packet, ts->raw_packet_size, &data); if (ret != 0) break; - ret = handle_packet(ts, data); + ret = handle_packet(ts, data, avio_tell(s->pb)); finished_reading_packet(s, ts->raw_packet_size); if (ret != 0) break; @@ -3321,7 +3319,7 @@ int avpriv_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, buf++; len--; } else { - handle_packet(ts, buf); + handle_packet(ts, buf, len1 - len + TS_PACKET_SIZE); buf += TS_PACKET_SIZE; len -= TS_PACKET_SIZE; if (ts->stop_parse == 1)

1 0

mailmap: Add another old mail address I used.
by Carl Eugen Hoyos 27 Feb '20

27 Feb '20

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Thu Feb 27 13:02:06 2020 +0100| [516e9b9d72be1698bc232db652dad19389a16db5] | committer: Carl Eugen Hoyos mailmap: Add another old mail address I used. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=516e9b9d72be1698b… --- .mailmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 59819a1453..330cdd13dc 100644 --- a/.mailmap +++ b/.mailmap @@ -9,7 +9,7 @@ <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> +<ceffmpeg(a)gmail.com> <cehoyos(a)ag.or.at> <cehoyos(a)rainbow.studorg.tuwien.ac.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>

1 0