November 2018 - ffmpeg-cvslog

lavc/jrevdct: Avoid an aliasing violation.
by Carl Eugen Hoyos 27 Nov '18

27 Nov '18

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Mon Nov 26 00:43:46 2018 +0100| [5a7617136ab68e3fc35a6ea1094f6629109336d3] | committer: Carl Eugen Hoyos lavc/jrevdct: Avoid an aliasing violation. Fixes fate on different PowerPC systems with some compilers. Analyzed-by: Lauri Kasanen > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a7617136ab68e3fc… --- libavcodec/jrevdct.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/libavcodec/jrevdct.c b/libavcodec/jrevdct.c index 3b15a52677..a1a0f571ad 100644 --- a/libavcodec/jrevdct.c +++ b/libavcodec/jrevdct.c @@ -63,6 +63,7 @@ */ #include "libavutil/common.h" +#include "libavutil/intreadwrite.h" #include "dct.h" #include "idctdsp.h" @@ -234,7 +235,7 @@ void ff_j_rev_dct(DCTBLOCK data) * row DCT calculations can be simplified this way. */ - register int *idataptr = (int*)dataptr; + register uint8_t *idataptr = (uint8_t*)dataptr; /* WARNING: we do the same permutation as MMX idct to simplify the video core */ @@ -254,10 +255,10 @@ void ff_j_rev_dct(DCTBLOCK data) int16_t dcval = (int16_t) (d0 * (1 << PASS1_BITS)); register int v = (dcval & 0xffff) | ((dcval * (1 << 16)) & 0xffff0000); - idataptr[0] = v; - idataptr[1] = v; - idataptr[2] = v; - idataptr[3] = v; + AV_WN32A(&idataptr[ 0], v); + AV_WN32A(&idataptr[ 4], v); + AV_WN32A(&idataptr[ 8], v); + AV_WN32A(&idataptr[12], v); } dataptr += DCTSIZE; /* advance pointer to next row */ @@ -974,7 +975,7 @@ void ff_j_rev_dct4(DCTBLOCK data) * row DCT calculations can be simplified this way. */ - register int *idataptr = (int*)dataptr; + register uint8_t *idataptr = (uint8_t*)dataptr; d0 = dataptr[0]; d2 = dataptr[1]; @@ -988,8 +989,8 @@ void ff_j_rev_dct4(DCTBLOCK data) int16_t dcval = (int16_t) (d0 << PASS1_BITS); register int v = (dcval & 0xffff) | ((dcval << 16) & 0xffff0000); - idataptr[0] = v; - idataptr[1] = v; + AV_WN32A(&idataptr[0], v); + AV_WN32A(&idataptr[4], v); } dataptr += DCTSTRIDE; /* advance pointer to next row */

1 0

libavf/libvmaf: update docs
by Kyle Swanson 26 Nov '18

26 Nov '18

ffmpeg | branch: master | Kyle Swanson <kswanson(a)netflix.com> | Mon Nov 26 15:03:38 2018 -0800| [fd2d6f376d84f1cf1a1fc2daf0560b72a8203901] | committer: Kyle Swanson libavf/libvmaf: update docs Signed-off-by: Kyle Swanson <kswanson(a)netflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd2d6f376d84f1cf1… --- doc/filters.texi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index d2d9788d8f..41fbbc5329 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -11399,7 +11399,9 @@ Set the file path to be used to store logs. Set the format of the log file (xml or json). @item enable_transform -Enables transform for computing vmaf. +This option can enable/disable the @code{score_transform} applied to the final predicted VMAF score, +if you have specified score_transform option in the input parameter file passed to @code{run_vmaf_training.py} +Default value: @code{false} @item phone_model Invokes the phone model which will generate VMAF scores higher than in the @@ -11438,7 +11440,7 @@ ffmpeg -i main.mpg -i ref.mpg -lavfi libvmaf -f null - Example with options: @example -ffmpeg -i main.mpg -i ref.mpg -lavfi libvmaf="psnr=1:enable-transform=1" -f null - +ffmpeg -i main.mpg -i ref.mpg -lavfi libvmaf="psnr=1:log_fmt=json" -f null - @end example @section limiter

1 0

avutil/mem: Fix invalid use of av_alloc_size
by Mark Harris 26 Nov '18

26 Nov '18

