From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id E9929475B3
for <ffmpegdev@gitmailbox.com>; Tue, 22 Apr 2025 20:57:51 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E9D4687DB3;
Tue, 22 Apr 2025 23:57:49 +0300 (EEST)
Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com
[209.85.128.48])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72D7B687D6F
for <ffmpeg-devel@ffmpeg.org>; Tue, 22 Apr 2025 23:57:41 +0300 (EEST)
Received: by mail-wm1-f48.google.com with SMTP id
5b1f17b1804b1-43ea40a6e98so51502225e9.1
for <ffmpeg-devel@ffmpeg.org>; Tue, 22 Apr 2025 13:57:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1745355461; x=1745960261; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=95jZmR4mt3yOJi6B6Z9ofETUe4cWtV6hvqXHgaGnpjM=;
b=DN66QHYO7QV7FdCh2J4ZSgOrWQvWaMR3yxcGQaq93k+bNWS+d0pPKX8vY0Y266wCnd
UQYV9G30QKJl4N/YjBEBOHWgQ1RYmFfsJmFjvHqx7PMy1VvgR0hRqBW09cOg+Bd455yB
/lGtG6q26A8IkUhpCi5nwLmdsTd8tVxF8ajvxAxTu/u8jt5IThc/3nOcMbakjX4GPypc
2rptqg0g3+JD4gSDlVQgUDLM4MZhXuxb3Jgs1LA3AUGRLqTZtegwt/hSa32r7cQkdxFz
9aKKweHlJVuG3j4ep0nkLXlCeE5nz1zwIPvKbWzuCpmsliD6Z9ezhQBypUwgz4zDKgX4
seXw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1745355461; x=1745960261;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=95jZmR4mt3yOJi6B6Z9ofETUe4cWtV6hvqXHgaGnpjM=;
b=ucVh/p/PgSvHbeaxh9pv+ZQmomrEfDsmMOSugxc6SyHHkmmgBwzDJ95CwnwGTmALiT
UCul3PPu2EBUyapFnCdznf39vdsTMjnpJnrfDBiXldQSbPREAT3qq7J/tS4Tu0uacALt
J/Qbk1KY30eMxrTgLUIazUN2+rXTvBbrPSN4wek16W8wBglR7PJowVefHwTxxtCQG5va
5XbOQu9myGkzrbwIy8aYSqetkpMkHvE+UyoctsMrUk/bpYnS/V4pV71QKzQGp21soIvN
cYKlsYZu0al6A6XHldv2ozq59NADz9xLImC9oCEXecXoPuqD+dQZCEV3D4iW3yHMrR0e
NDNA==
X-Gm-Message-State: AOJu0YxB4Dib96eA9ZVel5SpFA6pV+wLYFDRl4bBjBIUq00AvDsDIY9y
pdfjweuOAEWZNqzVJN024/937hEEVzOQoEtgtsoPFOTqsBHClhKhOwP6Sw==
X-Gm-Gg: ASbGncuSXtDnwxm8qcQAW6KxfQ/O51AkDveHu+4nWeayvBYIe8MgyurDwho29PlXS+p
AZtr+mWzSgvY5RVzmn7DXbgBWAscdebJshBcGgHuLGsIu3EnMA9XpJhH6j9QFxTZZYAvOUkwLQ4
dkBR8KpoWrf98nKWArD7i6bi+SCTi9R9uZ1GrCxURqiB+phO3CrhRkIiyEB8cyf82tMO//pGfLl
e/wSLdz/wJGe8cq5WZ/xQ8U7/NgTYryVTzPGXFoxIg+wW27pip94FO65YYbDZ2oM5LOgJVqDXtF
G8daWVFuW5VhAJ4c3txcIP+STaMQghhfxArGIvAZ2W0xrzDdbU/kpC6dCFERjG8V6hQl3fJT6GP
gBvYAHuhu8hTMs2SIRIGVXk6lw5x/F8YxA5O7xD+DZYkdtQaH8dLNYxqhEJ/tMCbDrUJKfQ1T1w
==
X-Google-Smtp-Source: AGHT+IFvNAADSAXpgLn9JGfNeLNJYlUBQ6r0uaK8STLhYG5f8gUnDv4AgDmFaD8W7qAWd8BOz8+Skw==
X-Received: by 2002:a05:600c:3acf:b0:43d:40b0:5b with SMTP id
5b1f17b1804b1-4406ac1fc09mr128431705e9.25.1745355460640;
Tue, 22 Apr 2025 13:57:40 -0700 (PDT)
Received: from ArmedBeast.fritz.box
(p200300cccf18bd005caacfa52a5bba5c.dip0.t-ipconnect.de.
[2003:cc:cf18:bd00:5caa:cfa5:2a5b:ba5c])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-39efa420705sm16312834f8f.8.2025.04.22.13.57.39
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Tue, 22 Apr 2025 13:57:40 -0700 (PDT)
From: Marvin Scholz <epirat07@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Tue, 22 Apr 2025 22:56:41 +0200
Message-Id: <20250422205640.35763-2-epirat07@gmail.com>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20250422205640.35763-1-epirat07@gmail.com>
References: <20250422205640.35763-1-epirat07@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [RFC PATCH 2/2] ffmpeg_demux: make readrate stall
warning input-specific
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Marvin Scholz <epirat07@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250422205640.35763-2-epirat07@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Given the readrate catchup is input-specific, it seems to make sense to
also warn on a per-input demux basis.
---
fftools/ffmpeg_demux.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index 6e01efc420..1f7ec20a43 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -101,6 +101,8 @@ typedef struct DemuxStream {
int64_t resume_pts;
// measure of how far behind packet reading is against spceified readrate
int64_t lag;
+ // state for resume after stall warning
+ int resume_warned;
} DemuxStream;
typedef struct Demuxer {
@@ -504,7 +506,6 @@ static void readrate_sleep(Demuxer *d)
(f->start_time != AV_NOPTS_VALUE ? f->start_time : 0)
);
int64_t initial_burst = AV_TIME_BASE * d->readrate_initial_burst;
- int resume_warn = 0;
for (int i = 0; i < f->nb_streams; i++) {
InputStream *ist = f->streams[i];
@@ -523,12 +524,12 @@ static void readrate_sleep(Demuxer *d)
ds->lag = lag;
ds->resume_wc = now;
ds->resume_pts = pts;
- av_log_once(ds, AV_LOG_WARNING, AV_LOG_DEBUG, &resume_warn,
+ av_log_once(ds, AV_LOG_WARNING, AV_LOG_DEBUG, &ds->resume_warned,
"Resumed reading at pts %0.3f with rate %0.3f after a lag of %0.3fs\n",
(float)pts/AV_TIME_BASE, d->readrate_catchup, (float)lag/AV_TIME_BASE);
}
if (ds->lag && !lag)
- ds->lag = ds->resume_wc = ds->resume_pts = 0;
+ ds->lag = ds->resume_wc = ds->resume_pts = ds->resume_warned = 0;
if (ds->resume_wc) {
elapsed = now - ds->resume_wc;
limit_pts = ds->resume_pts + elapsed * d->readrate_catchup;
--
2.39.5 (Apple Git-154)
_______________________________________________
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".