From patchwork Mon Oct 10 12:08:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gnattu OC X-Patchwork-Id: 38668 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp331915pzb; Mon, 10 Oct 2022 05:09:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7YsEuBdwrcFnLmRN0FdRKn6dT6YWWLcAQsTSpgd6nYvhlYl2tO1D+giMzV9JY8GO96m50d X-Received: by 2002:a05:6402:5485:b0:459:147a:d902 with SMTP id fg5-20020a056402548500b00459147ad902mr18174647edb.263.1665403742467; Mon, 10 Oct 2022 05:09:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665403742; cv=none; d=google.com; s=arc-20160816; b=QS13U8VOETzJVh6bOeTpl1txyidELwnXz55Tjxp7PSjC11C4Ap6hT8YDyB3mQk3QE/ yGL+R7b4PPi+wbrZ5eVLx8v18Ag2uJPe3nwP30NmcBdKgrAMDuqt3kPkLJstLVJv7jFg +Z/zkR3zbQ4EKlQYmiOX2KlyWr3bTKK3WuN9W2xAnsO5LKUxoSCaA6xX5l3u3aLyTCDM W9+shQ2OqmUsrJkMCOa5HlTKZ9y52RrnkzOxxB4NA9wBkGmAVreVXqBDbdUBfDxEi/XL cCCzz4KBcrOm3V9ezZVzquCiYI+r6nwIaz1JP0NjPmUjORYdbmt5z0tgcGqLnUEeNR7s sYXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=HqrpqyeE7A0j55xEuWSFTJFFuZ4hVNj1PB1ZM3cY/NI=; b=0V3CoZ5NLCtwnl++AZdeezSWshjaEoJMYSeVxzax3P7MqAT4F3AOAbo7RJzStxQ2uy E5u0W53VKoWYsFNlSq8SOFPJY08gRl8VfeIKoVrRqHiw/Ktp7gCiIRqYRQa5qsr8PuoU ezlYmEe9UA+RzwABTwXKpWmgrEgMMjM4BruLp5t2Yhhf94MBhj0u/yN+GAwU1luiUN8Y +i6WSzAdxdVlKwx/MSMfEHwcqUYmE68vvMWDZQ4WVKK92A5nvJZDT4VPlyIzQ1zkuuY8 JHJ4hXI21wbKdcPtGQvooMJrZhe5BByJRR/W31bHa+/28jOdjfYfdLQ/vsGiFnPQFfD0 1kGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@me.com header.s=1a1hai header.b=1Y1wD5Io; 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=me.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id rn10-20020a170906d92a00b00782b7157945si9952727ejb.377.2022.10.10.05.09.01; Mon, 10 Oct 2022 05:09:02 -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=@me.com header.s=1a1hai header.b=1Y1wD5Io; 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=me.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 40FA868BCDB; Mon, 10 Oct 2022 15:08:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ci74p00im-qukt09082102.me.com (ci74p00im-qukt09082102.me.com [17.57.156.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 503D368BC0E for ; Mon, 10 Oct 2022 15:08:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1665403730; bh=0Zl68yGg2DaTZq6OzeRiphSHSKt07y/tsMmbLiF25xQ=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=1Y1wD5IolXhNEMTcWm1PQ8wankmIWUOEvbKNc2OP0iWEFMljfzLXjiBmhut7zJw9j QZADss5rPNu0Z1TR0aMUE//Rsw6MnSMdkJ7tIzThb0qLbJXGUqLTgO27XGdW+4gRSW vCnJ+HP6E7PQd2HIej/fTv8vifccU9Ey8b0jJ6Q9bjk6hkSiIM/clrvy22kBzJTsDL 1hoScGkEDHqYNbj+sHRM7HYko24RBRn3++nYLl9ozT3j6wBarKfoXuixS1sFmeuq72 BajSzs7fAau04JyNwBA3g3w/3MkKGJdNEGhJtWsoBZ6qb+PvIb5GXANwezOcGCYUuT tG9mHOeo11PTw== Received: from localhost.localdomain (ci77p00im-dlb-asmtp-mailmevip.me.com [17.57.156.26]) by ci74p00im-qukt09082102.me.com (Postfix) with ESMTPSA id 1366019C026B; Mon, 10 Oct 2022 12:08:47 +0000 (UTC) From: gnattu To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 20:08:41 +0800 Message-Id: <20221010120841.72142-1-gnattuoc@me.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: BsmN8xp7MXrqUwB4IKbk8prPmvIv43t6 X-Proofpoint-GUID: BsmN8xp7MXrqUwB4IKbk8prPmvIv43t6 X-Proofpoint-Virus-Version: =?utf-8?q?vendor=3Dfsecure_engine=3D1=2E1=2E170-?= =?utf-8?q?22c6f66c430a71ce266a39bfe25bc2903e8d5c8f=3A6=2E0=2E138=2C18=2E0?= =?utf-8?q?=2E572=2C17=2E11=2E62=2E513=2E0000000_definitions=3D2020-02-14=5F?= =?utf-8?q?11=3A2020-02-14=5F02=2C2020-02-14=5F11=2C2021-12-02=5F01_signatur?= =?utf-8?q?es=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 clxscore=1015 mlxscore=0 suspectscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210100073 Subject: [FFmpeg-devel] [PATCH v3] avformat/hls: Add option to retry failed segments for hls 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 Cc: gnattu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /HdQUd8rLU4H Current HLS implementation simply skip a failed segment to catch up the stream, but this is not optimal for some use cases like livestream recording. Add an option to retry a failed segment to ensure the output file is a complete stream. Signed-off-by: gnattu --- Fixed commit message wrap libavformat/hls.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index e622425e80..2b977f9132 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -225,6 +225,7 @@ typedef struct HLSContext { int http_persistent; int http_multiple; int http_seekable; + int seg_max_retry; AVIOContext *playlist_pb; HLSCryptoContext crypto_ctx; } HLSContext; @@ -1472,6 +1473,7 @@ static int read_data(void *opaque, uint8_t *buf, int buf_size) int ret; int just_opened = 0; int reload_count = 0; + int segment_retries = 0; struct segment *seg; restart: @@ -1563,9 +1565,18 @@ reload: av_log(v->parent, AV_LOG_WARNING, "Failed to open segment %"PRId64" of playlist %d\n", v->cur_seq_no, v->index); - v->cur_seq_no += 1; + if (segment_retries >= c->seg_max_retry) { + av_log(v->parent, AV_LOG_WARNING, "Segment %"PRId64" of playlist %d failed too many times, skipping\n", + v->cur_seq_no, + v->index); + v->cur_seq_no += 1; + segment_retries = 0; + } else { + segment_retries += 1; + } goto reload; } + segment_retries = 0; just_opened = 1; } @@ -2549,6 +2560,8 @@ static const AVOption hls_options[] = { OFFSET(http_seekable), AV_OPT_TYPE_BOOL, { .i64 = -1}, -1, 1, FLAGS}, {"seg_format_options", "Set options for segment demuxer", OFFSET(seg_format_opts), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, FLAGS}, + {"seg_max_retry", "Maximum number of times to reload a segment on error.", + OFFSET(seg_max_retry), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, FLAGS}, {NULL} };