ffmpeg | branch: master | Mark Harris <mark.hsj(a)gmail.com> | Sat Nov 24 13:02:02 2018 -0800| [4361293fcf59edb56879c36edcd25f0a91e0edf8] | committer: Michael Niedermayer avutil/mem: Fix invalid use of av_alloc_size The alloc_size attribute is valid only on functions that return a pointer. GCC 9 (not yet released) warns about invalid usage: ./libavutil/mem.h:342:1: warning: 'alloc_size' attribute ignored on a function returning int' [-Wattributes] 342 | av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size); | ^~~~~~~~~~~~~ Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4361293fcf59edb56… --- libavutil/mem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/mem.h b/libavutil/mem.h index 55ae573ac9..5fb1a02dd9 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -339,7 +339,7 @@ av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size) * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be * correctly aligned. */ -av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size); +int av_reallocp_array(void *ptr, size_t nmemb, size_t size); /** * Reallocate the given buffer if it is not large enough, otherwise do nothing.

1 0

avfilter/vf_chromashift: Fix mixed declaration and code
by Mark Harris 26 Nov '18

26 Nov '18

ffmpeg | branch: master | Mark Harris <mark.hsj(a)gmail.com> | Sat Nov 24 19:17:40 2018 -0800| [8108064043bfb98cbc5a5bab9da4229be5f6e846] | committer: Michael Niedermayer avfilter/vf_chromashift: Fix mixed declaration and code 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=8108064043bfb98cb… --- libavfilter/vf_chromashift.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_chromashift.c b/libavfilter/vf_chromashift.c index 068c3c1b68..d073256b99 100644 --- a/libavfilter/vf_chromashift.c +++ b/libavfilter/vf_chromashift.c @@ -76,13 +76,14 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; const enum AVPixelFormat *pix_fmts; + AVFilterFormats *fmts_list; if (!strcmp(ctx->filter->name, "rgbashift")) pix_fmts = rgb_pix_fmts; else pix_fmts = yuv_pix_fmts; - AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); + fmts_list = ff_make_format_list(pix_fmts); if (!fmts_list) return AVERROR(ENOMEM); return ff_set_common_formats(ctx, fmts_list);

1 0

avformat/vivo: Don't log null value
by Mark Harris 26 Nov '18

26 Nov '18

ffmpeg | branch: master | Mark Harris <mark.hsj(a)gmail.com> | Sat Nov 24 19:18:43 2018 -0800| [01dc152a92d3ea144ac12ef25f41cc8a44f4b4ef] | committer: Michael Niedermayer avformat/vivo: Don't log null value 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=01dc152a92d3ea144… --- libavformat/vivo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/vivo.c b/libavformat/vivo.c index c9e9c37f37..9b9189f307 100644 --- a/libavformat/vivo.c +++ b/libavformat/vivo.c @@ -166,7 +166,7 @@ static int vivo_read_header(AVFormatContext *s) value = strchr(key, ':'); if (!value) { av_log(s, AV_LOG_WARNING, "missing colon in key:value pair '%s'\n", - value); + key); continue; }

1 0

avcodec/libaomenc: increase the default bitrate
by James Almer 26 Nov '18

26 Nov '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Nov 26 19:05:50 2018 -0300| [2ddaaaf59570533f6c58b67d39c1d7af41d12d1c] | committer: James Almer avcodec/libaomenc: increase the default bitrate aom_codec_enc_config_default() sets it to 256kbps, so don't replace it with 200kbps. See https://bugs.chromium.org/p/aomedia/issues/detail?id=2219 Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ddaaaf59570533f6… --- libavcodec/libaomenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 4cad053a48..cb31c55825 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -986,6 +986,7 @@ static const AVOption options[] = { }; static const AVCodecDefault defaults[] = { + { "b", "256*1000" }, { "qmin", "-1" }, { "qmax", "-1" }, { "g", "-1" },

1 0

avformat/movenc: get number of written bytes from bitstream writer
by Paul B Mahol 26 Nov '18

26 Nov '18

