From patchwork Tue Sep 24 03:18:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 15244 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A16C64493B7 for ; Tue, 24 Sep 2019 06:19:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8008B688254; Tue, 24 Sep 2019 06:19:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgeu2.qq.com (smtpbgeu2.qq.com [18.194.254.142]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6C33680644 for ; Tue, 24 Sep 2019 06:19:08 +0300 (EEST) X-QQ-mid: bizesmtp24t1569295142thellvv2 Received: from localhost (unknown [49.7.58.242]) by esmtp10.qq.com (ESMTP) with id ; Tue, 24 Sep 2019 11:19:01 +0800 (CST) X-QQ-SSF: 01100000002000K0ZQF0000A0000000 X-QQ-FEAT: /1CLMmLuNyl0DfV1fvQkapueOmTNBlpn+AROA1ImHVi1LazGLeMsjr/XshJbI FIFRNPtLbMZxFxApY+Qk7Hs8jxGkTGF38lnQ8AkcoTU9Fq7dYiCbLcqjQlEqWfsTpqKy4Tp BID+dEXZFC0AHBEftjGQIDMc28iNl/kQSD2xe2SXWVFgOTp+IjQ+yCa30lCBqXMiOcMZl7R Sk9YnqfYomlFbw8WnLfN2ScBZIpUdJtRW+G/79Gn3lpFr6dgewF5CmTH3djoUcCT9oyQIoD 5QRQz86OwO6kJWW+2ILT7aqa2f1q0AHBbQ7FwG1+Ag2VyagKjDosZSB4Q= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Sep 2019 11:18:59 +0800 Message-Id: <20190924031859.15781-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.17.2 (Apple Git-113) X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign1 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v2] avformat/hls: support data protocol in uri for EXT-X-MAP X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- libavformat/file.c | 4 ++-- libavformat/hls.c | 13 ++++++++++++- libavformat/http.c | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) 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..891fe4e243 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); @@ -623,6 +627,9 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, if (av_strstart(url, "crypto", NULL)) { if (url[6] == '+' || url[6] == ':') proto_name = avio_find_protocol_name(url + 7); + } else if (av_strstart(url, "data", NULL)) { + if (url[4] == '+' || url[4] == ':') + proto_name = avio_find_protocol_name(url + 5); } if (!proto_name) @@ -642,6 +649,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 +658,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 */