diff mbox series

[FFmpeg-devel,1/2] libavformat/hlsenc: Enable HTTP persistent connections for hls_delete_file

Message ID DB9P191MB1482CEFAE5DB97B18E87F805FE139@DB9P191MB1482.EURP191.PROD.OUTLOOK.COM
State New
Headers show
Series [FFmpeg-devel,1/2] libavformat/hlsenc: Enable HTTP persistent connections for hls_delete_file | expand

Checks

Context Check Description
yinshiyou/configure_loongarch64 warning Failed to apply patch
andriy/configure_x86 warning Failed to apply patch

Commit Message

Basel Sayeh Nov. 28, 2022, 5:43 p.m. UTC 
Signed-off-by: Basel Sayeh <basel.sayeh@hotmail.com>
---
  libavformat/hlsenc.c | 17 ++++++++++++-----
  1 file changed, 12 insertions(+), 5 deletions(-)

                 path, strerror(errno));
@@ -662,7 +668,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 +685,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 +2713,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);
diff mbox series

Patch

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index a86fc8907f..e4749aad87 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;
@@ -569,15 +570,20 @@  static int hls_delete_file(HLSContext *hls, 
AVFormatContext *avf,
  {
      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
+        avio_flush(hls->http_delete);
+        hlsenc_io_close(avf, &hls->http_delete, path);
+        if (!hls->http_persistent)
+            ff_format_io_close(avf, &hls->http_delete);
      } else if (unlink(path) < 0) {
          av_log(hls, AV_LOG_ERROR, "failed to delete old segment %s: %s\n",