From patchwork Thu Jan 11 01:31:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 7253 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp13276jaa; Wed, 10 Jan 2018 17:31:18 -0800 (PST) X-Google-Smtp-Source: ACJfBov6iq/OqY6ZdNVmZ3z5X3o2Rild+BjsSo2Xgh8XrtfQg6NhFuMdvnWKf7HziRWGyWILmyQS X-Received: by 10.28.21.206 with SMTP id 197mr3389622wmv.125.1515634278765; Wed, 10 Jan 2018 17:31:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515634278; cv=none; d=google.com; s=arc-20160816; b=mzhA8SQwqTXBu/7ch/wT/NCLge+THw8VgCycpYxE/Xab75GzzCQLo5H+uqgMhraWeZ 9sf3mg990xKyCBiLvd+6RT0WR1BfNs4CLlHeMPyIrpHCxNno65TjQHSOvlrSU3n+CS4P c513n4cK9PmS+9NLdvZQ1EA1dYxfFtK31QQI55E4FKt/f35rC65cKmbhqA8Da0O13iJH k9qGizEg8UWmEedP5SY0mwd0Iu6zhFdFy0TafgTRwML6IdSwALNzy7O4JKNL4KsuaATL lnk/mzFctzJkskgPJabjfeyhlZB7nz4YFy7yBDtIsapbAV1BFfi66K+YahMtbAYr+l3L mETA== 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=0xfEjV8QfAW6rXkxOteamPd7MCFxzCTuNfW8o3NPl1k=; b=vXFXOL3QcTE61Cp0gcuiV+0EfGLbfQWBSLGeclMap1ycfUlSX35Sn4pqHK9fPOe4ir o0lcsa0ReHrsgAEQatDemxA2R1liu1hal+6se6rZeks34w4acRpJ85/Hc66iFioZxel+ wOuYMYKUYzHopnsS16mRxK19pT9VFAwE40UJvwVXAwpyw9Jp/ny0YhAJJftL5Wma9M1W 6WDNaasItrs6LjMqyTuaYA+B1mU7LjG0fuYjryNHu/RvDqDWWNVnISAOY9UbzE0PEeW7 1UT+MfAPFYSQ8JSZjn6xQN3W7R+7N6RAmSEPNLw7v9nQnld4Yg1f734YYU4nBT7ret9e Ny4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=oF8UgiDZ; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a18si13612768wrd.548.2018.01.10.17.31.18; Wed, 10 Jan 2018 17:31:18 -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=@googlemail.com header.s=20161025 header.b=oF8UgiDZ; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB878689B35; Thu, 11 Jan 2018 03:31:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 770DF689AE6 for ; Thu, 11 Jan 2018 03:31:09 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id t8so2364531wmc.3 for ; Wed, 10 Jan 2018 17:31:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=I9YVtKMlOGZSui2Bye9diLI13bWpZj0P59/3HWOK3eU=; b=oF8UgiDZrewQQKEnbmws19XPo4j6MriLZ6vOcL0VxDfM7Hs3imHKlHB1nID+drmY0j bCY5B448I6V9SToFHIt8ZbiW27ITFemKoRGYajZzjA3niHGtQWRhA0+orFLLVb/gegNQ SKMz0MMf/DR1m8KfSmaqgh5MTKR66gpOx4bYwczpKGFY7oPESPhH//43WbNgOLstKgJ3 smSf4SnAztqeqTPnXPGKU9FuGR20TusWWbZDuUeJ0LBhbQ/TvgpgJP8JPnqqBKjzMAY/ mym8gBkK/9R9RMovruqf4wSPVkcaC8cRARLwsZ2AOSEfQaC86LfzTFXV+Cd+W+rBPn5+ BGjw== 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=I9YVtKMlOGZSui2Bye9diLI13bWpZj0P59/3HWOK3eU=; b=e+KnB0KhDloUPLXDz+1ZRjBUqifeOWWj8mTICH1dlBt8k3gpKRpEOCWyVrpm8ObZNZ ct1CxbH6TKCo4UFtHV/Vm1M2mL1670Uwwpynv0beZVhyk1lUCpdUZrXtvjapx+OXWkg4 SIzN4/kRgxpBL2f/CUti85lfy0o066qeaGihj1ysWcZ5Nsk/L34gQdhsmv0KAlnNRc3Z U9IVkcUrDEebN2F4jrGyFEcgDAZz4+mnWVtotA+BdsBW4QLbalff9Bkx82tAUd631I03 yIfqTYnHXb3XAl8KphNVUPleIz16zYDcUZi+tIJ0XxOKU2fonJnxkKA7CQI+vudtZ2AS QjlA== X-Gm-Message-State: AKGB3mKL3wpDRU90t9lveAOJ/GnC6OWdbWfUisLFZwlCCWSZnqcqdQb5 yXng7kMR0SwITQ6F0czH90oeBg== X-Received: by 10.28.62.20 with SMTP id l20mr17224538wma.153.1515634270386; Wed, 10 Jan 2018 17:31:10 -0800 (PST) Received: from debian.speedport.ip (p4FDB50A5.dip0.t-ipconnect.de. [79.219.80.165]) by smtp.googlemail.com with ESMTPSA id i71sm21242614wmd.1.2018.01.10.17.31.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jan 2018 17:31:09 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Jan 2018 02:31:14 +0100 Message-Id: <20180111013114.17648-1-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.15.1 Subject: [FFmpeg-devel] [PATCH] http: cosmetics: reformat reconnect check for better readability 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: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The condition was a bit too long, and most editors will break the line and turn it into an unreadable mess. Move out some of the conditions. This should not change the behavior. --- libavformat/http.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index 4806b1e59b..f1208fb123 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1448,12 +1448,18 @@ static int http_read_stream(URLContext *h, uint8_t *buf, int size) return http_buf_read_compressed(h, buf, size); #endif /* CONFIG_ZLIB */ read_ret = http_buf_read(h, buf, size); - while ((read_ret < 0 && s->reconnect && (!h->is_streamed || s->reconnect_streamed) && s->filesize > 0 && s->off < s->filesize) - || (read_ret == AVERROR_EOF && s->reconnect_at_eof && (!h->is_streamed || s->reconnect_streamed))) { + while (read_ret < 0) { uint64_t target = h->is_streamed ? 0 : s->off; if (read_ret == AVERROR_EXIT) - return read_ret; + break; + + if (h->is_streamed && !s->reconnect_streamed) + break; + + if (!(s->reconnect && s->filesize > 0 && s->off < s->filesize) && + !(s->reconnect_at_eof && read_ret == AVERROR_EOF)) + break; if (reconnect_delay > s->reconnect_delay_max) return AVERROR(EIO);