From patchwork Mon Apr 15 16:27:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 48075 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp1953584pzb; Mon, 15 Apr 2024 09:29:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXhp+lJ74TVpdbtIcCPI9lk5et+zFxRLDVSTWL/Ik3KTU5UgXmpJxzMA9NH0ciEYRJld8LOFqoseACvl86yMvvHhkCk8tUpz26SKw== X-Google-Smtp-Source: AGHT+IHyjqhWFoQ0VVNQigL4JtfYdwLRaZT+14BLODXyhM/tar6o5ZV89X4WfYGi3utPQWv69emE X-Received: by 2002:a17:906:33cd:b0:a54:c11b:527c with SMTP id w13-20020a17090633cd00b00a54c11b527cmr1120281eja.4.1713198547268; Mon, 15 Apr 2024 09:29:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713198547; cv=none; d=google.com; s=arc-20160816; b=u1L7gGAE3bTqXgkw0YNC+VkDFHD4Q8M2rYu8cADjN0cFhZ26yze+57dr88vVp/LSAN og9rm7mPm1W+Bz0WCXihq1RKthjcxWmCEtIz8HIKtWu9td1s3UUH/OUBqsHXk8klGMDq cYeMb9U2xX/K67Gp0oNDRg5Pb+RcEUgge0bpiqEVHHyivNaT4gkKsWJBeKW+/kGiEcX1 sUgh1peuuukNoDkB4yx22B3swZPt/Kxd5UEAr0FCqY5y+k5t3Y3ixscYJSQwnj8uDIQ2 ZbNBoSIZz2mgmC4zCV3bWfRDI8aSfEITk7iK5ZnwguNsL60shGOF+P7t7dGFbAGSMDXd KRJw== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=TZb7uon8sUceOzu0PQ2B5lOBBIxPb1E+MGeehI2jCWk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=y/WRd1iWYirMi3wuaLf2XFaFEBJAWdT5vb6EGiaCxEMSxIfajU8GJQol0Rhuh2o9Ow k2i70C2DvOx9RtYDgGpiQYZuVjXqQWb9RB8NchHSDdqOE4nHT1d2G1j5efRtIZM/oqMo d1AQhzLJ5D0jsZnvGOQZ6mbsRPqSpZaBC7z0AbO1b8tx60ERJG/HwSFk3D7e1Xj59FVl A8aEd3Y4UezO+JMOix8c2qA3/weqZcWdUgTNYsIAmXEr89y/CJYeNE1x1hAV97P8nves FLhXSD6NHEQkkjaxpPjL38t5TnOmGjMxtc0M6y0z6M3wpNJtmK1Lb6HweWV9V5Z+EIwO F4nw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=UyUZQxAq; 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 sh40-20020a1709076ea800b00a520030ee61si4836722ejc.589.2024.04.15.09.29.06; Mon, 15 Apr 2024 09:29:07 -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=20230601 header.b=UyUZQxAq; 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 A9E6E68CFFC; Mon, 15 Apr 2024 19:28:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BDBAE68CEEB for ; Mon, 15 Apr 2024 19:28:05 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-34388753650so1533193f8f.3 for ; Mon, 15 Apr 2024 09:28:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713198484; x=1713803284; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qsI0AmdQATqQYPSStwzeYmrQTZgiR70lZUOHvEloT/4=; b=UyUZQxAq8Ay1ozETJu5XsiOaJ7yYaSLTt7xgDGduxGNtUFoQrf0eTb7P6iVlne/IRD 6rU06f9z0Kr89VJi5MuKRnyvy3JdH4++clryW5KsdNDYuEyxpXIaYOwDSU4MRdlYQLiK OG7BJDr+IvoYgB2WNMbGtG1TZGtF4QDK0BoRAuQVBgfDzKeNvgtLbbSngOt5n1t50awH WOUBz8Ib04h6jCBER0g1Luz4u85gFV9NqyYg18szQUbjrAKguCzhVmebIQbsNVYbFdeL 6WEWqAj4+ckPyex/TjnreMSNsMqLYLg/25+2TVFrLAMTCsTEL/+FBzgrC3Kd6JOY5gC2 5/Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713198484; x=1713803284; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qsI0AmdQATqQYPSStwzeYmrQTZgiR70lZUOHvEloT/4=; b=meJ+S9fDiyb568CHRncGlvgTcUnVHcqyCnqe/RC5tlDPzRpNX9bWUqzO5kuDsmEtUR sty2DmkSW8RR2jHDtJEKtxhj3IhRrU1mIMp5WgxNRFNtKl5eMGtMSqaFFCwcH7UmBOct rXVj4By6dVQQv67CuuofxxS6OUul2rIPv86lvTSPdgsJUP2nM+lowwGzeD6pAu7Xvw1y IvAqUXWPS9Mnx3nANbaYYcOk7sS2/jd4nCHtWNohG0PAwFa7A7l5t+cr4TSsGckZQXav IWJkq9IxNkTBafISPprjIWp7n554ehACXIHI+3nz9Pj74D7rhpEqVnRPHPu+h0+43qad c/UA== X-Gm-Message-State: AOJu0YyNW7099PMAvC3E7S0lafRLqf5e4btoHRTlEcxQbRwKNmmThGe2 aean87dI+rKHuqG5bU1rQGpxb51C6q2dsZ6FBX4L8zcqPOW/Hm3ADgDPTA== X-Received: by 2002:adf:e286:0:b0:347:9bec:9ba3 with SMTP id v6-20020adfe286000000b003479bec9ba3mr2847015wri.66.1713198484622; Mon, 15 Apr 2024 09:28:04 -0700 (PDT) Received: from localhost.localdomain (33bf3d9d.skybroadband.com. [51.191.61.157]) by smtp.gmail.com with ESMTPSA id u8-20020a5d4348000000b00347c187a3a0sm3899969wrr.24.2024.04.15.09.28.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 09:28:03 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Apr 2024 17:27:41 +0100 Message-ID: <20240415162741.110374-7-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240415162741.110374-1-derek.buitenhuis@gmail.com> References: <20240415162741.110374-1-derek.buitenhuis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] avformat/http: Add options to set the max number of connection retries 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: OuuQCQHhqyar Not every use case benefits from setting retries in terms of the backoff. Signed-off-by: Derek Buitenhuis --- libavformat/http.c | 12 +++++++++--- libavformat/version.h | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index ce1af5f976..009536901a 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -140,6 +140,7 @@ typedef struct HTTPContext { uint64_t filesize_from_content_range; int respect_retry_after; int retry_after; + int reconnect_max_retries; } HTTPContext; #define OFFSET(x) offsetof(HTTPContext, x) @@ -178,6 +179,7 @@ static const AVOption options[] = { { "reconnect_on_http_error", "list of http status codes to reconnect on", OFFSET(reconnect_on_http_error), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, { "reconnect_streamed", "auto reconnect streamed / non seekable streams", OFFSET(reconnect_streamed), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, D }, { "reconnect_delay_max", "max reconnect delay in seconds after which to give up", OFFSET(reconnect_delay_max), AV_OPT_TYPE_INT, { .i64 = 120 }, 0, UINT_MAX/1000/1000, D }, + { "reconnect_max_retries", "the max number of times to retry a connection", OFFSET(reconnect_max_retries), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, D }, { "respect_retry_after", "respect the Retry-After header when retrying connections", OFFSET(respect_retry_after), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, D }, { "listen", "listen on HTTP", OFFSET(listen), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, D | E }, { "resource", "The resource requested by a client", OFFSET(resource), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E }, @@ -359,7 +361,7 @@ static int http_open_cnx(URLContext *h, AVDictionary **options) { HTTPAuthType cur_auth_type, cur_proxy_auth_type; HTTPContext *s = h->priv_data; - int ret, auth_attempts = 0, redirects = 0; + int ret, conn_attempts = 1, auth_attempts = 0, redirects = 0; int reconnect_delay = 0; uint64_t off; char *cached; @@ -386,7 +388,8 @@ redo: ret = http_open_cnx_internal(h, options); if (ret < 0) { if (!http_should_reconnect(s, ret) || - reconnect_delay > s->reconnect_delay_max) + reconnect_delay > s->reconnect_delay_max || + (s->reconnect_max_retries >= 0 && conn_attempts > s->reconnect_max_retries)) goto fail; if (s->respect_retry_after && s->retry_after > 0) { @@ -401,6 +404,7 @@ redo: if (ret != AVERROR(ETIMEDOUT)) goto fail; reconnect_delay = 1 + 2 * reconnect_delay; + conn_attempts++; /* restore the offset (http_connect resets it) */ s->off = off; @@ -1706,6 +1710,7 @@ static int http_read_stream(URLContext *h, uint8_t *buf, int size) int err, read_ret; int64_t seek_ret; int reconnect_delay = 0; + int conn_attempt = 1; if (!s->hd) return AVERROR_EOF; @@ -1734,7 +1739,7 @@ static int http_read_stream(URLContext *h, uint8_t *buf, int size) !(s->reconnect_at_eof && read_ret == AVERROR_EOF)) break; - if (reconnect_delay > s->reconnect_delay_max) + if (reconnect_delay > s->reconnect_delay_max || (s->reconnect_max_retries >= 0 && conn_attempt > s->reconnect_max_retries)) return AVERROR(EIO); av_log(h, AV_LOG_WARNING, "Will reconnect at %"PRIu64" in %d second(s), error=%s.\n", s->off, reconnect_delay, av_err2str(read_ret)); @@ -1742,6 +1747,7 @@ static int http_read_stream(URLContext *h, uint8_t *buf, int size) if (err != AVERROR(ETIMEDOUT)) return err; reconnect_delay = 1 + 2*reconnect_delay; + conn_attempt++; seek_ret = http_seek_internal(h, target, SEEK_SET, 1); if (seek_ret >= 0 && seek_ret != target) { av_log(h, AV_LOG_ERROR, "Failed to reconnect at %"PRIu64".\n", target); diff --git a/libavformat/version.h b/libavformat/version.h index ee91990360..41dbd4ad01 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ #include "version_major.h" #define LIBAVFORMAT_VERSION_MINOR 3 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \