October 2020 - ffmpeg-cvslog - lists.ffmpeg.org

fftools/ffmpeg: fix the wrong bitrate and speed stats
by Limin Wang 31 Oct '20

31 Oct '20

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Tue Oct 20 22:51:08 2020 +0800| [3da35b7cc7e2f80ca4af89e55fef9a7bcb19c128] | committer: Limin Wang fftools/ffmpeg: fix the wrong bitrate and speed stats The bitrate and speed stats are wrong if the copyts is enabled. Please test with below command: wget http://samples.mplayerhq.hu/MPEG2/foxksaz.ts ./ffmpeg -y -copyts -i ./foxksaz.ts -c:v libx264 -x264opts \ nal-hrd=cbr:force-cfr=1 -b:v 3500k -minrate 3500k -maxrate 3500k -bufsize \ 1000k -c:a mp2 -muxrate 4500k -vframes 1000 test.ts before: frame= 1000 fps=112 q=-1.0 Lsize= 9063kB time=09:10:12.41 bitrate= 2.2kbits/s speed=3.7e+03x after: frame= 1000 fps=112 q=-1.0 Lsize= 9062kB time=00:00:15.78 bitrate=4703.4kbits/s speed=1.77x Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3da35b7cc7e2f80ca… --- fftools/ffmpeg.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 788cf9c665..7a27258758 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -344,6 +344,7 @@ static volatile int received_nb_signals = 0; static atomic_int transcode_init_done = ATOMIC_VAR_INIT(0); static volatile int ffmpeg_exited = 0; static int main_return_code = 0; +static int64_t copy_ts_first_pts = AV_NOPTS_VALUE; static void sigterm_handler(int sig) @@ -1781,9 +1782,17 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti vid = 1; } /* compute min output value */ - if (av_stream_get_end_pts(ost->st) != AV_NOPTS_VALUE) + if (av_stream_get_end_pts(ost->st) != AV_NOPTS_VALUE) { pts = FFMAX(pts, av_rescale_q(av_stream_get_end_pts(ost->st), ost->st->time_base, AV_TIME_BASE_Q)); + if (copy_ts) { + if (copy_ts_first_pts == AV_NOPTS_VALUE && pts > 1) + copy_ts_first_pts = pts; + if (copy_ts_first_pts != AV_NOPTS_VALUE) + pts -= copy_ts_first_pts; + } + } + if (is_last_report) nb_frames_drop += ost->last_dropped; }

1 0

avcodec/nvenc: fix build with older SDKs
by Timo Rothenpieler 30 Oct '20

30 Oct '20

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Fri Oct 30 20:43:38 2020 +0100| [45e3131c44716aa0d300632307270db50ff404d0] | committer: Timo Rothenpieler avcodec/nvenc: fix build with older SDKs > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45e3131c44716aa0d… --- libavcodec/nvenc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index da8a3f5a67..48625f5baa 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1274,9 +1274,6 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx) ctx->init_encode_params.tuningInfo, &preset_config); #else - // Turn off tuning info parameter if older presets are on - ctx->init_encode_params.tuningInfo = 0; - nv_status = p_nvenc->nvEncGetEncodePresetConfig(ctx->nvencoder, ctx->init_encode_params.encodeGUID, ctx->init_encode_params.presetGUID,

1 0

avformat/wavdec: Refuse to read chunks bigger than the filesize in w64_read_header()
by Michael Niedermayer 30 Oct '20

