From patchwork Thu Jan 4 16:07:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 7120 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp421945jaa; Thu, 4 Jan 2018 08:08:05 -0800 (PST) X-Google-Smtp-Source: ACJfBotSwrwURtoZ+w2xdX2ikmLvKR4Ms8MP8Nz4TD54hfm5SB5oNz4vyN7++8I4hLQfxTfo6lU5 X-Received: by 10.223.161.206 with SMTP id v14mr42343wrv.165.1515082085283; Thu, 04 Jan 2018 08:08:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515082085; cv=none; d=google.com; s=arc-20160816; b=f72hF2mpqBvTVfLJ1OKStgTsmnwrn/UaDWlIgp/lLwQT6iqSuMCCstzQNKeKI8gjWu fnPg3QnkeSQVcHoiOHWFPKhwY39iuNKgdkQvk3AHBLNYwzVKSoUgiWSh8PqgYPjHYN5g 6wlghmcLgv97IG4NGUF1peZsW1pbh0ZCZ9xTb+jEWHrwUy8wEUaA4l9mb6gu3XCBRCAM NBLU3P7Mop4304OztJh6FyZUoa8G15qRtTWfhJstbK+dwaweWf32GNmHjS9p+yj3QWJA Opz14yDj1szfe+KyIN6M3gNqo2Fm5bMyZPfpCwlEpRMaqfmhv54bSZIH6DVwPhGc4UyP orow== 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=ev2LyP3Fc+zQW20lNj5epEGHENfQrF9uON3zEIjxfrE=; b=bzuaPZ5HJmAFkq4/+CkLvEFsxllANjZlMitcxKBPbqR0TLkSn450IXqe3LFEJdjTY+ yC4QvCo/eNCYzTEWxABt5yKXnuMp5ev19NIChZiaN52/e4AFMB1NK/Hs4UibX32IfLnS 5XQodJzcBIad6kJvlVYMGZSce0ZVKd56S27W8DcD/adE9avqg3hFwtwZMF/Xz1xyRbBb SJJQyK0aNe5qN/JV5KVmc/ytpUzCuMhEZfKSIduGYTDQBw1jb5rgJ7I6S2XqN2EtgC6t +7YUYXgiXzEcBJkqnS8FCALk5Xz1sEEftxOt+U9Xtq9THLUOrkid40G81REjSPFxYLb4 FfPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=fhUkQ16o; 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 l25si3017299wrb.479.2018.01.04.08.07.59; Thu, 04 Jan 2018 08:08:05 -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=fhUkQ16o; 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 AA2D46808C8; Thu, 4 Jan 2018 18:07:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com [209.85.128.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE5096808C8 for ; Thu, 4 Jan 2018 18:07:35 +0200 (EET) Received: by mail-wr0-f174.google.com with SMTP id o15so1903408wrf.12 for ; Thu, 04 Jan 2018 08:07:52 -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=MvGxK9cawMuAN0+HaYe9OqdSz/D6qDkKfD63IIlPsRg=; b=fhUkQ16oDy6flyqlAydC1D4APXM4auilzxpmyah0IRm6ydppLcbxem+pED3Q6SGi2o aax4PI3XZHsZOzRH1T4tPavwKJzhFHcy/BAIMlBl2aMM2TR1sqUvWREM/GYV9ivi6YWc iAdH6Uzrb0MesOPX9igdnqiFV9oOdvqwlDjaxAtlyW3zKNLmoxLndnfbg58eQyTLaSCL QQxvcGf4Za+5TcQcCWJN/pfaUlH9W/Hy/sNbo7KuYufhPSOtlHx/yh6O+1ATI0WWo2eb 1JhLduOFIPCF8vDRE6hELFWwpuNYdfx3QOK3dJmFOcjAdRPDWsHzZ38rrFa4lPebHXF5 9Asg== 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=MvGxK9cawMuAN0+HaYe9OqdSz/D6qDkKfD63IIlPsRg=; b=rNqth/pNOgOa2hzfq5728y7QEhSQOYPTwTSBacfRkaJjXdbE+5kuKa9qTfwdoZGAGv pZin4In4CZgUyQxvyVb9vKv/aVOIiYcm+s5RL2zgT1bw0JmP49U+Db9BH2kllyFa61yR igsAz62WPt90ivw7cOcoSAs9WvDg0QuJw71j9H7YF0Go8rb/seFj/zhEiuc0AwoyX0ue FQD88WQzYxywF0fbpdbzGb+SiyNwBf+92SEJAuknaw+X4bRZL8EM2KPQkUZU2OnSKy49 cugFq3GjkmLfJHEt3QynAAEIlgw/VIVAbeKVi2DqKkICyFR6t+iCbiCIX8ROetV4PEgS QXeQ== X-Gm-Message-State: AKGB3mIzGR7YDmFa3SetK7PekJHKohk+FtuI2hteKZP1q2uKJLV6Nnhm IBBuVp8heRQH1O0PZ3sg76mgRw== X-Received: by 10.223.164.8 with SMTP id d8mr34492wra.245.1515082071931; Thu, 04 Jan 2018 08:07:51 -0800 (PST) Received: from debian.speedport.ip (p2003006CCD4EDC81ECF4F77632E0B6C2.dip0.t-ipconnect.de. [2003:6c:cd4e:dc81:ecf4:f776:32e0:b6c2]) by smtp.googlemail.com with ESMTPSA id z5sm3090196wre.94.2018.01.04.08.07.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jan 2018 08:07:51 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Jan 2018 17:07:51 +0100 Message-Id: <20180104160751.20071-1-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.15.1 Subject: [FFmpeg-devel] [PATCH] http: avoid logging reconnect warning if stream was aborted 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" If the stream was aborted using the libavformat interrupt callback, we don't want it to log the reconnect warning. (Exiting after logging this warning worked well, so this is only for avoiding the ugly warning.) --- I don't want to stick this as an additional condition into the 150 column while() condition, so it's a separate if. --- libavformat/http.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/http.c b/libavformat/http.c index eb029e33a0..4806b1e59b 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1452,6 +1452,9 @@ static int http_read_stream(URLContext *h, uint8_t *buf, int size) || (read_ret == AVERROR_EOF && s->reconnect_at_eof && (!h->is_streamed || s->reconnect_streamed))) { uint64_t target = h->is_streamed ? 0 : s->off; + if (read_ret == AVERROR_EXIT) + return read_ret; + if (reconnect_delay > s->reconnect_delay_max) return AVERROR(EIO);