diff options
| author | James Almer <jamrial@gmail.com> | 2024-04-30 23:08:46 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-05-05 21:37:07 -0300 |
| commit | 0ec8f3c55a7786d88935205db8244a4c4419fe7f (patch) | |
| tree | 4d3da8bb2cdbf3b1dc5fe1ea11b60a786ff57d33 /libavformat/mov.c | |
| parent | 82397084a9328d3f67caa9ce519304b714a132ea (diff) | |
| download | ffmpeg-0ec8f3c55a7786d88935205db8244a4c4419fe7f.tar.gz | |
avformat/mov: don't use stream duration to calculate bitrate with fragmented input
sc->data_size may contain the size of a single fragment after probing, and
using it alongside the duration of the entire stream to calculate bitrate
will result in a bogus small value.
Before:
Duration: 00:00:05.00, start: 0.000000, bitrate: 586 kb/s
Stream #0:0[0x1](und): Video: h264 (High) (avc1 / 0x31637661), yuv420p(progressive), 640x360 [SAR 1:1 DAR 16:9], 112 kb/s, 60 fps, 60 tbr, 15360 tbn (default)
After:
Duration: 00:00:05.00, start: 0.000000, bitrate: 586 kb/s
Stream #0:0[0x1](und): Video: h264 (High) (avc1 / 0x31637661), yuv420p(progressive), 640x360 [SAR 1:1 DAR 16:9], 561 kb/s, 60 fps, 60 tbr, 15360 tbn (default)
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index e8da6c2d65..b3fa748f27 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -9667,25 +9667,7 @@ static int mov_read_header(AVFormatContext *s) } } - if (mov->trex_data) { - for (i = 0; i < s->nb_streams; i++) { - AVStream *st = s->streams[i]; - MOVStreamContext *sc = st->priv_data; - if (st->duration > 0) { - /* Akin to sc->data_size * 8 * sc->time_scale / st->duration but accounting for overflows. */ - st->codecpar->bit_rate = av_rescale(sc->data_size, ((int64_t) sc->time_scale) * 8, st->duration); - if (st->codecpar->bit_rate == INT64_MIN) { - av_log(s, AV_LOG_WARNING, "Overflow during bit rate calculation %"PRId64" * 8 * %d\n", - sc->data_size, sc->time_scale); - st->codecpar->bit_rate = 0; - if (s->error_recognition & AV_EF_EXPLODE) - return AVERROR_INVALIDDATA; - } - } - } - } - - if (mov->use_mfra_for > 0) { + if (mov->trex_data || mov->use_mfra_for > 0) { for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; MOVStreamContext *sc = st->priv_data; |