From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DFD674A51E for ; Wed, 1 May 2024 02:09:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 50E5968D649; Wed, 1 May 2024 05:09:10 +0300 (EEST) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0583568D516 for ; Wed, 1 May 2024 05:09:04 +0300 (EEST) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1eb24e3a2d9so41178675ad.1 for ; Tue, 30 Apr 2024 19:09:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714529341; x=1715134141; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=MsygVP7K3CVa3MXmhavbmSRy83NuRbi1WTj3itqEMsw=; b=nghRZBvgvv9mdVLFF3BWU6sorEvfwz515pAJxk8ZJdJdT8PnJ9VutRO91CWollbHlN I6RC/exrIiYIGTYLm1ZHcblz+aMCZ4RhKnhp6RJcGfmGC8yvSkGEs6w5IPAxrXAEOgEn V8mZTdLTUt7UmGBwUnGyeJM/HhiEUKvJx4JORbjp/j4cIzban4rcJTNG65zrcu17KIem jEYIJFE7YowotpKvzM1RnwzqG16PQgvfTCFrTU77u9luwMhjXh7Kym35SRNCeiaDUJeo wwZXEKVGo4Br4MG58MWKH1rSyVQFDerTYlCE0LMml9tzFo1zb/EVbn8FekMSuO1Al8cM XgDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714529341; x=1715134141; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MsygVP7K3CVa3MXmhavbmSRy83NuRbi1WTj3itqEMsw=; b=xPknCi+HpmrrKhE7GPE6ozlvvtFY+A/EqQ+bVouO9J8vXa2xKmj6gg7kpfV+xRRDPW hAweu6oEmnHJ0AOvVazDFcKT42dIgw4FRuWO3QUA14kJtZX/kK++6nQywxxtF8hwLnoK LB60Hfx8Djb8FQfhZ07VOTImiCjUaGcfaOFobYeHBDE70uIuCaZcoNUlzXv6Un0tEznf M4mB+iF4aSvL1sh041d34Lfp/WamGAna55pFfkxTGhJ4Ih3WrJc+zy3CyuvVneGraVup 05CNWQOfMOxJd2/RjELqu3FuZ/tS3MrdEK7oM0Mc7vsfr48sq3B0Bm8SpTxKB2cUD9Pi HS8w== X-Gm-Message-State: AOJu0YyigJ+hPQNFBU4otBTpQs9w62ISrFopjQ4HWuBnMYieyGccKyEX c3IAN9FbolGR6Hmq97RO5Dn3oiJDYSia3d0qkhHWmBQg7wdw4BoEw0uIrg== X-Google-Smtp-Source: AGHT+IEc13Z/W7HKTcWvSosVp+Vc95saWwajFu+TmvjLp5TeciJTi7JnI3g4NpfqmoSIBR0T3y2BMg== X-Received: by 2002:a17:902:6bc2:b0:1ec:7b0d:9eb9 with SMTP id m2-20020a1709026bc200b001ec7b0d9eb9mr1053119plt.64.1714529341034; Tue, 30 Apr 2024 19:09:01 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id b13-20020a170902650d00b001e245c5afbfsm2177633plk.155.2024.04.30.19.08.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 19:09:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Apr 2024 23:08:46 -0300 Message-ID: <20240501020847.2641-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: don't use stream duration to calculate bitrate with fragmented input 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 --- libavformat/mov.c | 20 +------------------- 1 file changed, 1 insertion(+), 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; -- 2.44.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".