October 2019 - ffmpeg-cvslog - lists.ffmpeg.org

doc/filters: add one more example for libvmaf
by Paul B Mahol 25 Oct '19

25 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Oct 25 22:58:50 2019 +0200| [296296a4d5194977bbcbc3656aec5823ffa46327] | committer: Paul B Mahol doc/filters: add one more example for libvmaf > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=296296a4d5194977b… --- doc/filters.texi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 3a414d577f..5b8062d806 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -12264,6 +12264,9 @@ Enables confidence interval. This filter also supports the @ref{framesync} options. +@subsection Examples +@itemize +@item On the below examples the input file @file{main.mpg} being processed is compared with the reference file @file{ref.mpg}. @@ -12271,11 +12274,19 @@ compared with the reference file @file{ref.mpg}. ffmpeg -i main.mpg -i ref.mpg -lavfi libvmaf -f null - @end example +@item Example with options: @example ffmpeg -i main.mpg -i ref.mpg -lavfi libvmaf="psnr=1:log_fmt=json" -f null - @end example +@item +Example with options and different containers: +@example +ffmpeg -i main.mpg -i ref.mkv -lavfi "[0:v]settb=1/AVTB,setpts=PTS-STARTPTS[main];[1:v]settb=1/AVTB,setpts=PTS-STARTPTS[ref];[main][ref]libvmaf=psnr=1:log_fmt=json" -f null - +@end example +@end itemize + @section limiter Limits the pixel components values to the specified range [min, max].

1 0

doc/filters: add one more example for ssim/psnr
by Paul B Mahol 25 Oct '19

25 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Oct 25 22:35:02 2019 +0200| [487a1f28e283f22351397c0fbbfffb90b431e890] | committer: Paul B Mahol doc/filters: add one more example for ssim/psnr > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=487a1f28e283f2235… --- doc/filters.texi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 68441f8e28..3a414d577f 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14857,6 +14857,9 @@ Maximum allowed value for each channel, and average over all channels. @end table +@subsection Examples +@itemize +@item For example: @example movie=ref_movie.mpg, setpts=PTS-STARTPTS [main]; @@ -14867,6 +14870,13 @@ On this example the input file being processed is compared with the reference file @file{ref_movie.mpg}. The PSNR of each individual frame is stored in @file{stats.log}. +@item +Another example with different containers: +@example +ffmpeg -i main.mpg -i ref.mkv -lavfi "[0:v]settb=1/AVTB,setpts=PTS-STARTPTS[main];[1:v]settb=1/AVTB,setpts=PTS-STARTPTS[ref];[main][ref]psnr" -f null - +@end example +@end itemize + @anchor{pullup} @section pullup @@ -16908,6 +16918,9 @@ Same as above but in dB representation. This filter also supports the @ref{framesync} options. +@subsection Examples +@itemize +@item For example: @example movie=ref_movie.mpg, setpts=PTS-STARTPTS [main]; @@ -16918,11 +16931,19 @@ On this example the input file being processed is compared with the reference file @file{ref_movie.mpg}. The SSIM of each individual frame is stored in @file{stats.log}. +@item Another example with both psnr and ssim at same time: @example ffmpeg -i main.mpg -i ref.mpg -lavfi "ssim;[0:v][1:v]psnr" -f null - @end example +@item +Another example with different containers: +@example +ffmpeg -i main.mpg -i ref.mkv -lavfi "[0:v]settb=1/AVTB,setpts=PTS-STARTPTS[main];[1:v]settb=1/AVTB,setpts=PTS-STARTPTS[ref];[main][ref]ssim" -f null - +@end example +@end itemize + @section stereo3d Convert between different stereoscopic image formats.

1 0

avfilter/vf_psnr,vf_ssim: add warning if different timebases are encountered
by Paul B Mahol 25 Oct '19

