From patchwork Tue Sep 19 23:40:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 5196 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp118061jaa; Tue, 19 Sep 2017 16:41:03 -0700 (PDT) X-Received: by 10.28.27.195 with SMTP id b186mr2283422wmb.96.1505864463851; Tue, 19 Sep 2017 16:41:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505864463; cv=none; d=google.com; s=arc-20160816; b=D7aG837hS/Ex9Szs1nWL+oFrIozTHSMS86hFJSoqo2lBuSFxObZgELrn3BEvFUioNJ DuxkIs1ZBgV+NIV6usIvrtmDczqfzrCoZ1YfA5rJmmS/wXBunwbndrzwtRQ4zwRJyQWQ zfpdeqpz+YFSMISzU9rw7vb8SkjJZq3YECYBr1q+wPeqlVlrOEGNldN0Wbbipyloxy+X iVCL1uObvd+GMrX8vdLrCouZ9T3j/htHfeWQTSxJcTdZd+0vMdOawDnkBAsgLBLoal+i RUKJYlBuKsxnp6r7mzflwfwEX/0yZmtmEhiRgAkpTVbLfQbWUPbJ9purJ0adibHembAB ZYzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=xo6HzaRno3MGhssE10k8b1wK0nT7nN3SvLi/uJZ7Sak=; b=cb2oWVv67eVI3OCHSq6dzT/ly+iMDw6llrBDhP63LhD8NKi+gRjZI0Iz7P9RL8GR22 0vvI0h082DzLEt9AGR+Y4KVfnUchRtN991JX+wJ6EAuxt+XcyMQ8lyGoqE4TyxZ7eMdB KQdg8oBoioomlxY43fBzIZzNM38czo4fFclNccVt5bac4hECDXUzHyq9iswTFmHMWXsJ H6fPYbg/ueRbZeXYTe4pqm6Saob/7ze/9gSgucH9vbxH4iU28cplo2vCKqViS5z4sDUb HgYFJnzG6TE+rTI+3SoaC8pZ7tkAomcSOgPscJGuC/46K9tzU+XMJScZx357yYw1SUe4 SjgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lexY+IvT; 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=NONE 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 62si369610wrs.62.2017.09.19.16.41.03; Tue, 19 Sep 2017 16:41:03 -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=20161025 header.b=lexY+IvT; 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=NONE 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 1FA0468972F; Wed, 20 Sep 2017 02:40:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f43.google.com (mail-it0-f43.google.com [209.85.214.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E899868837A for ; Wed, 20 Sep 2017 02:40:45 +0300 (EEST) Received: by mail-it0-f43.google.com with SMTP id v19so1065419ite.0 for ; Tue, 19 Sep 2017 16:40:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=/Zf2Y/0cbVl+/LK73/jlt3/MtVzHLZumcx7w/AhuBg4=; b=lexY+IvT/nl80D6/muuC/MKjUh6wDdEbfI5u37Qh753B3SBvAingPKUUjlA41mzRzQ UknIhEGHCu4ZCvypOZcS+Lhrv0+uYdf/hNG/gBbYGvoG3loiRQcFcQDedifXGagMGcJt XgvtSx0ExgC/ciyxMwCGmRi1wXTDSE0z0Mq+Jm6Fo7CWus1seKdj6ovzbAIu1kfk9+w7 K9z/KPfqGGSi40S9KkDtFWd8eAPRafCo6uapnixujPs/zim6Qy5cNWGymc12powY++Ja WaAYAoDZJScidYypqVryAwuQKUPpLAnFEGRpBtbBYtD4fb28XeU5N20GESozKFLOHW9B 7lUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=/Zf2Y/0cbVl+/LK73/jlt3/MtVzHLZumcx7w/AhuBg4=; b=eaSMm7ahuOKDGcsSbkEosfh6Dn5ZdMBjgqToOlyljhAq+0UPZet+IZCQ2kOG1CHzgj bsZtJKJtH6WbZiWjz0j1wU2odOO00Y3xAJnqyYnEOS4ipmUkUQ6jU055qVBUPJvmVh7E Pdu+bqM9uru6wt1q2BNBTOxsj4BEVyfz5ccDTRtEOJNb3ZZEG1yU1Umjox+aYU0Xjr9a zLxIMKleUt07iCHgUE6tI9D9iq0LhCixHQ4EXbZcZcFXI8JR3431SyJzuiRQc5eu2J49 pcZ9k4CMLNz7mWenJs/Y0HkJrfqmYacdlFQWBeIopbhoUVssSBnQvMY1Y9ODeJ/MWIU/ Ekaw== X-Gm-Message-State: AHPjjUioPRsZkqgPGBJvFm+WKOTqVbkLQrwYnzHsZgwCsyecrrSuMTTr 8GTodBEBDNNRq+U7OtbmMtmO31m0aRJv115cXrk= X-Google-Smtp-Source: AOwi7QDTcPNTQ7K0Bd/RQgpVFaA3YrCC5qwdkEKTwCpKyc7B1c3ETPSSqMO5r0c0Shq4oXNRO8cV5yiyVM4Qc5D6Mag= X-Received: by 10.36.253.7 with SMTP id m7mr497350ith.12.1505864453531; Tue, 19 Sep 2017 16:40:53 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.139.4 with HTTP; Tue, 19 Sep 2017 16:40:32 -0700 (PDT) From: Carl Eugen Hoyos Date: Wed, 20 Sep 2017 01:40:32 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/rtsp: Allow to set SDP timeout. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch fixes part of ticket #2415. Please comment, Carl Eugen From 6da40f03df782a5b230026c7732095700e55f73a Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 20 Sep 2017 01:38:46 +0200 Subject: [PATCH] lavf/rtsp: Allow to set sdp timeout. Fixes part of ticket #2415. --- libavformat/rtsp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 0bd72dc..c8fa26a 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -104,6 +104,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" }, + { "timeout", "set timeout (in tenths of a seconds)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = MAX_TIMEOUTS}, 0, 1000000, DEC }, RTSP_MEDIATYPE_OPTS("allowed_media_types", "set media types to accept from the server"), COMMON_OPTS(), { NULL }, @@ -2003,7 +2004,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, } } #endif - } else if (n == 0 && ++timeout_cnt >= MAX_TIMEOUTS) { + } else if (n == 0 && ++timeout_cnt >= rt->initial_timeout) { return AVERROR(ETIMEDOUT); } else if (n < 0 && errno != EINTR) return AVERROR(errno); -- 1.7.10.4