diff mbox series

[FFmpeg-devel,2/2,v2] avformat/mov: Do not hard fail if bit rate calculation overflows unless in explode mode

Message ID 20211020140354.1124965-3-derek.buitenhuis@gmail.com
State New
Headers show
Series mov: bit rate calculation fixes | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Derek Buitenhuis Oct. 20, 2021, 2:03 p.m. UTC 
bit_rate is not a critical field, and we shouln't hard fail if we
can't caluclate it due to a large timebase - it needlessly breaks
valid files.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
 libavformat/mov.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 431f430368..0f948fface 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -7992,10 +7992,11 @@  static int mov_read_header(AVFormatContext *s)
                 /* Akin to sc->data_size * 8 * sc->time_scale / st->duration but accounting for overflows. */
                 st->codecpar->bit_rate = av_rescale(sc->data_size, sc->time_scale * 8, st->duration);
                 if (st->codecpar->bit_rate == INT64_MIN) {
-                    av_log(s, AV_LOG_ERROR, "Overflow during bit rate calculation %"PRId64" * 8 * %d\n",
+                    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;
-                    return AVERROR_INVALIDDATA;
+                    if (s->error_recognition & AV_EF_EXPLODE)
+                        return AVERROR_INVALIDDATA;
                 }
             }
         }
@@ -8009,10 +8010,11 @@  static int mov_read_header(AVFormatContext *s)
                 /* Akin to sc->data_size * 8 * sc->time_scale / sc->duration_for_fps but accounting for overflows. */
                 st->codecpar->bit_rate = av_rescale(sc->data_size, sc->time_scale * 8, sc->duration_for_fps);
                 if (st->codecpar->bit_rate == INT64_MIN) {
-                    av_log(s, AV_LOG_ERROR, "Overflow during bit rate calculation %"PRId64" * 8 * %d\n",
+                    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;
-                    return AVERROR_INVALIDDATA;
+                    if (s->error_recognition & AV_EF_EXPLODE)
+                        return AVERROR_INVALIDDATA;
                 }
             }
         }