aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/hlsenc.c
diff options
context:
space:
mode:
authorBasel Sayeh <basel.sayeh@hotmail.com>2023-01-07 03:15:40 +0300
committerSteven Liu <lq@chinaffmpeg.org>2023-01-13 14:01:02 +0800
commit77ad210fba745db0a151d0da5898c9056cb8bf97 (patch)
treeea262e01a766dbdd3bdf932952f09982344d6aec /libavformat/hlsenc.c
parent54c488223b8dd76d3f5b8019797af9fbe6c920e5 (diff)
downloadffmpeg-77ad210fba745db0a151d0da5898c9056cb8bf97.tar.gz
libavformat/hlsenc: Enable HTTP persistent connections for hls_delete_file
Removed the unnecessary calls to ff_format_io_close this patch introduced in hls_delete_file. hls_delete_file functions open a new HTTP connection regardless of the http_persistent value, So change their behaviour to keep http connections open if http_persistent is set Signed-off-by: Basel Sayeh <basel.sayeh@hotmail.com>
Diffstat (limited to 'libavformat/hlsenc.c')
-rw-r--r--libavformat/hlsenc.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index a86fc8907f..39df9becc7 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -252,6 +252,7 @@ typedef struct HLSContext {
int http_persistent;
AVIOContext *m3u8_out;
AVIOContext *sub_m3u8_out;
+ AVIOContext *http_delete;
int64_t timeout;
int ignore_io_errors;
char *headers;
@@ -565,19 +566,22 @@ static void reflush_dynbuf(VariantStream *vs, int *range_length)
#endif
static int hls_delete_file(HLSContext *hls, AVFormatContext *avf,
- const char *path, const char *proto)
+ char *path, const char *proto)
{
if (hls->method || (proto && !av_strcasecmp(proto, "http"))) {
AVDictionary *opt = NULL;
- AVIOContext *out = NULL;
int ret;
+
set_http_options(avf, &opt, hls);
av_dict_set(&opt, "method", "DELETE", 0);
- ret = avf->io_open(avf, &out, path, AVIO_FLAG_WRITE, &opt);
+
+ ret = hlsenc_io_open(avf, &hls->http_delete, path, &opt);
av_dict_free(&opt);
if (ret < 0)
return hls->ignore_io_errors ? 1 : ret;
- ff_format_io_close(avf, &out);
+
+ //Nothing to write
+ hlsenc_io_close(avf, &hls->http_delete, path);
} else if (unlink(path) < 0) {
av_log(hls, AV_LOG_ERROR, "failed to delete old segment %s: %s\n",
path, strerror(errno));
@@ -662,7 +666,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls,
}
proto = avio_find_protocol_name(s->url);
- if (ret = hls_delete_file(hls, vs->avf, path.str, proto))
+ if (ret = hls_delete_file(hls, s, path.str, proto))
goto fail;
if ((segment->sub_filename[0] != '\0')) {
@@ -679,7 +683,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls,
goto fail;
}
- if (ret = hls_delete_file(hls, vs->vtt_avf, path.str, proto))
+ if (ret = hls_delete_file(hls, s, path.str, proto))
goto fail;
}
av_bprint_clear(&path);
@@ -2707,6 +2711,7 @@ static void hls_deinit(AVFormatContext *s)
ff_format_io_close(s, &hls->m3u8_out);
ff_format_io_close(s, &hls->sub_m3u8_out);
+ ff_format_io_close(s, &hls->http_delete);
av_freep(&hls->key_basename);
av_freep(&hls->var_streams);
av_freep(&hls->cc_streams);