ffmpeg | branch: release/4.1 | Paul B Mahol <onemda(a)gmail.com> | Thu Nov 22 21:28:59 2018 +0100| [59e30c05d74e59d28f2ec4ffd4dbf1822f921f06] | committer: Paul B Mahol avformat/movenc: get number of written bytes from bitstream writer Update fate test. (cherry picked from commit 97d1ee437bbf67d7e3897bc73df4f7d9771ac309) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59e30c05d74e59d28… --- libavformat/movenc.c | 2 +- tests/ref/fate/copy-trac3074 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index bee8e89760..6dab5193b0 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -563,12 +563,12 @@ static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track) put_bits(&pbc, 4, info->substream[i].num_dep_sub); if (!info->substream[i].num_dep_sub) { put_bits(&pbc, 1, 0); /* reserved */ - size--; } else { put_bits(&pbc, 9, info->substream[i].chan_loc); } } flush_put_bits(&pbc); + size = put_bits_count(&pbc) >> 3; avio_wb32(pb, size + 8); ffio_wfourcc(pb, "dec3"); diff --git a/tests/ref/fate/copy-trac3074 b/tests/ref/fate/copy-trac3074 index 5ce5694260..ff66900253 100644 --- a/tests/ref/fate/copy-trac3074 +++ b/tests/ref/fate/copy-trac3074 @@ -1,5 +1,5 @@ -39aef1afff761d673fd1be07182941d1 *tests/data/fate/copy-trac3074.mp4 -333991 tests/data/fate/copy-trac3074.mp4 +f92a201033712bda262f1e071e25544a *tests/data/fate/copy-trac3074.mp4 +333992 tests/data/fate/copy-trac3074.mp4 #tb 0: 1/48000 #media_type 0: audio #codec_id 0: eac3

1 0

avformat/movenc: fix size calculation in mov_write_eac3_tag()
by Paul B Mahol 26 Nov '18

26 Nov '18