25 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Oct 25 22:02:41 2019 +0200| [9e283aa24eca9d387e5fbc61230962cb18f3dc30] | committer: Paul B Mahol avfilter/vf_psnr,vf_ssim: add warning if different timebases are encountered > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e283aa24eca9d387… --- libavfilter/vf_psnr.c | 8 ++++++++ libavfilter/vf_ssim.c | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index 0675a17c5d..706561eacb 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -350,6 +350,14 @@ static int config_output(AVFilterLink *outlink) if ((ret = ff_framesync_configure(&s->fs)) < 0) return ret; + outlink->time_base = s->fs.time_base; + + if (av_cmp_q(mainlink->time_base, outlink->time_base) && + av_cmp_q(ctx->inputs[1]->time_base, outlink->time_base)) + av_log(ctx, AV_LOG_WARNING, "not matching timebases found between first input: %d/%d and second input %d/%d, results may be incorrect!\n", + mainlink->time_base.num, mainlink->time_base.den, + ctx->inputs[1]->time_base.num, ctx->inputs[1]->time_base.den); + return 0; } diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index 4c957f41a3..c08fbcdcc2 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -443,6 +443,14 @@ static int config_output(AVFilterLink *outlink) if ((ret = ff_framesync_configure(&s->fs)) < 0) return ret; + outlink->time_base = s->fs.time_base; + + if (av_cmp_q(mainlink->time_base, outlink->time_base) && + av_cmp_q(ctx->inputs[1]->time_base, outlink->time_base)) + av_log(ctx, AV_LOG_WARNING, "not matching timebases found between first input: %d/%d and second input %d/%d, results may be incorrect!\n", + mainlink->time_base.num, mainlink->time_base.den, + ctx->inputs[1]->time_base.num, ctx->inputs[1]->time_base.den); + return 0; }

1 0

avcodec/interplayvideo: properly decode motion vectors
by Paul B Mahol 25 Oct '19

25 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Oct 25 18:18:59 2019 +0200| [0481a1f6e5b8737c4fbc67794fd3a24cfcf34594] | committer: Paul B Mahol avcodec/interplayvideo: properly decode motion vectors Fixes #7945 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0481a1f6e5b8737c4… --- libavcodec/interplayvideo.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index b0a4953cb0..274641c3d1 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -77,9 +77,14 @@ typedef struct IpvideoContext { static int copy_from(IpvideoContext *s, AVFrame *src, AVFrame *dst, int delta_x, int delta_y) { + int width = dst->width; int current_offset = s->pixel_ptr - dst->data[0]; - int motion_offset = current_offset + delta_y * dst->linesize[0] - + delta_x * (1 + s->is_16bpp); + int x = (current_offset % dst->linesize[0]) / (1 + s->is_16bpp); + int y = current_offset / dst->linesize[0]; + int dx = delta_x + x - ((delta_x + x >= width) - (delta_x + x < 0)) * width; + int dy = delta_y + y + (delta_x + x >= width) - (delta_x + x < 0); + int motion_offset = dy * src->linesize[0] + dx * (1 + s->is_16bpp); + if (motion_offset < 0) { av_log(s->avctx, AV_LOG_ERROR, "motion offset < 0 (%d)\n", motion_offset); return AVERROR_INVALIDDATA; @@ -931,12 +936,12 @@ static void ipvideo_format_06_secondpass(IpvideoContext *s, AVFrame *frame, int1 int off_x, off_y; if (opcode < 0) { - off_x = ((uint16_t)opcode - 0xC000) % frame->linesize[0]; - off_y = ((uint16_t)opcode - 0xC000) / frame->linesize[0]; + off_x = ((uint16_t)opcode - 0xC000) % frame->width; + off_y = ((uint16_t)opcode - 0xC000) / frame->width; copy_from(s, s->last_frame, frame, off_x, off_y); } else if (opcode > 0) { - off_x = ((uint16_t)opcode - 0x4000) % frame->linesize[0]; - off_y = ((uint16_t)opcode - 0x4000) / frame->linesize[0]; + off_x = ((uint16_t)opcode - 0x4000) % frame->width; + off_y = ((uint16_t)opcode - 0x4000) / frame->width; copy_from(s, frame, frame, off_x, off_y); } } @@ -1001,12 +1006,12 @@ static void ipvideo_format_10_secondpass(IpvideoContext *s, AVFrame *frame, int1 int off_x, off_y; if (opcode < 0) { - off_x = ((uint16_t)opcode - 0xC000) % s->cur_decode_frame->linesize[0]; - off_y = ((uint16_t)opcode - 0xC000) / s->cur_decode_frame->linesize[0]; + off_x = ((uint16_t)opcode - 0xC000) % s->cur_decode_frame->width; + off_y = ((uint16_t)opcode - 0xC000) / s->cur_decode_frame->width; copy_from(s, s->prev_decode_frame, s->cur_decode_frame, off_x, off_y); } else if (opcode > 0) { - off_x = ((uint16_t)opcode - 0x4000) % s->cur_decode_frame->linesize[0]; - off_y = ((uint16_t)opcode - 0x4000) / s->cur_decode_frame->linesize[0]; + off_x = ((uint16_t)opcode - 0x4000) % s->cur_decode_frame->width; + off_y = ((uint16_t)opcode - 0x4000) / s->cur_decode_frame->width; copy_from(s, s->cur_decode_frame, s->cur_decode_frame, off_x, off_y); } }

