From patchwork Tue Apr 18 16:00:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amine KABAB X-Patchwork-Id: 3445 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp1785066vsd; Tue, 18 Apr 2017 09:08:59 -0700 (PDT) X-Received: by 10.223.151.80 with SMTP id r74mr23667882wrb.6.1492531739388; Tue, 18 Apr 2017 09:08:59 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o22si6745242wra.77.2017.04.18.09.08.58; Tue, 18 Apr 2017 09:08:59 -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=@gmail.com; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C448A68922F; Tue, 18 Apr 2017 19:08:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EAD36891F9 for ; Tue, 18 Apr 2017 19:08:41 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id l28so25467306wre.0 for ; Tue, 18 Apr 2017 09:08:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version; bh=NF7AIdAgV6yiURuKKOhcI9xC509MzMDkLmylNkLP+10=; b=kZzHqAX+SyPY5YXmRPdgXQv7vdxhNXEM5orb4Fr5/36E0vmlRA0J6st7YqTW40cE// RL5/QZrBiaO8gbhNL2IIw8VSx549IxF+0r5V6JcupILrbrYgRZ16qHSGbn6M8HYcl8vl MoSqfcucbEix1qzjNtde9QX9MWrV8qZdDlTTBo3S0LXkYwq40aVetvPGZ/mX3wxsw45h tXd1e5rGTKrIQ4/2YvCKHLR86Hmt5BYoDOll29tdiW5l7n2XSlmsBFCJis+vQ4eCE0yQ sJdOTDmDe/Jk38g916LYbUrdDkgFCCkM7K7UgMLHOmdCK+Pe5ac/Q80/vnSLZ2DgLp5w IZSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version; bh=NF7AIdAgV6yiURuKKOhcI9xC509MzMDkLmylNkLP+10=; b=SKcLTLGsUOfUz2hFCd9C2DXZV7zumA7tI4Jxj6Z+yuQvJQKDI4E4HhE+rtXD8ZDYLa y2bmp1qYF94vy/QMiReA3NZC0bDezSUsJRF5aV+ytr9e0XNwlKR/u+3GaFSCWa08Cag8 4rVL/xtYSkk/qPbcQkYwh23DZOTAJmFATivcbzrjEQ9HBG0Pl2XSVbw4QP2pzRoOTB4t QzAO0HdiZQDLCQkOP3Saz5LrbGEEYSAg8gLUb7nClGmg6d2E9/8eYad4skDKflZlJpZA EVitpsg1Mi2ZSvMREz+fLhlHofk7lesag3rDMdW9u/9NRdJ3H3f5n1hCpREEruzsnvvb 0ZEQ== X-Gm-Message-State: AN3rC/4aQmWSfDNF+ywgzFkTpvfkEJNTQ7R1Rcty3nC8helr7BjHSHAn s/9SWQgBLc8GTJme87I= X-Received: by 10.223.147.98 with SMTP id 89mr22500035wro.21.1492531240239; Tue, 18 Apr 2017 09:00:40 -0700 (PDT) Received: from MacBook-Pro-de-Amine.local (adsl-244-111-192-81.adsl.iam.net.ma. [81.192.111.244]) by smtp.gmail.com with ESMTPSA id w76sm19297611wrb.49.2017.04.18.09.00.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Apr 2017 09:00:39 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Amine kabab Message-ID: Date: Tue, 18 Apr 2017 17:00:38 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] HLS, add option to skip down streams 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" option to skip down streams in HLS From 14eb94c48fddf92d63d7d7030689a625a4228740 Mon Sep 17 00:00:00 2001 From: amine kabab Date: Tue, 18 Apr 2017 15:12:38 +0000 Subject: [PATCH] HLS, add option to skip down streams --- libavformat/hls.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index bac53a4..d962956 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -194,6 +194,7 @@ typedef struct HLSContext { int cur_seq_no; int live_start_index; + int skip_down_streams; int first_packet; int64_t first_timestamp; int64_t cur_timestamp; @@ -1652,11 +1653,20 @@ static int hls_read_header(AVFormatContext *s) /* If the playlist only contained playlists (Master Playlist), * parse each individual playlist. */ if (c->n_playlists > 1 || c->playlists[0]->n_segments == 0) { + int all_failed = 1; for (i = 0; i < c->n_playlists; i++) { struct playlist *pls = c->playlists[i]; - if ((ret = parse_playlist(c, pls->url, pls, NULL)) < 0) + av_log(NULL, AV_LOG_WARNING, "Trying %s\n", pls->url); + ret = parse_playlist(c, pls->url, pls, NULL); + if (c->skip_down_streams && ret < 0) { + all_failed = 0; + } else if(ret < 0) { goto fail; + } } + + if (all_failed) + goto fail; } if (c->variants[0]->playlists[0]->n_segments == 0) { @@ -2126,6 +2136,8 @@ static int hls_probe(AVProbeData *p) static const AVOption hls_options[] = { {"live_start_index", "segment index to start live streams at (negative values are from the end)", OFFSET(live_start_index), AV_OPT_TYPE_INT, {.i64 = -3}, INT_MIN, INT_MAX, FLAGS}, + {"skip_down_streams", "continue playback of HLS when one of the variant streams are down", + OFFSET(skip_down_streams), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, FLAGS}, {NULL} };