Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Gnattu OC <gnattuoc@me.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH] avformat/hls: Add option to retry failed segments for hls
Date: Mon, 10 Oct 2022 18:47:48 +0800
Message-ID: <268e50a2-e64c-91a3-aa05-fed1ff801624@me.com> (raw)

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 <gnattuoc@me.com>
---
  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}
  };
  -- 2.37.0 (Apple Git-136)

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

             reply	other threads:[~2022-10-10 10:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-10 10:47 Gnattu OC [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-10-10 10:23 gnattu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=268e50a2-e64c-91a3-aa05-fed1ff801624@me.com \
    --to=gnattuoc@me.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git