[FFmpeg-devel] avformat/hls: support data protocol in uri for EXT-X-MAP

Submitted by Steven Liu on Sept. 24, 2019, 3:08 a.m.

Details

Message ID 20190924030834.15149-1-lq@chinaffmpeg.org
State New
Headers show

Commit Message

Steven Liu Sept. 24, 2019, 3:08 a.m.
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
---
 libavformat/file.c |  4 ++--
 libavformat/hls.c  | 12 ++++++++++--
 libavformat/http.c |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

Patch hide | download patch | download mbox

diff --git a/libavformat/file.c b/libavformat/file.c
index 08c7f8e6dd..8303436be0 100644
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -369,7 +369,7 @@  const URLProtocol ff_file_protocol = {
     .url_open_dir        = file_open_dir,
     .url_read_dir        = file_read_dir,
     .url_close_dir       = file_close_dir,
-    .default_whitelist   = "file,crypto"
+    .default_whitelist   = "file,crypto,data"
 };
 
 #endif /* CONFIG_FILE_PROTOCOL */
@@ -408,7 +408,7 @@  const URLProtocol ff_pipe_protocol = {
     .url_check           = file_check,
     .priv_data_size      = sizeof(FileContext),
     .priv_data_class     = &pipe_class,
-    .default_whitelist   = "crypto"
+    .default_whitelist   = "crypto,data"
 };
 
 #endif /* CONFIG_PIPE_PROTOCOL */
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 0611ddc6bb..27a802bbaf 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -409,7 +409,11 @@  static struct segment *new_init_section(struct playlist *pls,
     if (!sec)
         return NULL;
 
-    ff_make_absolute_url(tmp_str, sizeof(tmp_str), url_base, info->uri);
+    if (!av_strncasecmp(info->uri, "data:", 5)) {
+        strncpy(tmp_str, info->uri, strlen(info->uri));
+    } else {
+        ff_make_absolute_url(tmp_str, sizeof(tmp_str), url_base, info->uri);
+    }
     sec->url = av_strdup(tmp_str);
     if (!sec->url) {
         av_free(sec);
@@ -620,7 +624,7 @@  static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,
     int ret;
     int is_http = 0;
 
-    if (av_strstart(url, "crypto", NULL)) {
+    if (av_strstart(url, "crypto", NULL) || av_strstart(url, "data", NULL)) {
         if (url[6] == '+' || url[6] == ':')
             proto_name = avio_find_protocol_name(url + 7);
     }
@@ -642,6 +646,8 @@  static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,
         }
     } else if (av_strstart(proto_name, "http", NULL)) {
         is_http = 1;
+    } else if (av_strstart(proto_name, "data", NULL)) {
+        ;
     } else
         return AVERROR_INVALIDDATA;
 
@@ -649,6 +655,8 @@  static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,
         ;
     else if (av_strstart(url, "crypto", NULL) && !strncmp(proto_name, url + 7, strlen(proto_name)) && url[7 + strlen(proto_name)] == ':')
         ;
+    else if (av_strstart(url, "data", NULL) && !strncmp(proto_name, url + 5, strlen(proto_name)) && url[5 + strlen(proto_name)] == ':')
+        ;
     else if (strcmp(proto_name, "file") || !strncmp(url, "file,", 5))
         return AVERROR_INVALIDDATA;
 
diff --git a/libavformat/http.c b/libavformat/http.c
index 71dd6c2b1f..e87818aa30 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -1785,7 +1785,7 @@  const URLProtocol ff_http_protocol = {
     .priv_data_size      = sizeof(HTTPContext),
     .priv_data_class     = &http_context_class,
     .flags               = URL_PROTOCOL_FLAG_NETWORK,
-    .default_whitelist   = "http,https,tls,rtp,tcp,udp,crypto,httpproxy"
+    .default_whitelist   = "http,https,tls,rtp,tcp,udp,crypto,httpproxy,data"
 };
 #endif /* CONFIG_HTTP_PROTOCOL */