1 0

avformat/bintext: avoid division by zero
by Paul B Mahol 25 Oct '19

25 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Oct 25 12:16:29 2019 +0200| [9d711a90fdf379dca2b3d24893c820c3060b5d94] | committer: Paul B Mahol avformat/bintext: avoid division by zero Fixes #8335 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d711a90fdf379dca… --- libavformat/bintext.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/bintext.c b/libavformat/bintext.c index d4921749a0..61b89f56d6 100644 --- a/libavformat/bintext.c +++ b/libavformat/bintext.c @@ -149,7 +149,7 @@ static int bin_probe(const AVProbeData *p) return AVPROBE_SCORE_EXTENSION + 1; predict_width(&par, p->buf_size, got_width); - if (par.width <= 0) + if (par.width < 8) return 0; calculate_height(&par, p->buf_size); if (par.height <= 0) @@ -195,6 +195,8 @@ static int bintext_read_header(AVFormatContext *s) next_tag_read(s, &bin->fsize); if (!bin->width) { predict_width(st->codecpar, bin->fsize, got_width); + if (st->codecpar->width < 8) + return AVERROR_INVALIDDATA; calculate_height(st->codecpar, bin->fsize); } avio_seek(pb, 0, SEEK_SET);

1 0

avformat/tee.c: steal bsf option before passing to fifo muxer
by Jun Li 25 Oct '19

25 Oct '19

ffmpeg | branch: master | Jun Li <junli1026(a)gmail.com> | Sun Oct 13 14:14:25 2019 -0700| [155508c6e925f4f2f5e77087a7e1925b3de735ff] | committer: Steven Liu avformat/tee.c: steal bsf option before passing to fifo muxer Fix #7620 In the case tee muxer with both "bsf" and "use_fifo" parameters will trigger this bug. Tee muxer will first steal parameters (like "f", "select"...) and then "use_fifo" will try reading out remaining options and pass them to fifo as option "format_options". Current code miss the part of stealing "bsf" options. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=155508c6e925f4f2f… --- libavformat/tee.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libavformat/tee.c b/libavformat/tee.c index 89a4ceb280..d91993354b 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -159,7 +159,7 @@ static void close_slaves(AVFormatContext *avf) static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) { int i, ret; - AVDictionary *options = NULL; + AVDictionary *options = NULL, *bsf_options = NULL; AVDictionaryEntry *entry; char *filename; char *format = NULL, *select = NULL, *on_fail = NULL; @@ -186,6 +186,12 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) STEAL_OPTION("onfail", on_fail); STEAL_OPTION("use_fifo", use_fifo); STEAL_OPTION("fifo_options", fifo_options_str); + entry = NULL; + while ((entry = av_dict_get(options, "bsfs", entry, AV_DICT_IGNORE_SUFFIX))) { + /* trim out strlen("bsfs") characters from key */ + av_dict_set(&bsf_options, entry->key + 4, entry->value, 0); + av_dict_set(&options, entry->key, NULL, 0); + } ret = parse_slave_failure_policy_option(on_fail, tee_slave); if (ret < 0) { @@ -311,8 +317,8 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) } entry = NULL; - while (entry = av_dict_get(options, "bsfs", NULL, AV_DICT_IGNORE_SUFFIX)) { - const char *spec = entry->key + strlen("bsfs"); + while (entry = av_dict_get(bsf_options, "", NULL, AV_DICT_IGNORE_SUFFIX)) { + const char *spec = entry->key; if (*spec) { if (strspn(spec, slave_bsfs_spec_sep) != 1) { av_log(avf, AV_LOG_ERROR, @@ -352,7 +358,7 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) } } - av_dict_set(&options, entry->key, NULL, 0); + av_dict_set(&bsf_options, entry->key, NULL, 0); } for (i = 0; i < avf->nb_streams; i++){ @@ -399,6 +405,7 @@ end: av_free(select); av_free(on_fail); av_dict_free(&options); + av_dict_free(&bsf_options); av_freep(&tmp_select); return ret; }

1 0

fftools/ffmpeg: Free swresample dictionary during cleanup
by Andreas Rheinhardt 24 Oct '19

