From patchwork Tue Apr 3 01:12:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rshaffer@tunein.com X-Patchwork-Id: 8295 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp3125197jad; Mon, 2 Apr 2018 18:13:12 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+vmkwaxy5wYCHZ/rXsqqxbJnE7f9XaFmHaCZqoginYVDgT84cNJqiVYzxq3yeLsdtduwHN X-Received: by 10.28.143.132 with SMTP id r126mr2153801wmd.45.1522717992096; Mon, 02 Apr 2018 18:13:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522717992; cv=none; d=google.com; s=arc-20160816; b=qnJQq+wuj8UO7/ogChEk5h3Cgy+AOqrwM9e8ztwBDR1WcTP9lhbjYZR45Lj+ziCbBW lL50OfyoD+Y3SfLHRlGZmwOISES6ht4uoBY9dHaEQY6Hofzm7y12LlrEuNFDewO/F0Im 38MJ7fZpfp8RVWS7E90PRxgf0lJNIRCjp5dRMOHkwVjEoBkQ6fBt/hGbPLPeAT4BiXaz u+ghF0HQ927TSf497enU6jRHvrYkeJqDSgn74DlqEbhHExORp5MV6gNtuLw3ZKCi3V+4 3jw8txWKQ3JWJ7QnzsvEB7v48NywMZtQ+fsnLj3lRTKs/QwnJ/TZh8MUwHWr0kJ177Ps p2iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=1Mqa7q3ujxgxWzSEbT29sF1CIGHgxcn6GRGuQkJWihE=; b=MpSIgjp4O/vjnDhkQpxj5+soDMSzjSYFV1R7wZ2CG/97WHeYPH99Zuiqdmp5rk6hct FPr3Sx8OJ3FOGIOGuJZmFQMxu52nBk1qnwnJ/V8ERf57zjFSpMWx605zlaN1WODtFAEK Wq13eOFHiohY5ukedmBaGGSxY2dGCKD5JXagnZH+v2qIgZAfRx7U5rWZfHXko/DG6F13 m1HCEOI+dAPiD2ce9SqBKDW6ZTAAiURYUIrJm1JKf9wqgy1tilCJRpV0ZusnlZc/AruT zY/4oY4lbL83jzb7UYcnvkZncnHDZ7yf2XsYAfA3aBh+JAxF+HzM6MjXXMH1iNk3nIbE CD6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tunein-com.20150623.gappssmtp.com header.s=20150623 header.b=yiziNrwu; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q66si1106088wrb.269.2018.04.02.18.13.11; Mon, 02 Apr 2018 18:13:12 -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=@tunein-com.20150623.gappssmtp.com header.s=20150623 header.b=yiziNrwu; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A0E2689C88; Tue, 3 Apr 2018 04:12:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f52.google.com (mail-pl0-f52.google.com [209.85.160.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69053689C71 for ; Tue, 3 Apr 2018 04:12:42 +0300 (EEST) Received: by mail-pl0-f52.google.com with SMTP id s24-v6so6560433plq.6 for ; Mon, 02 Apr 2018 18:13:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tunein-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=9zsUnKHKLu+pWCDrq4Gh3ChKz+AZV9IUXdy5AmuecUo=; b=yiziNrwuJpRYfxUAy5Q6fUw3LHsuBluLkCddR/Td559KFBd4bP4tY8Qj1ZrIllhpBC LL+0UHsDyKn6A2/L4FmEC3l9mgumlyrsiKjPrP0hyjMhz7iVtjf/ZKiaTIIUCwW0qSJ8 Zog15AXVh2ytO+c0bWG+4K1uaFILMPs3pwoSJGl3BzU/IcnxmEbJbaU41JI+mU49ZPoR BTTU4m3ZmRX55ZuuNRXinuiXeEsRQV6At+ZAWTC+3JzRN0OMlNtbC9WJYszifBEhAa11 0bcxOffFohlDndbqNGInU0GBsh6UiWaqZDgwkDI5N/P9P3kBcTG+kyybNW12XWEvm2OL kPNA== 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; bh=9zsUnKHKLu+pWCDrq4Gh3ChKz+AZV9IUXdy5AmuecUo=; b=DCyfPNrwm7YAXFtKMNXUGKqs7nDbus3SLH+jrGHJwzh2kEYrt8W92yBymHixQzrZMj ASCdlJkXB8H7pejL3TxuNKOjohvPvZ5lD1zwj2vorFZRl7ZZ6NdT8SXH3OvwLNLnjm2I 5R/JEUO5UidYjlWzudj0994GRu4BoAvKox44Gzmh/NVFrvxgmEK1DtfRSIKSDGhwPwEn ixHcWUlpTQ3bmOUmqZsmRXp7Rjd/tiQm6UGH5GjM9xAwidg0aZPe1Z63K2T9vRDn5krg 0Yuz5wglqtSM/R+mVro1YaFobE+HRHskKMydk7a1wkiBXH45yPaWaI46nwHUBaEenxO4 rW8g== X-Gm-Message-State: AElRT7HYcK1jUnCke/HZmgUKzgSPrlpOkToIPSbe8ZKLMh5U7F06Alq0 mh5824wVQObijI1wwIoAKV8e6AiR X-Received: by 2002:a17:902:3181:: with SMTP id x1-v6mr12180101plb.2.1522717980927; Mon, 02 Apr 2018 18:13:00 -0700 (PDT) Received: from nsudarsanam430.tunein.net ([204.69.221.190]) by smtp.gmail.com with ESMTPSA id x5sm2846692pfx.110.2018.04.02.18.12.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Apr 2018 18:13:00 -0700 (PDT) From: rshaffer@tunein.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Apr 2018 18:12:46 -0700 Message-Id: <20180403011246.30530-1-rshaffer@tunein.com> X-Mailer: git-send-email 2.15.1 (Apple Git-101) Subject: [FFmpeg-devel] [PATCH] avformat/hls: copy rw_timeout from parent to child AVIOContexts. 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: Richard Shaffer MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Richard Shaffer The rw_timeout option is currently not applied when opening media playlist, segment, or encryption key URLs. This can cause the HLS demuxer to block indefinitely, even when the rw_timeout option has been specified. This change simply enables carrying over the rw_timeout option when the demuxer opens these URLs. --- libavformat/hls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index c578bf86e3..6663244ddf 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1661,7 +1661,7 @@ static int save_avio_options(AVFormatContext *s) { HLSContext *c = s->priv_data; static const char * const opts[] = { - "headers", "http_proxy", "user_agent", "user-agent", "cookies", "referer", NULL }; + "headers", "http_proxy", "user_agent", "user-agent", "cookies", "referer", "rw_timeout", NULL }; const char * const * opt = opts; uint8_t *buf; int ret = 0;