har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/hls: Add option to retry failed segments for hls

Browse Source 
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>
Reviewed-by: Steven Liu <liuqi05@kuaishou.com>
This commit is contained in:
gnattu 2022-10-20 20:11:38 +08:00 committed by Gyan Doshi
parent 7e1d474021
commit d09254a658
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/demuxers.texi
View File

@ -419,6 +419,10 @@ Use HTTP partial requests for downloading HTTP segments.
@item seg_format_options @item seg_format_options
Set options for the demuxer of media segments using a list of key=value pairs separated by @code{:}. Set options for the demuxer of media segments using a list of key=value pairs separated by @code{:}.
@item seg_max_retry
Maximum number of times to reload a segment on error, useful when segment skip on network error is not desired.
Default value is 0.
@end table @end table
@section image2 @section image2

15
libavformat/hls.c
View File

@ -225,6 +225,7 @@ typedef struct HLSContext {
int http_persistent; int http_persistent;
int http_multiple; int http_multiple;
int http_seekable; int http_seekable;
int seg_max_retry;
AVIOContext *playlist_pb; AVIOContext *playlist_pb;
HLSCryptoContext crypto_ctx; HLSCryptoContext crypto_ctx;
} HLSContext; } HLSContext;
@ -1472,6 +1473,7 @@ static int read_data(void *opaque, uint8_t *buf, int buf_size)
int ret; int ret;
int just_opened = 0; int just_opened = 0;
int reload_count = 0; int reload_count = 0;
int segment_retries = 0;
struct segment *seg; struct segment *seg;
restart: restart:
@ -1563,9 +1565,18 @@ reload:
av_log(v->parent, AV_LOG_WARNING, "Failed to open segment %"PRId64" of playlist %d\n", av_log(v->parent, AV_LOG_WARNING, "Failed to open segment %"PRId64" of playlist %d\n",
v->cur_seq_no, v->cur_seq_no,
v->index); 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++;
segment_retries = 0;
} else {
segment_retries++;
}
goto reload; goto reload;
} }
segment_retries = 0;
just_opened = 1; just_opened = 1;
} }
@ -2549,6 +2560,8 @@ static const AVOption hls_options[] = {
OFFSET(http_seekable), AV_OPT_TYPE_BOOL, { .i64 = -1}, -1, 1, FLAGS}, OFFSET(http_seekable), AV_OPT_TYPE_BOOL, { .i64 = -1}, -1, 1, FLAGS},
{"seg_format_options", "Set options for segment demuxer", {"seg_format_options", "Set options for segment demuxer",
OFFSET(seg_format_opts), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, FLAGS}, 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} {NULL}
}; };