From patchwork Tue Oct 12 13:50:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 31085 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp4802406ioa; Tue, 12 Oct 2021 06:51:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFQ9QbAD2Ar9+z5U4ifyE1iC4kOrswvPspkhuWWjAwir1x2gYowfBFmvoMKoovvotR+FQ2 X-Received: by 2002:a17:906:3784:: with SMTP id n4mr10249983ejc.129.1634046665133; Tue, 12 Oct 2021 06:51:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634046665; cv=none; d=google.com; s=arc-20160816; b=HKBuP7lehn8Cs9Y6lFrkdkcTvE/XmE9ALzUPxlpVErqwP5yi3oKtIIcIOaZBoJx5hP AmxHLVxpYi5VTfbI1d8BwQRVB2FGK+taM9hM8DnOKvERJEQRcYFMksI9k/0cf0wyxXje g3hJ7uTtuCwB6b3J9Pn1/DoxW0BY7P59JRqfZZuW7f5jojppOfCiK1kzSTnjoLjKl2cq UZiM03JW5LPv38IfbS+RSHbcfUzn+cpGZca2twN+FAKjN9qoU9+eeusFS7uJ0BqN2ZW+ W78v+I2U/x7GATdgGRTwrIGexST2Ncab8wdOYmnP1Y+3bRK4c3OBrZPjoUECrDyHp7xv tCsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=x0W8zFw1TBZL+km+0hbH8wjefXtv5gwb2zYJ3ml/PIM=; b=FGgse1lJAHci+G+K89bv1HM74hu+LrU7T7sYcP60waEInY7MPlFy9Inav+VTzOQjx2 7IF0vIpN3M5tQ46RcWHYkwVyHp3c7/6C1XxAmQ/WuKdkolbLTyulb0gM2vxxk1W2CahC bVrQwX2xo3AuvCVQLL3JXjg1Xzcf5OSroRbK6Bddm+IPuqnyfYAfFHPW1jCNhzYLWJmV 6Mc7olR194CV/DMevP+jsZc9Vzkvzn5V54nrUt2oLtH0jxI51Og0eKf2dtiA/fwFmxJh gJRbHVrRgvcBPFiZSdzczc/O6xo0w5b7p/hytHVfuHyUwdCzFXJg89Ih/vJA5ks2Bz8H NiDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=LJccEk11; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h11si14962133edf.416.2021.10.12.06.51.03; Tue, 12 Oct 2021 06:51:05 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=LJccEk11; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A13968A7C9; Tue, 12 Oct 2021 16:51:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70D7E687F3D for ; Tue, 12 Oct 2021 16:50:54 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id r7so67249306wrc.10 for ; Tue, 12 Oct 2021 06:50:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=KzrLxF6S8Uz0dZJFZSoXOikaJDFQx+eR8CkmbXRkQkI=; b=LJccEk11OqBLSbOgmj/AezWfPOAQVlxRbg9P5P/FpO3CkQVQRO71GvqQUfGXn7XIRI fyTJtD250GKxQN2vAR/VTqBHkAehKYUoomCDtZKhzz9rkxLXRHgYJr5D6OWxPju3gu3q ujyzBkJk9GQABvpBIADNEn57ETgXZctp5IefWIhGhez9D/G4U6ppUEYRVGwUHUy2EoTr d4RfxHwpYydIq0dCBuwKLkxlCY2cgRutlYy5nkd4Pv1b2sV+wgEZb8V76+yuPN45yuIF 5p2CieisDnUkUHYCIf5HYOG0b11OuA6u2Diq2p47mczJQ4hH9UXVw9ysUpgmrKQXSZoD ZdcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=KzrLxF6S8Uz0dZJFZSoXOikaJDFQx+eR8CkmbXRkQkI=; b=NxpQbd9y7PCFMYHJlQrsnfB7qd+0Fjpt+6RkQM0sHhtVvrbuLl0SGSwQdcAFe28hN4 vgM/OsYtmDfezPYZLs/4XubGe5y7f5wjXGk1BWgaPgkzJemBqKhSkllz0tRIBUdo1B7n GdcwIvNbmoAlXMtx807veeq+TlGijEChFdRyUWncO55H8fFfKNKy4JOMIZ0EbrXdO/RR d/dcUglayvFcgwBHZslNMpDiXS+9U/MRMLf9BrO+bjbtDVCDuy2EFsHoE+Eiif+5P126 lIJzap1kelT+C28kxzdqpvYo3JiisAioy05waQEygKgPspI0nvV36r3QKAK3uJpEtCGY jjCw== X-Gm-Message-State: AOAM532NgziKOahO4T6omM7GuQ+TuwRXZl4ejBFGpf5VKMN7DE/X8a1u ZpaibDEHrojc2sabzKULUMwo3APLrvU= X-Received: by 2002:adf:e101:: with SMTP id t1mr33037782wrz.395.1634046653703; Tue, 12 Oct 2021 06:50:53 -0700 (PDT) Received: from localhost.localdomain ([82.129.92.120]) by smtp.gmail.com with ESMTPSA id t14sm9170318wrr.75.2021.10.12.06.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Oct 2021 06:50:53 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Oct 2021 14:50:40 +0100 Message-Id: <20211012135040.764167-1-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: Do not hard fail if bit rate calculation overflows unless in explode mode X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NTFmeoswQCMX 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 --- libavformat/mov.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index d0b8b2595b..99d10c2b33 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7666,11 +7666,12 @@ static int mov_read_header(AVFormatContext *s) MOVStreamContext *sc = st->priv_data; if (st->duration > 0) { if (sc->data_size > INT64_MAX / sc->time_scale / 8) { - 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); - return AVERROR_INVALIDDATA; - } - st->codecpar->bit_rate = sc->data_size * 8 * sc->time_scale / st->duration; + if (s->error_recognition & AV_EF_EXPLODE) + return AVERROR_INVALIDDATA; + } else + st->codecpar->bit_rate = sc->data_size * 8 * sc->time_scale / st->duration; } } } @@ -7681,12 +7682,13 @@ static int mov_read_header(AVFormatContext *s) MOVStreamContext *sc = st->priv_data; if (sc->duration_for_fps > 0) { if (sc->data_size > INT64_MAX / sc->time_scale / 8) { - 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); - return AVERROR_INVALIDDATA; - } - st->codecpar->bit_rate = sc->data_size * 8 * sc->time_scale / - sc->duration_for_fps; + if (s->error_recognition & AV_EF_EXPLODE) + return AVERROR_INVALIDDATA; + } else + st->codecpar->bit_rate = sc->data_size * 8 * sc->time_scale / + sc->duration_for_fps; } } }