From patchwork Fri Mar 30 05:08:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dixit, Vishwanath" X-Patchwork-Id: 8238 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp2483199jad; Thu, 29 Mar 2018 22:08:46 -0700 (PDT) X-Google-Smtp-Source: AIpwx48BNqiDKFxX/k+WuCzCD1QPy+LEGM4qOoF3V8eEWo9dnKRtgjsC4yAAP5yaorrO/3J/jG4W X-Received: by 10.28.69.133 with SMTP id l5mr1024297wmi.152.1522386526376; Thu, 29 Mar 2018 22:08:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522386526; cv=none; d=google.com; s=arc-20160816; b=x+jlzI3IH8wFlingflu2jl1116I9JtwAwNzVEDj0F+zvfMV5ujlkMF2QQqybtjmjYl wnS/mR6mkZK2b85WQq8pFk++kvRgK4utmvtIW5V6eD59DexZ0d7ml/C6XcgR+U5KfeP0 Eb7INsi7Kra0nE7Ivn/nrC26p1fyfpHtzic3CgdOkpPkg2ce20gJkmQKgZLVaPxcE/vX x11Um72I1MvjviN8f0WgeUOCWrZJ37gPcjEm0vyv5scgi1voCdJUWgRvzQbaPmNWzdez 3eu2Q2EfqUvoJeHMc7y5TR3cZcNQbweqep2lv5MFCaemx9m6+2CDkcIeqnznzwHyqW5X e6VA== 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:feedback-id:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=KJWyq+Zp0uUcoxFayCYYA9EKHW2pSAek52oIYwtlHDE=; b=0Xijf8eFnlzIzdjQKXx6KuSOlCbiVYt7HRhc7XJ0JxsMht+wGbTWaHxsB5SB0m5yZ+ e5nYVMdjG4vYVLleh4U3KVlJELHinA+526tt5PRa+6bPDX9rMMIMrE0DHGu1ch6pL++0 5xVDGz0ZfQUrLHOPESgCnGVVGOvA978xxZB6SY7Fb32zFdqIjvNUpLycOOERAE9Z04qa 2WoS59iNT9k9SDODYMVf5C5H99sFFWu06e1G6+TW3nzIYf9DKCIKnjN6/5QCUKbVnRPq pswNQoAhIR10a7DbHLxjiRKNG7YjGCJtVPF4ZbSF5SfRlyZQcC503OYUmbzRbQrjIzOW aA7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=SBlLerIi; 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=NONE dis=NONE) header.from=akamai.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 71si5499587wrm.65.2018.03.29.22.08.45; Thu, 29 Mar 2018 22:08:46 -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=@smtpservice.net header.s=m78bu0.a1-4.dyn header.b=SBlLerIi; 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=NONE dis=NONE) header.from=akamai.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 92AC5689F61; Fri, 30 Mar 2018 08:08:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from a2i831.smtp2go.com (a2i831.smtp2go.com [103.47.207.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A690D689C58 for ; Fri, 30 Mar 2018 08:08:23 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=m78bu0.a1-4.dyn; x=1522387422; h=Feedback-ID: X-Smtpcorp-Track:Message-Id:Date:Subject:To:From:Reply-To:Sender: List-Unsubscribe; bh=kb6DuNQbeUfRL7PhvQ5lDPQcdFnhGmUHyUXrgL/dn7M=; b=SBlLerIi +qh4UkVQYClzIuNJFOrR7msHuu90ci51SilFpJ4N1+2AMIcx5HQsKvTAp1mORZZjOKpq1hVSGH734 mBg+8mKaFaJZrBHvxu2RT45j8zO3DPN7IJdyrCHt87PX0c6io4Klg+Vs+oZzKR+QBLavzEfq33f2U HquSTgZCAiOuGc1bppmiwpJoap8mHWiqduVaxikVgNdjbcCJTMHzQrT0HVBwDZFeW4ubHn+rfcSNr 0jyoYvbeCA+ywlUkLb+bRI1HByWAKyxrKnX/772IJtbQvr8kSkjuPUcPZySV8MKZRH67j03MUa9wf 8a6lL9v4xN4eaomqVU07UQKpvg==; From: vdixit@akamai.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Mar 2018 10:38:34 +0530 Message-Id: <1522386514-16360-1-git-send-email-vdixit@akamai.com> X-Mailer: git-send-email 1.9.1 X-Smtpcorp-Track: 1f1XHH4baD0523.vYZWmea12 Feedback-ID: 337386m:337386asVRLGB:337386suDZID2L7S:SMTPCORP X-Report-Abuse: Please forward a copy of this message, including all headers, to Subject: [FFmpeg-devel] [PATCH 4/8] avformat/utils: function to check and ignore non fatal network errors 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: Vishwanath Dixit MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Vishwanath Dixit For live HLS/DASH output usecases, currently ffmpeg application exits for any network error during muxing. However, some of the errors like EPIPE, ECONNREFUSED and ECONNRESET are non-fatal. They might cause temporary disruption. However, muxer can recover and continue further processing. --- libavformat/internal.h | 11 +++++++++++ libavformat/utils.c | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/libavformat/internal.h b/libavformat/internal.h index a020b1b..e56f867 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -731,6 +731,17 @@ int ff_unlock_avformat(void); */ void ff_format_set_url(AVFormatContext *s, char *url); +/** + * Handle error. + * Ignores network errors EPIPE, ECONNREFUSED and ECONNRESET + * + * @param s AVFormatContext + * @param err error code + * @param ignore_nw_err flag to ignore network errors + * @return 0 if error is ignored, else err + */ +int av_handle_error(AVFormatContext *s, int err, int ignore_nw_err); + #if FF_API_NEXT /** * Register devices in deprecated format linked list. diff --git a/libavformat/utils.c b/libavformat/utils.c index f13c820..a942ad0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -5658,3 +5658,13 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif } + +int av_handle_error(AVFormatContext *s, int err, int ignore_nw_err) { + if (err && ff_is_http_proto(s->url) && ignore_nw_err && + (err == AVERROR(EPIPE) || err == AVERROR(ECONNREFUSED) || + err == AVERROR(ECONNRESET))) { + av_log(s, AV_LOG_WARNING, "Ignored network error %d\n", err); + return 0; + } + return err; +}