Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH 2/2] libavformat/dashenc: Enable HTTP persistent connections for dashenc_delete_file
@ 2022-11-28 17:44 Basel Sayeh
  0 siblings, 0 replies; 2+ messages in thread
From: Basel Sayeh @ 2022-11-28 17:44 UTC (permalink / raw)
  To: ffmpeg-devel

Signed-off-by: Basel Sayeh <basel.sayeh@hotmail.com>
---
  libavformat/dashenc.c | 14 ++++++++++----
  1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 9c1bcad9e3..ba0eb913a1 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -179,6 +179,7 @@ typedef struct DASHContext {
      int master_playlist_created;
      AVIOContext *mpd_out;
      AVIOContext *m3u8_out;
+    AVIOContext *http_delete;
      int streaming;
      int64_t timeout;
      int index_correction;
@@ -642,6 +643,7 @@ static void dash_free(AVFormatContext *s)
       ff_format_io_close(s, &c->mpd_out);
      ff_format_io_close(s, &c->m3u8_out);
+    ff_format_io_close(s, &c->http_delete);
  }
   static void output_segment_list(OutputStream *os, AVIOContext *out, 
AVFormatContext *s,
@@ -1855,18 +1857,22 @@ static void dashenc_delete_file(AVFormatContext 
*s, char *filename) {
      int http_base_proto = ff_is_http_proto(filename);
       if (http_base_proto) {
-        AVIOContext *out = NULL;
          AVDictionary *http_opts = NULL;
           set_http_options(&http_opts, c);
          av_dict_set(&http_opts, "method", "DELETE", 0);
  -        if (dashenc_io_open(s, &out, filename, &http_opts) < 0) {
+        if (dashenc_io_open(s, &c->http_delete, filename, &http_opts) < 
0) {
              av_log(s, AV_LOG_ERROR, "failed to delete %s\n", filename);
+        } else {
+            //Nothing to write
+            avio_flush(c->http_delete);
+            dashenc_io_close(s, &c->http_delete, filename);
          }
-
          av_dict_free(&http_opts);
-        ff_format_io_close(s, &out);
+
+        if (!c->http_persistent)
+            ff_format_io_close(s, &c->http_delete);
      } else {
          int res = ffurl_delete(filename);
          if (res < 0) {
-- 
2.30.2

_______________________________________________
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".

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [FFmpeg-devel] [PATCH 2/2] libavformat/dashenc: Enable HTTP persistent connections for dashenc_delete_file
       [not found] <20221128180139.73103-1-basel.sayeh@hotmail.com>
@ 2022-11-28 18:01 ` Basel Sayeh
  0 siblings, 0 replies; 2+ messages in thread
From: Basel Sayeh @ 2022-11-28 18:01 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Basel Sayeh

Signed-off-by: Basel Sayeh <basel.sayeh@hotmail.com>
---
 libavformat/dashenc.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 9c1bcad9e3..ba0eb913a1 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -179,6 +179,7 @@ typedef struct DASHContext {
     int master_playlist_created;
     AVIOContext *mpd_out;
     AVIOContext *m3u8_out;
+    AVIOContext *http_delete;
     int streaming;
     int64_t timeout;
     int index_correction;
@@ -642,6 +643,7 @@ static void dash_free(AVFormatContext *s)
 
     ff_format_io_close(s, &c->mpd_out);
     ff_format_io_close(s, &c->m3u8_out);
+    ff_format_io_close(s, &c->http_delete);
 }
 
 static void output_segment_list(OutputStream *os, AVIOContext *out, AVFormatContext *s,
@@ -1855,18 +1857,22 @@ static void dashenc_delete_file(AVFormatContext *s, char *filename) {
     int http_base_proto = ff_is_http_proto(filename);
 
     if (http_base_proto) {
-        AVIOContext *out = NULL;
         AVDictionary *http_opts = NULL;
 
         set_http_options(&http_opts, c);
         av_dict_set(&http_opts, "method", "DELETE", 0);
 
-        if (dashenc_io_open(s, &out, filename, &http_opts) < 0) {
+        if (dashenc_io_open(s, &c->http_delete, filename, &http_opts) < 0) {
             av_log(s, AV_LOG_ERROR, "failed to delete %s\n", filename);
+        } else {
+            //Nothing to write
+            avio_flush(c->http_delete);
+            dashenc_io_close(s, &c->http_delete, filename);
         }
-
         av_dict_free(&http_opts);
-        ff_format_io_close(s, &out);
+
+        if (!c->http_persistent)
+            ff_format_io_close(s, &c->http_delete);
     } else {
         int res = ffurl_delete(filename);
         if (res < 0) {
-- 
2.30.2

_______________________________________________
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".

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-11-28 18:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-28 17:44 [FFmpeg-devel] [PATCH 2/2] libavformat/dashenc: Enable HTTP persistent connections for dashenc_delete_file Basel Sayeh
     [not found] <20221128180139.73103-1-basel.sayeh@hotmail.com>
2022-11-28 18:01 ` Basel Sayeh

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