From patchwork Mon Aug 1 00:51:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp2453732vsd; Sun, 31 Jul 2016 17:55:59 -0700 (PDT) X-Received: by 10.194.104.106 with SMTP id gd10mr15703375wjb.55.1470012959846; Sun, 31 Jul 2016 17:55:59 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id yf9si29051691wjb.249.2016.07.31.17.55.59; Sun, 31 Jul 2016 17:55:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22305689C4E; Mon, 1 Aug 2016 03:55:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0632D689C23 for ; Mon, 1 Aug 2016 03:54:46 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1bU1VL-0005R3-7d for ffmpeg-devel@ffmpeg.org; Mon, 01 Aug 2016 02:54:51 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Rcuq1t0080S5wYM01cur3p; Mon, 01 Aug 2016 02:54:51 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Aug 2016 02:51:57 +0200 Message-Id: <1470012717-17764-2-git-send-email-michael@niedermayer.cc> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1470012717-17764-1-git-send-email-michael@niedermayer.cc> References: <1470012717-17764-1-git-send-email-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/teeproto: Support parsing protocol options 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavformat/Makefile | 2 +- libavformat/teeproto.c | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 783b96a..ac0c2ca 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -568,7 +568,7 @@ OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o OBJS-$(CONFIG_SCTP_PROTOCOL) += sctp.o OBJS-$(CONFIG_SRTP_PROTOCOL) += srtpproto.o srtp.o OBJS-$(CONFIG_SUBFILE_PROTOCOL) += subfile.o -OBJS-$(CONFIG_TEE_PROTOCOL) += teeproto.o +OBJS-$(CONFIG_TEE_PROTOCOL) += teeproto.o tee_common.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o OBJS-$(CONFIG_TLS_GNUTLS_PROTOCOL) += tls_gnutls.o tls.o OBJS-$(CONFIG_TLS_OPENSSL_PROTOCOL) += tls_openssl.o tls.o diff --git a/libavformat/teeproto.c b/libavformat/teeproto.c index 12d5423..e22fba2 100644 --- a/libavformat/teeproto.c +++ b/libavformat/teeproto.c @@ -23,6 +23,7 @@ #include "libavutil/opt.h" #include "avformat.h" #include "avio_internal.h" +#include "tee_common.h" typedef struct ChildContext { URLContext *url_context; @@ -89,9 +90,11 @@ static int tee_open(URLContext *h, const char *filename, int flags) return AVERROR(ENOSYS); while (*filename) { - char *child_name = av_get_token(&filename, child_delim); + char *child_string = av_get_token(&filename, child_delim); + char *child_name = NULL; void *tmp; - if (!child_name) { + AVDictionary *options = NULL; + if (!child_string) { ret = AVERROR(ENOMEM); goto fail; } @@ -99,16 +102,22 @@ static int tee_open(URLContext *h, const char *filename, int flags) tmp = av_realloc_array(c->child, c->child_count + 1, sizeof(*c->child)); if (!tmp) { ret = AVERROR(ENOMEM); - goto fail; + goto loop_fail; } c->child = tmp; memset(&c->child[c->child_count], 0, sizeof(c->child[c->child_count])); + ret = ff_tee_parse_slave_options(h, child_string, &options, &child_name); + if (ret < 0) + goto loop_fail; + ret = ffurl_open_whitelist(&c->child[c->child_count].url_context, child_name, flags, - &h->interrupt_callback, /*AVDictionary **options*/NULL, + &h->interrupt_callback, &options, h->protocol_whitelist, h->protocol_blacklist, h); - av_free(child_name); +loop_fail: + av_freep(&child_string); + av_dict_free(&options); if (ret < 0) goto fail; c->child_count++;