ffmpeg | branch: release/4.1 | Paul B Mahol <onemda(a)gmail.com> | Wed Nov 21 11:45:02 2018 +0100| [fcffed470a5236bc1799bc3022d588704d9ae5ef] | committer: Paul B Mahol avformat/movenc: fix size calculation in mov_write_eac3_tag() Otherwise it would assert when flushing bits. (cherry picked from commit 027f032bbce9bdf7bbec40665b98590cade33416) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fcffed470a5236bc1… --- libavformat/movenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 33978ee1b0..bee8e89760 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -541,7 +541,7 @@ static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track) return AVERROR(EINVAL); info = track->eac3_priv; - size = 2 + 4 * (info->num_ind_sub + 1); + size = 2 + ((34 * (info->num_ind_sub + 1) + 7) >> 3); buf = av_malloc(size); if (!buf) { size = AVERROR(ENOMEM);

1 0

avcodec/tiff: Limit filtering to decoded data
by Michael Niedermayer 26 Nov '18

26 Nov '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Nov 23 02:33:04 2018 +0100| [90ac0e5f29ba4730cd92d3268938b3730823e52b] | committer: Michael Niedermayer avcodec/tiff: Limit filtering to decoded data Fixes: Timeout Fixes: 11068/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5698456681709568 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Tomas Härdin <tjoppen(a)acc.umu.se> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90ac0e5f29ba4730c… --- libavcodec/tiff.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 74b76c9fdf..6271c937c3 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1421,6 +1421,7 @@ again: planes = s->planar ? s->bppcount : 1; for (plane = 0; plane < planes; plane++) { int remaining = avpkt->size; + int decoded_height; stride = p->linesize[plane]; dst = p->data[plane]; for (i = 0; i < s->height; i += s->rps) { @@ -1448,6 +1449,8 @@ again: break; } } + decoded_height = FFMIN(i, s->height); + if (s->predictor == 2) { if (s->photometric == TIFF_PHOTOMETRIC_YCBCR) { av_log(s->avctx, AV_LOG_ERROR, "predictor == 2 with YUV is unsupported"); @@ -1464,7 +1467,7 @@ again: s->avctx->pix_fmt == AV_PIX_FMT_YA16LE || s->avctx->pix_fmt == AV_PIX_FMT_GBRP16LE || s->avctx->pix_fmt == AV_PIX_FMT_GBRAP16LE) { - for (i = 0; i < s->height; i++) { + for (i = 0; i < decoded_height; i++) { for (j = soff; j < ssize; j += 2) AV_WL16(dst + j, AV_RL16(dst + j) + AV_RL16(dst + j - soff)); dst += stride; @@ -1475,13 +1478,13 @@ again: s->avctx->pix_fmt == AV_PIX_FMT_YA16BE || s->avctx->pix_fmt == AV_PIX_FMT_GBRP16BE || s->avctx->pix_fmt == AV_PIX_FMT_GBRAP16BE) { - for (i = 0; i < s->height; i++) { + for (i = 0; i < decoded_height; i++) { for (j = soff; j < ssize; j += 2) AV_WB16(dst + j, AV_RB16(dst + j) + AV_RB16(dst + j - soff)); dst += stride; } } else { - for (i = 0; i < s->height; i++) { + for (i = 0; i < decoded_height; i++) { for (j = soff; j < ssize; j++) dst[j] += dst[j - soff]; dst += stride;

1 0

swscale/output: Altivec-optimize yuv2plane1_8
by Lauri Kasanen 26 Nov '18

26 Nov '18

ffmpeg | branch: master | Lauri Kasanen <cand(a)gmx.com> | Sat Nov 17 10:12:14 2018 +0200| [46c5693ea3a9364e24e2f5336bcdb5b191a2329f] | committer: Michael Niedermayer swscale/output: Altivec-optimize yuv2plane1_8 ./ffmpeg_g -f rawvideo -pix_fmt rgb24 -s hd1080 -i /dev/zero -pix_fmt yuv420p \ -f null -vframes 100 -v error -nostats - 1158 UNITS in planar1, 65528 runs, 8 skips -cpuflags 0 19082 UNITS in planar1, 65533 runs, 3 skips 16.48 speedup ratio. On x86, SSE2 is ~7. Curiously, the Power C version takes as many cycles as the x86 SSE2 version, yikes it's fast. Note that this function uses VSX instructions, but is not marked so. This is because several existing functions also make that mistake. I'll submit a patch moving them once this is reviewed. Signed-off-by: Lauri Kasanen <cand(a)gmx.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46c5693ea3a9364e2… --- libswscale/ppc/swscale_altivec.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/libswscale/ppc/swscale_altivec.c b/libswscale/ppc/swscale_altivec.c index 2fb2337769..8c6056d841 100644 --- a/libswscale/ppc/swscale_altivec.c +++ b/libswscale/ppc/swscale_altivec.c @@ -324,6 +324,53 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW, } } } + +static void yuv2plane1_8_u(const int16_t *src, uint8_t *dest, int dstW, + const uint8_t *dither, int offset, int start) +{ + int i; + for (i = start; i < dstW; i++) { + int val = (src[i] + dither[(i + offset) & 7]) >> 7; + dest[i] = av_clip_uint8(val); + } +} + +static void yuv2plane1_8_altivec(const int16_t *src, uint8_t *dest, int dstW, + const uint8_t *dither, int offset) +{ + const int dst_u = -(uintptr_t)dest & 15; + int i, j; + LOCAL_ALIGNED(16, int16_t, val, [16]); + const vector uint16_t shifts = (vector uint16_t) {7, 7, 7, 7, 7, 7, 7, 7}; + vector int16_t vi, vileft, ditherleft, ditherright; + vector uint8_t vd; + + for (j = 0; j < 16; j++) { + val[j] = dither[(dst_u + offset + j) & 7]; + } + + ditherleft = vec_ld(0, val); + ditherright = vec_ld(0, &val[8]); + + yuv2plane1_8_u(src, dest, dst_u, dither, offset, 0); + + for (i = dst_u; i < dstW - 15; i += 16) { + + vi = vec_vsx_ld(0, &src[i]); + vi = vec_adds(ditherleft, vi); + vileft = vec_sra(vi, shifts); + + vi = vec_vsx_ld(0, &src[i + 8]); + vi = vec_adds(ditherright, vi); + vi = vec_sra(vi, shifts); + + vd = vec_packsu(vileft, vi); + vec_st(vd, 0, &dest[i]); + } + + yuv2plane1_8_u(src, dest, dstW, dither, offset, i); +} + #endif /* HAVE_ALTIVEC */ av_cold void ff_sws_init_swscale_ppc(SwsContext *c) @@ -367,6 +414,12 @@ av_cold void ff_sws_init_swscale_ppc(SwsContext *c) c->yuv2packedX = ff_yuv2rgb24_X_altivec; break; } + + switch (c->dstBpc) { + case 8: + c->yuv2plane1 = yuv2plane1_8_altivec; + break; + } } #endif /* HAVE_ALTIVEC */ }

1 0