30 Oct '20

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Oct 17 23:50:57 2020 +0200| [7b2244565ac8cb1eddd085e1a382a893ac03bfb4] | committer: Michael Niedermayer avformat/wavdec: Refuse to read chunks bigger than the filesize in w64_read_header() Fixes: OOM Fixes: 26414/clusterfuzz-testcase-minimized-ffmpeg_dem_FWSE_fuzzer-5070632544632832 Fixes: 26475/clusterfuzz-testcase-minimized-ffmpeg_dem_W64_fuzzer-5770207722995712 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=7b2244565ac8cb1ed… --- libavformat/wavdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index bca186a66f..a81f2c7a67 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -902,6 +902,7 @@ static int w64_read_header(AVFormatContext *s) } else if (!memcmp(guid, ff_w64_guid_summarylist, 16)) { int64_t start, end, cur; uint32_t count, chunk_size, i; + int64_t filesize = avio_size(s->pb); start = avio_tell(pb); end = start + FFALIGN(size, INT64_C(8)) - 24; @@ -916,7 +917,7 @@ static int w64_read_header(AVFormatContext *s) chunk_key[4] = 0; avio_read(pb, chunk_key, 4); chunk_size = avio_rl32(pb); - if (chunk_size == UINT32_MAX) + if (chunk_size == UINT32_MAX || (filesize >= 0 && chunk_size > filesize)) return AVERROR_INVALIDDATA; value = av_mallocz(chunk_size + 1);

1 0

avformat/rsd: Check size and start before computing duration
by Michael Niedermayer 30 Oct '20

30 Oct '20

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Oct 21 18:15:53 2020 +0200| [c79d8a685182a8d8735887399bf0f3742b020597] | committer: Michael Niedermayer avformat/rsd: Check size and start before computing duration Fixes: signed integer overflow: 100794754 * 28 cannot be represented in type 'int' Fixes: 26474/clusterfuzz-testcase-minimized-ffmpeg_dem_RSD_fuzzer-5181797606096896 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=c79d8a685182a8d87… --- libavformat/rsd.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/libavformat/rsd.c b/libavformat/rsd.c index e23c8abae5..ee0b9557de 100644 --- a/libavformat/rsd.c +++ b/libavformat/rsd.c @@ -103,13 +103,9 @@ static int rsd_read_header(AVFormatContext *s) break; case AV_CODEC_ID_ADPCM_PSX: par->block_align = 16 * par->channels; - if (pb->seekable & AVIO_SEEKABLE_NORMAL) - st->duration = av_get_audio_frame_duration2(par, avio_size(pb) - start); break; case AV_CODEC_ID_ADPCM_IMA_RAD: par->block_align = 20 * par->channels; - if (pb->seekable & AVIO_SEEKABLE_NORMAL) - st->duration = av_get_audio_frame_duration2(par, avio_size(pb) - start); break; case AV_CODEC_ID_ADPCM_IMA_WAV: if (version == 2) @@ -117,8 +113,6 @@ static int rsd_read_header(AVFormatContext *s) par->bits_per_coded_sample = 4; par->block_align = 36 * par->channels; - if (pb->seekable & AVIO_SEEKABLE_NORMAL) - st->duration = av_get_audio_frame_duration2(par, avio_size(pb) - start); break; case AV_CODEC_ID_ADPCM_THP_LE: /* RSD3GADP is mono, so only alloc enough memory @@ -128,8 +122,6 @@ static int rsd_read_header(AVFormatContext *s) if ((ret = ff_get_extradata(s, par, s->pb, 32)) < 0) return ret; - if (pb->seekable & AVIO_SEEKABLE_NORMAL) - st->duration = av_get_audio_frame_duration2(par, avio_size(pb) - start); break; case AV_CODEC_ID_ADPCM_THP: par->block_align = 8 * par->channels; @@ -142,18 +134,36 @@ static int rsd_read_header(AVFormatContext *s) avio_read(s->pb, st->codecpar->extradata + 32 * i, 32); avio_skip(s->pb, 8); } - if (pb->seekable & AVIO_SEEKABLE_NORMAL) - st->duration = (avio_size(pb) - start) / (8 * par->channels) * 14; break; case AV_CODEC_ID_PCM_S16LE: case AV_CODEC_ID_PCM_S16BE: if (version != 4) start = avio_rl32(pb); - if (pb->seekable & AVIO_SEEKABLE_NORMAL) - st->duration = (avio_size(pb) - start) / 2 / par->channels; break; } + if (start < 0) + return AVERROR_INVALIDDATA; + + if (pb->seekable & AVIO_SEEKABLE_NORMAL) { + int64_t remaining = avio_size(pb); + + if (remaining >= start && remaining - start <= INT_MAX) + switch (par->codec_id) { + case AV_CODEC_ID_ADPCM_PSX: + case AV_CODEC_ID_ADPCM_IMA_RAD: + case AV_CODEC_ID_ADPCM_IMA_WAV: + case AV_CODEC_ID_ADPCM_THP_LE: + st->duration = av_get_audio_frame_duration2(par, remaining - start); + break; + case AV_CODEC_ID_ADPCM_THP: + st->duration = (remaining - start) / (8 * par->channels) * 14; + break; + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S16BE: + st->duration = (remaining - start) / 2 / par->channels; + } + } avio_skip(pb, start - avio_tell(pb)); if (par->codec_id == AV_CODEC_ID_XMA2) {

1 0

avformat/vividas: better check of current_sb_entry
by Michael Niedermayer 30 Oct '20

30 Oct '20

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Oct 21 23:05:41 2020 +0200| [b848baef0dc42d97a5c1ab975cc8994a265b88ae] | committer: Michael Niedermayer avformat/vividas: better check of current_sb_entry This is the simplest fix for the problem, it is possible to instead check this when the variables are set and propagate errors and then fail earlier Fixes: out of array access Fixes: 26490/clusterfuzz-testcase-minimized-ffmpeg_dem_VIVIDAS_fuzzer-5723367078100992 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=b848baef0dc42d97a… --- libavformat/vividas.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index 6e93d96aef..83d0ed1167 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -673,6 +673,10 @@ static int viv_read_packet(AVFormatContext *s, if (!pb) return AVERROR(EIO); off = avio_tell(pb); + + if (viv->current_sb_entry >= viv->n_sb_entries) + return AVERROR_INVALIDDATA; + off += viv->sb_entries[viv->current_sb_entry].size; if (viv->sb_entries[viv->current_sb_entry].flag == 0) {

1 0

avformat/iff: More completely check body_size
by Michael Niedermayer 30 Oct '20

30 Oct '20

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Oct 21 22:56:17 2020 +0200| [3588e2e6b05ba92f0907e9ffe263c2e65d53e346] | committer: Michael Niedermayer avformat/iff: More completely check body_size Fixes: infinite loop Fixes: 26485/clusterfuzz-testcase-minimized-ffmpeg_dem_IFF_fuzzer-5126561373880320 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=3588e2e6b05ba92f0… --- libavformat/iff.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/iff.c b/libavformat/iff.c index 04fe8be4eb..fb76aed4c3 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -839,7 +839,7 @@ static int iff_read_packet(AVFormatContext *s, } else if (st->codecpar->codec_tag == ID_DST) { return read_dst_frame(s, pkt); } else { - if (iff->body_size > INT_MAX) + if (iff->body_size > INT_MAX || !iff->body_size) return AVERROR_INVALIDDATA; ret = av_get_packet(pb, pkt, iff->body_size); } @@ -875,6 +875,8 @@ static int iff_read_packet(AVFormatContext *s, pkt->flags |= AV_PKT_FLAG_KEY; } else if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && st->codecpar->codec_tag != ID_ANIM) { + if (iff->body_size > INT_MAX || !iff->body_size) + return AVERROR_INVALIDDATA; ret = av_get_packet(pb, pkt, iff->body_size); pkt->pos = pos; if (pos == iff->body_pos)

1 0

avformat/vividas use avpriv_set_pts_info()
by Michael Niedermayer 30 Oct '20

30 Oct '20

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Oct 21 22:16:37 2020 +0200| [d5c42b8c080920d3bbdde91ccd38cd8de0aefa05] | committer: Michael Niedermayer avformat/vividas use avpriv_set_pts_info() Fixes: assertion failure Fixes: 26482/clusterfuzz-testcase-minimized-ffmpeg_dem_VIVIDAS_fuzzer-4905102324006912 Fixes: 26491/clusterfuzz-testcase-minimized-ffmpeg_dem_VIVIDAS_fuzzer-6002953141616640 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=d5c42b8c080920d3b… --- libavformat/vividas.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index 7d59cd8fe9..6e93d96aef 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -319,6 +319,8 @@ static int track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t * for (i = 0; i < num_video; i++) { AVStream *st = avformat_new_stream(s, NULL); + int num, den; + if (!st) return AVERROR(ENOMEM); @@ -331,8 +333,9 @@ static int track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t * off += ffio_read_varlen(pb); avio_r8(pb); // '3' avio_r8(pb); // val_7 - st->time_base.num = avio_rl32(pb); // frame_time - st->time_base.den = avio_rl32(pb); // time_base + num = avio_rl32(pb); // frame_time + den = avio_rl32(pb); // time_base + avpriv_set_pts_info(st, 64, num, den); st->nb_frames = avio_rl32(pb); // n frames st->codecpar->width = avio_rl16(pb); // width st->codecpar->height = avio_rl16(pb); // height

1 0

avformat/xwma: Check for EOF in dpds_table read code
by Michael Niedermayer 30 Oct '20

30 Oct '20

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Oct 21 19:37:45 2020 +0200| [44b18a76b8d4e01c7ce62474aaf196857e75e976] | committer: Michael Niedermayer avformat/xwma: Check for EOF in dpds_table read code Fixes: Timeout (>30 -> 140ms) Fixes: 26478/clusterfuzz-testcase-minimized-ffmpeg_dem_XWMA_fuzzer-5918147066200064 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=44b18a76b8d4e01c7… --- libavformat/xwma.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/xwma.c b/libavformat/xwma.c index 5a57caa841..aedadcf140 100644 --- a/libavformat/xwma.c +++ b/libavformat/xwma.c @@ -211,6 +211,10 @@ static int xwma_read_header(AVFormatContext *s) } for (i = 0; i < dpds_table_size; ++i) { + if (avio_feof(pb)) { + ret = AVERROR_INVALIDDATA; + goto fail; + } dpds_table[i] = avio_rl32(pb); size -= 4; }

1 0

avcodec/nvenc: only enforce explicitly set twopass mode
by Timo Rothenpieler 30 Oct '20

30 Oct '20

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Fri Oct 30 17:26:32 2020 +0100| [91b8e0053802b0a1d0c5a08c4981d91fc2be9e95] | committer: Timo Rothenpieler avcodec/nvenc: only enforce explicitly set twopass mode > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91b8e0053802b0a1d… --- libavcodec/nvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index b4a0a5bf0a..da8a3f5a67 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -900,7 +900,7 @@ static av_cold void nvenc_setup_rate_control(AVCodecContext *avctx) if (ctx->flags & NVENC_ONE_PASS) ctx->encode_config.rcParams.multiPass = NV_ENC_MULTI_PASS_DISABLED; - if (ctx->flags & NVENC_TWO_PASSES || ctx->twopass) + if (ctx->flags & NVENC_TWO_PASSES || ctx->twopass > 0) ctx->encode_config.rcParams.multiPass = NV_ENC_TWO_PASS_FULL_RESOLUTION; if (ctx->rc < 0) {

1 0

avcodec/nvenc: only auto-pick vbr rc in cq mode
by Timo Rothenpieler 30 Oct '20

30 Oct '20

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Fri Oct 30 17:21:13 2020 +0100| [d5b0a8e5030652244f16c2fa6bb7a53a5a76240f] | committer: Timo Rothenpieler avcodec/nvenc: only auto-pick vbr rc in cq mode > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5b0a8e5030652244… --- libavcodec/nvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index e8b29fabee..b4a0a5bf0a 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -908,7 +908,7 @@ static av_cold void nvenc_setup_rate_control(AVCodecContext *avctx) ctx->rc = NV_ENC_PARAMS_RC_CBR; } else if (ctx->cqp >= 0) { ctx->rc = NV_ENC_PARAMS_RC_CONSTQP; - } else { + } else if (ctx->quality >= 0.0f) { ctx->rc = NV_ENC_PARAMS_RC_VBR; } }

1 0