From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id A8B1749440 for ; Thu, 11 Apr 2024 12:20:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D83E568D188; Thu, 11 Apr 2024 15:20:18 +0300 (EEST) Received: from out203-205-221-240.mail.qq.com (out203-205-221-240.mail.qq.com [203.205.221.240]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 407FD68CEDD for ; Thu, 11 Apr 2024 15:20:11 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1712838009; bh=x/jG2LgDlxTkdeqyZolO5LvVlctqkU7dhiY/ACb5n0g=; h=From:Subject:Date:References:To:In-Reply-To; b=KOk1JcMKtdeWwLhMbzdT+/aXwCFpr3MEIRHrfCHaID2m+Lb5C5TeXNmQgVXKZJ9Fd SopiLY6zAzph2jiwKMTUI0RTHIWn9ysjijlPq4NFlsEbPkdfodOnaNFrfX7qxok89C uqpyNhwtjaRlFNLiN1WhNvh9PpoqDeISFyJ8Jo+Y= Received: from smtpclient.apple ([113.108.77.70]) by newxmesmtplogicsvrszc19-0.qq.com (NewEsmtp) with SMTP id 50827A6F; Thu, 11 Apr 2024 20:20:08 +0800 X-QQ-mid: xmsmtpt1712838008tow4ehg23 Message-ID: X-QQ-XMAILINFO: OTISBJKPy/pkG6MS7ePi+vK0SbuM07hgWm36HPaY573a+d3y38aeqaNFAC4RmU MEUeKW8971GexltVD+lTPxViVZ5QxMdCVMXTd14ejpsLhJiq0VGt8iWTqNJgb4hzUaudQp2+8p8M hlhN9vwFcApgwdA0L/RbFQSZAS/ywlBaHYFDCBICPFm4M0PmSX0auat9W1LA3T4z4cohpPpQAxZq wo5s0unxqnD0HePpe3IX6+A4iKv//b3HelZW0e42A/vTqcTsP8iWoCeynDTN5O7IpsKZUMDQk6u7 2wVKZ5QLeDA6T91wK2k6LOlaHL53/NwhLihmsY7Zqi/LdgAeSeCqoQA6dbx1HyuNBxHp+ieFhZA0 PEdD7yEXa/+gkkgTu15uanbQ7qB91/bPi8L9oA+RG/z5OwrnITfpN7VGHoOQBOnKOeYbwjO8A+UC JrC7r4EE75W+tTcdOCWvTlpUDir+7hXHHyGeIH89OXEhG8fF7hwFpCkAGdLtGMrV7Wftq2YOYfff 0NWg1Y4Dwq67Lcr45afyI8gH5f8/JyLG5e/rbikdwfb9Cr9y4VwIjw7ByEx/+ogQw4wRq+pqsd4U MPTCRHs/pBKwUeS/qLn2boxf1183M/MNovpslcvOtoq0llnnGxOP65NI8tXSzbwEAQNQvsUZRgpb MPqZfy5zc9eaE5jvZZiLq6mLXvP/4hXrUyYapGKN0qxLBj25mvRZixNc+6uszQtqX0f8bRvszF04 tTGrXwybuiFhyDjQY4rFePRShxIh/3ilLy2TZgx0k85R9uSlFKSsOLKknvnssm8rcXSLkIo0P+yH jhGvSrYIFLPpBt0dmv8r0CDfkCKTZvAMGrPVUMqTX/KgLfPjhGXba+hEQtDgG4hPjySG5YaFeM+4 /OITweZCgRhRON0hi0ZMuNkSeVamIWnvrGKD6foit155jWvU9bGXrTSAtjVcGnLT8A/7nvqg/N32 FRdpeQxGEi/zE/kAJGu4aaXNiJ0/M4lo4XGrfXmG/ycV9vR/5ZLpYvjBof8Ovp X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: Zhao Zhili Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Date: Thu, 11 Apr 2024 20:19:58 +0800 References: To: FFmpeg development discussions and patches In-Reply-To: X-OQ-MSGID: <499C484E-DA59-4A36-924D-4108C255F5F0@foxmail.com> X-Mailer: Apple Mail (2.3774.200.91.1.1) Subject: Re: [FFmpeg-devel] [PATCH] avformat/tls_mbedtls: Pass FLAG_NONBLOCK to underlying transport 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > On Apr 8, 2024, at 21:26, Zhao Zhili wrote: > > From: Zhao Zhili > > This fix rtmps failure since rtmps requires nonblocking read. > > Signed-off-by: Zhao Zhili > --- > libavformat/tls_mbedtls.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/libavformat/tls_mbedtls.c b/libavformat/tls_mbedtls.c > index 8503523b6d..f51cf43b1c 100644 > --- a/libavformat/tls_mbedtls.c > +++ b/libavformat/tls_mbedtls.c > @@ -309,6 +309,8 @@ static int tls_read(URLContext *h, uint8_t *buf, int size) > TLSContext *tls_ctx = h->priv_data; > int ret; > > + tls_ctx->tls_shared.tcp->flags &= ~AVIO_FLAG_NONBLOCK; > + tls_ctx->tls_shared.tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK; > if ((ret = mbedtls_ssl_read(&tls_ctx->ssl_context, buf, size)) > 0) { > // return read length > return ret; > @@ -322,6 +324,8 @@ static int tls_write(URLContext *h, const uint8_t *buf, int size) > TLSContext *tls_ctx = h->priv_data; > int ret; > > + tls_ctx->tls_shared.tcp->flags &= ~AVIO_FLAG_NONBLOCK; > + tls_ctx->tls_shared.tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK; > if ((ret = mbedtls_ssl_write(&tls_ctx->ssl_context, buf, size)) > 0) { > // return written length > return ret; > -- > 2.25.1 Will apply tomorrow. > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".