From patchwork Wed Nov 15 13:24:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 44672 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a5:b0:181:818d:5e7f with SMTP id q37csp2679238pzg; Wed, 15 Nov 2023 05:25:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IHef4B0fb3Fr3jIY+IQJHRpbD8DC+A4zZXP6aiTscfs7YZthj5K5xscOGd2B7ginS4YCiIf X-Received: by 2002:a17:906:fe0c:b0:9bd:81c3:2a85 with SMTP id wy12-20020a170906fe0c00b009bd81c32a85mr5177227ejb.32.1700054704546; Wed, 15 Nov 2023 05:25:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700054704; cv=none; d=google.com; s=arc-20160816; b=r+Wyu4NSgUGlT6oB8p57PKUmO9NphHuBrEIKfUCzN/6l9FBj7DqMW+NNOJ6WkvdR6K Q46rZFKmqG34rMqAjNMgQzFEbSrZJfE9aSX+zx+5VlmLwALhV2CNgY1sx4bl2ZRImumY gDCj2IwAFen/ZapUyLyyrffES7btN1pDe0kBwjh6rdACJ9R4G6zYgSsyhHLOAGGpLtpm XWEcBnn/BrpZWzb0rPJiudQnu5CszGtpxGhZCShDbQcgjeca6dJv7qBX37Kb/r9v0REC mGcGzXSYwcSLjzq0CqROxzoqrTm2t0E9uaXkYmthsB6jzqiJ41KmYm9sCvExWbjfApzr nDDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=AaRJx/1vniHmjDUi1uFHb+lQupqGTaI24YPgEmqQOSo=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=Bsc7jLDZbD0RCss50dWHCXMXAqfUJ40TKw5JBR+QD+A8ncfcA3uPbNd8F/BaMHmtG8 za6BAeMI1g/gf68D+YkCaAKmMVM8179a3SrWYf6rROTYI7JMTCtoOcfkSeMyK/0U/637 P3x67oLCWErg/1eKrq7ChempuFM5z6wjKClnIihP8El3DIANj/ZJi+5uDrSO1dCVJFgS MFlur+WVOVW30U72yf7+cpeTwSNvULchfCFuT7If5d2OrjTyHTXFPQp3XDJFrr01Ru4/ mK5uwWfZ5gIRhrbR+sVmdthNNcJ6qAXAOxv77Ft13c+zkzw+72A+NWFwdEiIQYlRm53e eQyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=kZkUAcvB; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dt11-20020a170906b78b00b009e42873cdf5si5599534ejb.237.2023.11.15.05.25.02; Wed, 15 Nov 2023 05:25:04 -0800 (PST) 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=@foxmail.com header.s=s201512 header.b=kZkUAcvB; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 19F9868CCBB; Wed, 15 Nov 2023 15:24:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9DBE868CB76 for ; Wed, 15 Nov 2023 15:24:48 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1700054679; bh=8RaDgGpd+rj13Hze006UnimbBTTCr1WbOzlil4drWmI=; h=From:To:Cc:Subject:Date; b=kZkUAcvBcybrLE+CjmSkS4axkzU65ZjCOn2PWqClBIVIcuzlM7ZwPBNgjckvaXGLJ Xlse8Tgp0eXkcuq6N9gdD4SIa6F2uQwz+JmycfHbrccO03/TZrxDbqolRVonImOrCI vwoa6y1OWuORzxtVHxqSMNbO6N3dv+p+yhIibzEU= Received: from ZHILIZHAO-MB1.tencent.com ([113.108.77.53]) by newxmesmtplogicsvrsza12-0.qq.com (NewEsmtp) with SMTP id 625BE054; Wed, 15 Nov 2023 21:24:37 +0800 X-QQ-mid: xmsmtpt1700054677t4hz5n9ow Message-ID: X-QQ-XMAILINFO: NMGzQWUSIfvTRsRybAiyqIFFqmqZdIMKJUk6Tof6NiF9FalAkjFDeMX1qWywAu o1gJxfb6nqz3MfyaJLlyq9NJEipK5+72CNaW6GMEd+c4r3O1fwusyZuH/WYUbyuZhnK0DDDKwgUL iAMB5s/KqJhytcRSqGNrOtrc4T45EMYzS2OWVd1aspCvuOnuGHCHZHKQkNDg1eQ7OYwh/aQa8Mc4 hoCC0Usk2lDb/xhngDmboZqmOah7wa7+O0kjxOm1ZDlcXayrr6Td9Wvf9/7EZ7z4SeDK/CeIH2z8 82FHAtPLO2vj/15ONcWM/dJNKeNWhqSySdQUwIRTuQnfYApgAX0NEmcX3wrCLgkcQFJRmHBJnt+d kyLRwjf2Arm8IO7my4IiZTct/P83Rlaxj33DC2hLwTvjb1Q+1NC1h01PwD+Jz0t4WSWQtGlSn6mU Ro2ZX99yhRlTBviQw/I/qdoMrQ9Zl9Zn2bN3WphQS7gFMgmUkrh5jvmq3yD0ksMm+nbX6izzp9Vz UMkWmdy+RXen1TWYMbdHPQ2DIWXUVmPTGxNy98QdsUI8HEGQMC2HzoEDBWMO7joSYn7czNw/jGoD YCo8vwsCEhwynY3nZCRtiJ9TNS5G4XyvlAbtDnA5KljGXZ7fDYd5tFsvs98aPo86p2WOGDod7nZ3 sxnEbQyQzpxEWM28mGkmC1DYiW2BmYW5iNtPvt9nX6m4EuI587/o3ziaEGvEgHfi6Dq3J36xFyWm le5u+rMDm00UOqA5w69TyB3U8MGpoUbEGLzOtyIxTK2cC+TRQh3sdKmp8dj0bUhAsXxC9awC/fVb rhv8kFCe3qVzr6PfsobtlBL6k1XRVKZcgqov9asMCX6meBO07Yq1fXNZXmwWSl6PEOpZLen9yS0x 6FB1wia6mLyWVEjwlJBz3nOIA9IPWLvA9fq9jhjYe0pfszTEfOd1PmrGzfvK5qWcCmPhq+5odFOH zlrIDUH1BV6f0IBznoji18in53KS5+piZ/qfDDIF51tE1AnR1mxg== X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Nov 2023 21:24:35 +0800 X-OQ-MSGID: <20231115132435.20256-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/rtmpproto: Pass rw_timeout to underlying transport protocol 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: glKwLJ6H8ll3 From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavformat/rtmpproto.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 98718bc6da..a0c6195eb2 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -2635,6 +2635,9 @@ static int rtmp_open(URLContext *s, const char *uri, int flags, AVDictionary **o if (rt->listen_timeout > 0) rt->listen = 1; + /* Pass rw_timeout to underlying transport protocol */ + if (s->rw_timeout > 0) + av_dict_set_int(opts, "rw_timeout", s->rw_timeout, 0); rt->is_input = !(flags & AVIO_FLAG_WRITE);