24 Oct '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Thu Oct 24 15:36:35 2019 +0200| [6f2a3958cfac135c60b509a61a4fd39432d8f9a9] | committer: Michael Niedermayer fftools/ffmpeg: Free swresample dictionary during cleanup Freeing this was forgotten in ad899522. Fixes #8315 and #8316. 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=6f2a3958cfac135c6… --- fftools/ffmpeg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 8e408c808a..27f68933f8 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -567,6 +567,7 @@ static void ffmpeg_cleanup(int ret) ost->audio_channels_mapped = 0; av_dict_free(&ost->sws_dict); + av_dict_free(&ost->swr_opts); avcodec_free_context(&ost->enc_ctx); avcodec_parameters_free(&ost->ref_par);

1 0

avcodec/vp5: Check render_x/y
by Michael Niedermayer 24 Oct '19

24 Oct '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Oct 23 20:57:12 2019 +0200| [698e042c77ecb5b0d616de254adc783e8b61b9c4] | committer: Michael Niedermayer avcodec/vp5: Check render_x/y Fixes: Timeout (15sec -> 91ms) Fixes: 18353/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP5_fuzzer-5704150326706176 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Peter Ross <pross(a)xvid.org> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=698e042c77ecb5b0d… --- libavcodec/vp5.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index 0fca282918..f3946f508c 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -48,6 +48,8 @@ static int vp5_parse_header(VP56Context *s, const uint8_t *buf, int buf_size) ff_vp56_init_dequant(s, vp56_rac_gets(c, 6)); if (s->frames[VP56_FRAME_CURRENT]->key_frame) { + int render_x, render_y; + vp56_rac_gets(c, 8); if(vp56_rac_gets(c, 5) > 5) return AVERROR_INVALIDDATA; @@ -63,8 +65,11 @@ static int vp5_parse_header(VP56Context *s, const uint8_t *buf, int buf_size) cols << 4, rows << 4); return AVERROR_INVALIDDATA; } - vp56_rac_gets(c, 8); /* number of displayed macroblock rows */ - vp56_rac_gets(c, 8); /* number of displayed macroblock cols */ + render_y = vp56_rac_gets(c, 8); /* number of displayed macroblock rows */ + render_x = vp56_rac_gets(c, 8); /* number of displayed macroblock cols */ + if (render_x == 0 || render_x > cols || + render_y == 0 || render_y > rows) + return AVERROR_INVALIDDATA; vp56_rac_gets(c, 2); if (!s->macroblocks || /* first frame */ 16*cols != s->avctx->coded_width ||

1 0

avcodec/truespeech: Fix integer overflow in truespeech_synth()
by Michael Niedermayer 24 Oct '19

24 Oct '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Oct 7 18:13:26 2019 +0200| [66589d9bd9903c6be089f0bf89799314c3eb7b6a] | committer: Michael Niedermayer avcodec/truespeech: Fix integer overflow in truespeech_synth() Fixes: signed integer overflow: -1801695444 + -830224908 cannot be represented in type 'int' Fixes: 17995/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUESPEECH_fuzzer-5648084880588800 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=66589d9bd9903c6be… --- libavcodec/truespeech.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c index 799cef0945..d7c2d535e2 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -254,7 +254,7 @@ static void truespeech_synth(TSContext *dec, int16_t *out, int quart) for(i = 0; i < 60; i++){ int sum = 0; for(k = 0; k < 8; k++) - sum += ptr0[k] * ptr1[k]; + sum += ptr0[k] * (unsigned)ptr1[k]; sum = out[i] + ((sum + 0x800) >> 12); out[i] = av_clip(sum, -0x7FFE, 0x7FFE); for(k = 7; k > 0; k--)

1 0

avcodec/interplayacm: Fix integer overflows in juggle()
by Michael Niedermayer 24 Oct '19

24 Oct '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Oct 7 18:09:11 2019 +0200| [3948d80842f55a968a006215b62d3970cd082ee0] | committer: Michael Niedermayer avcodec/interplayacm: Fix integer overflows in juggle() Fixes: signed integer overflow: -760459023 + -1520918047 cannot be represented in type 'int' Fixes: 17994/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INTERPLAY_ACM_fuzzer-5647123042795520 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3948d80842f55a968… --- libavcodec/interplayacm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/interplayacm.c b/libavcodec/interplayacm.c index 5639d8de82..cff79eb6b2 100644 --- a/libavcodec/interplayacm.c +++ b/libavcodec/interplayacm.c @@ -435,7 +435,8 @@ static int fill_block(InterplayACMContext *s) static void juggle(int *wrap_p, int *block_p, unsigned sub_len, unsigned sub_count) { unsigned i, j; - int *p, r0, r1, r2, r3; + int *p; + unsigned int r0, r1, r2, r3; for (i = 0; i < sub_len; i++) { p = block_p;

1 0