From patchwork Mon Oct 10 10:47:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gnattu X-Patchwork-Id: 38665 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp300282pzb; Mon, 10 Oct 2022 03:57:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7zUR5p1HV6dW+XBMf2rcWux459pL40DHgLImr19XDVFZ3Dd3P+gGgD2GYa/HXs05nvkaBV X-Received: by 2002:a17:907:b05:b0:78d:9bc9:b96f with SMTP id h5-20020a1709070b0500b0078d9bc9b96fmr7690450ejl.468.1665399442943; Mon, 10 Oct 2022 03:57:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665399442; cv=none; d=google.com; s=arc-20160816; b=rsDEFLqAtBsxXAwrAxZ3PTO0DoCqV3s6pVmKDTF6LB13Aby+m6qNG8VhlMepFPbI2Z SRLEOUhlXw1OdHNozfjA3kmaCy0k8HHgr0enfMmbtBPNu2z8Qk7ABCS7YKLl9cPNZaRT F2AZnpYXitcJfkwZwUAmVjtr4NX88OjqYnTMLDjcbOEbqRb8lraunu7CVNBeKez63VAK 2cwe6wbXDimRmUYdcwpC3wWpudFdv+RY0t5Vz49lb/0FeCEbi9dCmOi6ZKWdtF8qT7Xq C5qKdE8+2vLGz+FcThO72Fd/lzzmMGxclZK2y2QSseAqYufT20xC9Dcm8p/QS/i3xaCA e3sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=CEo5Ppvd68TUxVBtqnYHXTUDGCsLEqt1HHJuwGBMAYY=; b=jx79H5a3ooSqWP+hHz2d/w0VPLYy62RKWGozBOAl3KtceRNOOsNW/QY5cArouppxyL zqpBYCplngNZ6k/14gklsqRZahVLldsyOt1bM3t1OnNh6xjgDH7v37QIn5evRjgCqXph ZoddX3fBOa5Zg8Av2zKVxijPlsmdXwdswT6Txl5PbBpPK0T35tKLI4hsRq4MoCEbgyAN SOhjm1PUXMuid4RgE1wodrL5JtknkQcyDDeeS4pjkTGu/7KvbFC4kJr4bwfWqLiQMtJL UEyKnsJZ23nOguP86LUYTgK7jk7mIgaWC6/rmNXdFtOmpGRG4GqjwERRyCDx3ZkZL6NM cg1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@me.com header.s=1a1hai header.b=Lu2B8Zng; 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 oz8-20020a1709077d8800b0077e156d8e07si11012451ejc.828.2022.10.10.03.57.22; Mon, 10 Oct 2022 03:57:22 -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=Lu2B8Zng; 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 149F868BCFE; Mon, 10 Oct 2022 13:57:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qs51p00im-qukt01071902.me.com (qs51p00im-qukt01071902.me.com [17.57.155.9]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D71DC680AF6 for ; Mon, 10 Oct 2022 13:57:13 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1665398872; bh=YPco5Xu9jAGgjJgCzH8B/RmM+xv2oTS4OvrdJ/sYifI=; h=Message-ID:Date:MIME-Version:From:Subject:To:Content-Type; b=Lu2B8ZnggWpN3q9GGs6Z/tSIccKcuvru/6by6gb7Du7zp+DSAO9nJKKKW/k70l7KO DuPJ0IHEmcboMtIOiYHt7327/JrMG2i2tZaTaxCT8R07UqXm3XasW6IA/wHmQ3O3qA ZvVnU7r0ddJXlM+vHYTuvnJAB+gzFS4u0hXUfQYKdWrSFV6u0xO3rboveW+5mBMrxs 30SR3yY/4pZ9UazX6siJ2iqBjHmtSVx6Ik9ognhxxcvFweeJHpFyoqgnWFqsB2+BM1 oUzqvYMkcI4xwBAYtkf6jNQUlJ7vaQIlXnJBkVE+OaXYqsTaw2t4e8/G3+gBG6FMaW tqswhtz7g6sFA== Received: from [10.154.215.115] (qs51p00im-dlb-asmtp-mailmevip.me.com [17.57.155.28]) by qs51p00im-qukt01071902.me.com (Postfix) with ESMTPSA id BAA9B5EC0332 for ; Mon, 10 Oct 2022 10:47:51 +0000 (UTC) Message-ID: <268e50a2-e64c-91a3-aa05-fed1ff801624@me.com> Date: Mon, 10 Oct 2022 18:47:48 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.3.2 From: Gnattu OC To: ffmpeg-devel@ffmpeg.org Content-Language: en-US X-Proofpoint-GUID: Q-s89OIC30Wbe6kWUg53j-dVOLKP0ew3 X-Proofpoint-ORIG-GUID: Q-s89OIC30Wbe6kWUg53j-dVOLKP0ew3 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?=2E790=2C17=2E0=2E605=2E474=2E0000000_definitions=3D2022-01-12=5F?= =?utf-8?q?02=3A2020-02-14=5F02=2C2022-01-12=5F02=2C2020-01-23=5F02_signatur?= =?utf-8?q?es=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 adultscore=0 phishscore=0 suspectscore=0 mlxscore=0 clxscore=1015 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210100065 Subject: [FFmpeg-devel] [PATCH] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: w1I9RpPd66iv 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 --- libavformat/hls.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) } @@ -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} }; -- 2.37.0 (Apple Git-136) 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;