From patchwork Fri Nov 26 12:48:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31750 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp2166652iob; Fri, 26 Nov 2021 04:48:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJwOCoQDOS9xqcZ+L5ZvDLvDyxoRHbOk/SRI1oQHdcuTTyy0+Y/znF2uFdEC6T09pbhhZ6vA X-Received: by 2002:a05:6402:270d:: with SMTP id y13mr47132755edd.362.1637930935669; Fri, 26 Nov 2021 04:48:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637930935; cv=none; d=google.com; s=arc-20160816; b=T8lidWop9wLVe3ynRnbiNYVfyUFFGx7fOeXiY85JE2iAaa82wGIOJOCsEE9VtcUvPE GuLI0za9cq/jMh6lc3uhxuAC7tnT6WIWrs9AyvoCneqaUxwUKnx5zS5Zf5dfgsqGDupP MlJzIFOYUP9w2kAfcgevWg8WR64AmR46V3p22p/+4kkmqgS3SntWagMLgcnraBGHOuX/ HtU9uGTRKTiakFrgaaBw7gxBJfe2EZQr5olcyIWeRBkWiLWnd/G6UJXXi/SjHi7L3HoW H5VGe5P6ul/6EgiCtCLHSG5K6At90EO+sC+uxNeD9TrhDubZpjlD9mY7G01lYjwaMor+ YEsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=/HKMQZRGdI6mZKFxJWjsZxEM49hvkoKILBiMsLDrRms=; b=pXd0/jK0bfCmAZaz71rEsicEjOCFN/Bx0ECpBxw9ZtdXDlyduf/AyTm0r2KDFbDW6x R5IDzhA0sC6BXmh0G+zkECZnDwWs87yueh4wmdieoVdH2PEqD5haqKtUsie0urPrI3Lg f1IjjMmeP+4CeQBynwoKp53rD8Nf9unClL+PBfVrhVVrJ0CZueLr8jJQbAtVbm2dkAE3 Z3Ypsy7tujNYeiy5LBgGx3zmqRpw2629FLvAXYlvaqYBwwddY8R09eI3iBazW3P830Hf Roady61Wy9Ic3zmEue8QYeL1mpU5trkCs0cXrU9Xd+RaJTN7MsRQyD5yIX8Lzs9++Ur3 w00A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EzUDJ60x; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i22si11729918edj.479.2021.11.26.04.48.55; Fri, 26 Nov 2021 04:48:55 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EzUDJ60x; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20C5868AE57; Fri, 26 Nov 2021 14:48:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 127D268ADDB for ; Fri, 26 Nov 2021 14:48:45 +0200 (EET) Received: by mail-pf1-f176.google.com with SMTP id n26so8889032pff.3 for ; Fri, 26 Nov 2021 04:48:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TlqC8WiSkwHAOjFabnz4N+3akRHxgKDa7vHKPoFWC/Y=; b=EzUDJ60xyrOAYa+FcIUOT7UZ254xEnqborgo30HCXJ0EIYUhcjWg+eW1fNU1/ntBRY WPs82qk3Wi4C2YH3GG+x45PN7B/9XKrLsY56QJRyJFJsXkyesrgI6JF62IoRdFLYl9VF WbrcwxHwJ3Xd1Ycb2x6t/Y4aVG693/p502o+OaNEHd2SlY8sx+vUIvsNSirFSX2JnRJ+ /xRk8o+5mSWJdXuEsxlhrfUNwrfbEAR4w7qRRX3PsSEshb6SNIwE3eGYmAyJMnssndF8 S5U5UmE/28bnItNxs6iJJ0aobDe891Nh9cxYs8EHGK9LLZM6lZ54ODHo6GC+QA5N8rk0 KvXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TlqC8WiSkwHAOjFabnz4N+3akRHxgKDa7vHKPoFWC/Y=; b=6mnBO8Xm5iUlFoV3xDiJGdOoI26ZrRpNqGcg3buZaz5DTcU7z5bmtvnJ0yddSFKISd VATSP+jE1MSYQJB6NnfiqNXUCb0NQm1eLHCMTM2GMkUJlmSsbzAqaMywEUsNLP+YpN0Q 12/g+VkNqlrqTwOYwiqm+Qobkjxkjh2/HUFvQWaUwhqwDmSDxqG123BOD5vA//FmWuxj gScbeXFdsaR63II3VbXzxH1WEoZddKBS7y4bMYdE8ulhaT9OznAhdiMDfZZrLbgIocua C48dJ73Q6sg7DWM6U8t2vFaZjb5sBwLP8+vST5WgRi8cwlBsiLY0zCSb89bOc6VyppIQ ZMdw== X-Gm-Message-State: AOAM531U6dk0bzmN0QfRBb0VRko0u7NbdmtuBsQrnITSZf34Cvn80oPJ UWYyMJh1Pgy1yOF5BLgHtAjkTAnGvnw= X-Received: by 2002:a63:1016:: with SMTP id f22mr7039456pgl.566.1637930922851; Fri, 26 Nov 2021 04:48:42 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id z93sm5709068pjj.7.2021.11.26.04.48.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Nov 2021 04:48:42 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Nov 2021 20:48:17 +0800 Message-Id: <1637930897-29545-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1637592434-16132-1-git-send-email-lance.lmwang@gmail.com> References: <1637592434-16132-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3] avfilter/src_movie: add format_opts for the opened file X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vYr1V3Uu3bsB From: Limin Wang Signed-off-by: Limin Wang --- doc/filters.texi | 9 +++++++++ libavfilter/src_movie.c | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 3731a14..3b70aca 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -28395,6 +28395,15 @@ timestamps. @item dec_threads Specifies the number of threads for decoding + +@item format_opts +Specify format options for the opened file. Format options can be specified +as a list of @var{key}=@var{value} pairs separated by ':'. The following example +shows how to add protocol_whitelist and protocol_blacklist options: +@example +./ffplay -f lavfi +"movie=filename='1.sdp':format_opts='protocol_whitelist=file,rtp,udp\:protocol_blacklist=http'" +@end example @end table It allows overlaying a second video on top of the main input of diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 220a43c..b89a680 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -74,6 +74,7 @@ typedef struct MovieContext { int max_stream_index; /**< max stream # actually used for output */ MovieStream *st; /**< array of all streams, one per output */ int *out_index; /**< stream number -> output number map, or -1 */ + AVDictionary *format_opts; } MovieContext; #define OFFSET(x) offsetof(MovieContext, x) @@ -92,6 +93,7 @@ static const AVOption movie_options[]= { { "loop", "set loop count", OFFSET(loop_count), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, FLAGS }, { "discontinuity", "set discontinuity threshold", OFFSET(discontinuity_threshold), AV_OPT_TYPE_DURATION, {.i64 = 0}, 0, INT64_MAX, FLAGS }, { "dec_threads", "set the number of threads for decoding", OFFSET(dec_threads), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, FLAGS }, + { "format_opts", "set format options for the opened file", OFFSET(format_opts), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, FLAGS}, { NULL }, }; @@ -243,7 +245,7 @@ static av_cold int movie_common_init(AVFilterContext *ctx) iformat = movie->format_name ? av_find_input_format(movie->format_name) : NULL; movie->format_ctx = NULL; - if ((ret = avformat_open_input(&movie->format_ctx, movie->file_name, iformat, NULL)) < 0) { + if ((ret = avformat_open_input(&movie->format_ctx, movie->file_name, iformat, &movie->format_opts)) < 0) { av_log(ctx, AV_LOG_ERROR, "Failed to avformat_open_input '%s'\n", movie->file_name); return ret;