From patchwork Sun Nov 15 18:20:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 23651 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9A05844A79E for ; Sun, 15 Nov 2020 20:27:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7550A68B682; Sun, 15 Nov 2020 20:27:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9D2568020A for ; Sun, 15 Nov 2020 20:27:49 +0200 (EET) Received: by mail-qt1-f195.google.com with SMTP id v11so11082535qtq.12 for ; Sun, 15 Nov 2020 10:27:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vLEXUj7s7LP5d4WVRuXYFEn4rV0NUvGO+qTde9e6Oqk=; b=OgkxIhJqEd5oqeLV+nvJGQrKjAGqPQBFxe800hKJhmt4O3AYbQ3VZi6qXbmo1KjuVe 8qRz9OgujoYJXh/5F06SIUIbe+FXlw8YI08G1nVeq2lBPmd6B9AuxK/1Iz8rZJwBOyZF aoG5/BJ/Uasd9bsTEeVYohH99cAM/NSNDxv6DNofOyq7kgRg4twYhdroFu+fM7odhNH8 Us5RTMAzeKssIjRpOg6sWnfPyiRCje/4s+phFdG2iW4gBFnbGwS4b/50KGH6Z03qwJc+ UATslc0DBGOb7+oI+j7WRHLl/A6XJ2XH0sv0QCJ5D7erWynxZB2IHO1O4K59c8yjX2hP wXxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vLEXUj7s7LP5d4WVRuXYFEn4rV0NUvGO+qTde9e6Oqk=; b=L3I0nt5GsUSB4UBW32lRRjy0ZCmDijz5U9jHcXXC9LD+rKcIBRAv4NCLoF/4eJtRaX 2hwPEmdr6kN77HSBc3mkGMb1vT+I9K71ImavTsuECi8oLODefReTHy7gMyrCsw5KiDPm +BZaIsZAoguBKdiRZhkuXLDphifJZX73apdQ3OyyB6siaO3OZ0M6l/9Lj8Iahp83kIZG zRZ4AxfMWPHG39bzC3i2ZB5Vt/e5+SiGcnOAoiruI2f5aQN93CPu7Ig1sEhjsFQwXTmm /19QjgR7fXDxfwwMqrBU9gW/UgxEDHOtlgJqJs5q8g8YPsd+77DUNq6fFKrciIyKik9p NJYw== X-Gm-Message-State: AOAM531k/HErYpDGdFvzFKYQ2WxGtMJ8iVyOTirJ96fDdVAEe0ekkpvT Le8Q1YEWvM3msBcYDcwisXmTyEc5I1A= X-Google-Smtp-Source: ABdhPJw06ZZhbuorHr6aKaz7NNub7Oehd2kf/1WS1l2nhRxFxWZxoF1+vtsBsNq7lU05kVENaaQQhw== X-Received: by 2002:a05:620a:15b4:: with SMTP id f20mr11273202qkk.486.1605464430837; Sun, 15 Nov 2020 10:20:30 -0800 (PST) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id g19sm9305178qkl.86.2020.11.15.10.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 10:20:30 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Nov 2020 13:20:04 -0500 Message-Id: <20201115182005.24702-3-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201115182005.24702-1-andriy.gelman@gmail.com> References: <20201115182005.24702-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/rtsp: fix timeout option X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman 92c40ef882be115e72d2aa02f9032b7ce88f8537 added a listen_timeout option for sdp. This allowed a user to set variable timeout in sdp which was originally hard coded to 10 seconds. The commit used the initial_timeout variable to store the value. However, in rtsp this variable is also used to infer a "listen" mode. Thus, the timeout value could not be set when connecting to an rtsp server. The default value of -1 would also result in a 100ms total timeout. This was attempted to be fixed in c8101aabee654f6d147a4d89f77fa73e18908610, which changed the meaning of initial_timeout = -1 to be an infinite timeout in rtsp. However, it did not address the issue that the timeout could still not be set. Being able to set the timeout is useful because it allows to automatically reconfigure from a udp to tcp connection in rtp. In this commit, this is fixed by using the stimeout variable/option to set the timeout. Signed-off-by: Andriy Gelman --- libavformat/rtsp.c | 14 +++++++------- libavformat/rtsp.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 2ef75f50e3..a20cde80a9 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -95,9 +95,9 @@ const AVOption ff_rtsp_options[] = { { "listen_timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC }, #if FF_API_OLD_RTSP_OPTIONS { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC|AV_OPT_FLAG_DEPRECATED }, - { "stimeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC }, + { "stimeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT64, {.i64 = 0}, INT_MIN, INT64_MAX, DEC }, #else - { "timeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC }, + { "timeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT64, {.i64 = 0}, INT_MIN, INT64_MAX, DEC }, #endif COMMON_OPTS(), { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC }, @@ -111,7 +111,7 @@ static const AVOption sdp_options[] = { RTSP_FLAG_OPTS("sdp_flags", "SDP flags"), { "custom_io", "use custom I/O", 0, AV_OPT_TYPE_CONST, {.i64 = RTSP_FLAG_CUSTOM_IO}, 0, 0, DEC, "rtsp_flags" }, { "rtcp_to_source", "send RTCP packets to the source address of received packets", 0, AV_OPT_TYPE_CONST, {.i64 = RTSP_FLAG_RTCP_TO_SOURCE}, 0, 0, DEC, "rtsp_flags" }, - { "listen_timeout", "set maximum timeout (in seconds) to wait for incoming connections", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = READ_PACKET_TIMEOUT_S}, INT_MIN, INT_MAX, DEC }, + { "listen_timeout", "set maximum timeout (in seconds) to wait for incoming connections", OFFSET(stimeout), AV_OPT_TYPE_DURATION, {.i64 = READ_PACKET_TIMEOUT_S*1000000}, INT_MIN, INT64_MAX, DEC }, RTSP_MEDIATYPE_OPTS("allowed_media_types", "set media types to accept from the server"), COMMON_OPTS(), { NULL }, @@ -119,7 +119,7 @@ static const AVOption sdp_options[] = { static const AVOption rtp_options[] = { RTSP_FLAG_OPTS("rtp_flags", "set RTP flags"), - { "listen_timeout", "set maximum timeout (in seconds) to wait for incoming connections", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = READ_PACKET_TIMEOUT_S}, INT_MIN, INT_MAX, DEC }, + { "listen_timeout", "set maximum timeout (in seconds) to wait for incoming connections", OFFSET(stimeout), AV_OPT_TYPE_DURATION, {.i64 = READ_PACKET_TIMEOUT_S*1000000}, INT_MIN, INT64_MAX, DEC }, RTSP_MEDIATYPE_OPTS("allowed_media_types", "set media types to accept from the server"), COMMON_OPTS(), { NULL }, @@ -1835,7 +1835,7 @@ redirect: /* open the tcp connection */ ff_url_join(tcpname, sizeof(tcpname), lower_rtsp_proto, NULL, host, port, - "?timeout=%d", rt->stimeout); + "?timeout=%"PRId64, rt->stimeout); if ((ret = ffurl_open_whitelist(&rt->rtsp_hd, tcpname, AVIO_FLAG_READ_WRITE, &s->interrupt_callback, NULL, s->protocol_whitelist, s->protocol_blacklist, NULL)) < 0) { err = ret; @@ -1980,7 +1980,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, int n, i, ret; struct pollfd *p = rt->p; int *fds = NULL, fdsnum, fdsidx; - int runs = rt->initial_timeout * 1000LL / POLLING_TIME; + int64_t runs = rt->stimeout / POLLING_TIME / 1000; if (!p) { p = rt->p = av_malloc_array(2 * rt->nb_rtsp_streams + 1, sizeof(*p)); @@ -2041,7 +2041,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, } } #endif - } else if (n == 0 && rt->initial_timeout > 0 && --runs <= 0) { + } else if (n == 0 && rt->stimeout > 0 && --runs <= 0) { return AVERROR(ETIMEDOUT); } else if (n < 0 && errno != EINTR) return AVERROR(errno); diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 251ed86d19..b44a183c4f 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -397,7 +397,7 @@ typedef struct RTSPState { /** * timeout of socket i/o operations. */ - int stimeout; + int64_t stimeout; /** * Size of RTP packet reordering queue.