From patchwork Fri Mar 4 15:03:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 34609 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1689446nkx; Fri, 4 Mar 2022 07:12:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLPCNxNfcB62kAfhgXCr37hNfH4krEWi9gdkeph3TPzkNPW4Jw7BpIH0KKCA2CVJJV3Axv X-Received: by 2002:a05:6402:177b:b0:413:2822:1705 with SMTP id da27-20020a056402177b00b0041328221705mr39527153edb.270.1646406776521; Fri, 04 Mar 2022 07:12:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646406776; cv=none; d=google.com; s=arc-20160816; b=V8dpUaY23nkNh44i2HJgesbAYM9HyPfsdhUw/gKfKX3O2/No64rOc0HlOvEBP4+kaP mh8zLyLVlWc4KF05IUWtB4Am9CRQKpgwmH1wtKQFSfBBzKx471i1odMeIqgh9S2eJRxF jt4ww0MXwZDTStsyU+mpJoZkov319h2iJhJ7PaELODMgvoyk5ky8tEU+70Rmj2GXP3IE CV9bR+262QuC7EuKrMkwmhuwO5wGk3xDMxURi2/1blEVA4w4RlQQ9iXNEUBuTC+jFLlf UQtZkJp9LNGpRR0ws3xUZn0quwtzixstYCxXY4XCBiOKWze+RyHHy1hU3/U+o/6Guw2+ 5HAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=2GKC65d5HcrJCjOwre1Rkj8Iawfah3uCmKjpCzHaPV0=; b=fZ4sDGH9ycCr0PdFTVkQV2KfxZ60uhiT+p22pvKspC2wOBb1/eAq2gVVMJgmxvtsg3 HooSuidQJ1bKR3guPvZbdOIP9AVEGb9lAaoeCr6LspHOY3JYcmznMuP6QdiNZkjTnDJv oR6BmrzeTQY2KXl6WbXFWrRq3pEFje2pNrbUnyU+zQ6AbDPUUGL0bUD9fEOoe2khHfiH TRSCGU/EW7BzjP8mmuSJ+k2WjA+DiDBqNWBiv3y+7NsjbPgYn24iism8JCtrx5a15+VI hp9bh1LbW3M1isZWRmmpoevwXD1KHvslv0YcarIL540ChVwamp4N/w5BVpXrwBvMotSM WaWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b="C2fPdrm/"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z12-20020a50cd0c000000b0041608df7c4dsi726854edi.306.2022.03.04.07.12.56; Fri, 04 Mar 2022 07:12:56 -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=@haasn.xyz header.s=mail header.b="C2fPdrm/"; 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 A0BE268B196; Fri, 4 Mar 2022 17:12:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7AB8468AB3B for ; Fri, 4 Mar 2022 17:12:34 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 6E7E14360B; Fri, 4 Mar 2022 16:03:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1646406194; bh=bxibmkO/6JUsR8qAsG1/DKdeN6OQ2OfnSAb9vU3kHew=; h=From:To:Cc:Subject:Date:From; b=C2fPdrm/z3pqaR0zdlCRkxRT2k10pCyOkc6r7uAx3pqajm5uJjTn1YmcZ3yl5RAUM xTdtCbm0kvRNTeGoN/rMl2qXhJ4FS2s5BGH30LQs8aZwwrGhwV6SGHcpdL3Nqwk4gp NvS0Sv7GVgSF+Qdd3rFlCCB4zZ5ieUVF26v+8QJo= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Mar 2022 16:03:06 +0100 Message-Id: <20220304150307.61769-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavu: add syntax for loading AV_OPT_TYPE_BINARY from files 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7NOU2bXRQuQJ From: Niklas Haas I arbitrarily decided to use the syntax 'opt=@filename' to match e.g. `curl -Ffield=@filename`, and also because @ is not a valid hex character, nor does it conflict with any other common shell or ffmpeg syntax. This is arguably somewhat clunky because it does not round-trip with av_opt_get - you will get back a hex interpretation of the loaded file, rather than the filename it was loaded from. It also implies a (perhaps unnecessary) memcpy from mapped file memory into a allocated memory. This is unfortunately necessary because there's no way for us to know whether av_free or av_file_unmap is needed to clean up previous option values. The motivating use case was the introduction of several new binary options for vf_libplacebo, but other filters that currently rely on manual file-path loading could benefit from it as well. --- doc/APIchanges | 4 ++++ libavutil/opt.c | 53 ++++++++++++++++++++++++++++++++++++++++++++- libavutil/opt.h | 5 +++++ libavutil/version.h | 2 +- 4 files changed, 62 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index ea402f6118..0400b10721 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,10 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-03-04 - xxxxxxxxxx - lavu 57.23.100 - opt.h + Add av_opt_set_filepath() to set a binary option from a file. + Support '@filename' syntax in av_opt_set() for binary options. + 2022-02-07 - xxxxxxxxxx - lavu 57.21.100 - fifo.h Deprecate AVFifoBuffer and the API around it, namely av_fifo_alloc(), av_fifo_alloc_array(), av_fifo_free(), av_fifo_freep(), av_fifo_reset(), diff --git a/libavutil/opt.c b/libavutil/opt.c index d951edca9d..151536d229 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -32,6 +32,7 @@ #include "common.h" #include "dict.h" #include "eval.h" +#include "file.h" #include "log.h" #include "parseutils.h" #include "pixdesc.h" @@ -465,6 +466,33 @@ static int set_string_dict(void *obj, const AVOption *o, const char *val, uint8_ return 0; } +static int set_string_filepath(void *obj, const AVOption *o, const char *path, uint8_t **dst) +{ + int *lendst = (int *)(dst + 1); + uint8_t *bin; + size_t bin_len; + int err; + + av_freep(dst); + *lendst = 0; + + if (!path || !path[0]) + return 0; + + err = av_file_map(path, &bin, &bin_len, 0, obj); + if (err) + return err; + + *dst = av_memdup(bin, bin_len); + av_file_unmap(bin, bin_len); + + if (!*dst) + return AVERROR(ENOMEM); + + *lendst = bin_len; + return 0; +} + int av_opt_set(void *obj, const char *name, const char *val, int search_flags) { int ret = 0; @@ -492,7 +520,11 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags) case AV_OPT_TYPE_STRING: return set_string(obj, o, val, dst); case AV_OPT_TYPE_BINARY: - return set_string_binary(obj, o, val, dst); + if (val && val[0] == '@') { + return set_string_filepath(obj, o, &val[1], dst); + } else { + return set_string_binary(obj, o, val, dst); + } case AV_OPT_TYPE_FLAGS: case AV_OPT_TYPE_INT: case AV_OPT_TYPE_INT64: @@ -631,6 +663,25 @@ int av_opt_set_bin(void *obj, const char *name, const uint8_t *val, int len, int return 0; } +int av_opt_set_filepath(void *obj, const char *name, const char *path, int search_flags) +{ + uint8_t *bin; + size_t bin_len; + int err; + + if (!path || !path[0]) + return av_opt_set_bin(obj, name, NULL, 0, search_flags); + + err = av_file_map(path, &bin, &bin_len, 0, obj); + if (err) + return err; + + err = av_opt_set_bin(obj, name, bin, bin_len, search_flags); + av_file_unmap(bin, bin_len); + + return err; +} + int av_opt_set_image_size(void *obj, const char *name, int w, int h, int search_flags) { void *target_obj; diff --git a/libavutil/opt.h b/libavutil/opt.h index 2820435eec..97d7c69482 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -699,6 +699,11 @@ int av_opt_set_channel_layout(void *obj, const char *name, int64_t ch_layout, in * caller still owns val is and responsible for freeing it. */ int av_opt_set_dict_val(void *obj, const char *name, const AVDictionary *val, int search_flags); +/** + * @note This behaves like av_opt_set_bin() but loads the binary data from a + * file. May also return errors related to file I/O. + */ +int av_opt_set_filepath(void *obj, const char *name, const char *val, int search_flags); /** * Set a binary option to an integer list. diff --git a/libavutil/version.h b/libavutil/version.h index c7004601c8..6c5d90507c 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 22 +#define LIBAVUTIL_VERSION_MINOR 23 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ From patchwork Fri Mar 4 15:03:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 34608 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1689264nkx; Fri, 4 Mar 2022 07:12:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJwUj7iAb0AVhoc/LKLSdPkkrp3fXKxjf4QQsnqhudsMH//GPxHeppXEE8D04xjoDeQX6740 X-Received: by 2002:a17:906:d41:b0:6ce:78b0:8113 with SMTP id r1-20020a1709060d4100b006ce78b08113mr31907716ejh.357.1646406765539; Fri, 04 Mar 2022 07:12:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646406765; cv=none; d=google.com; s=arc-20160816; b=buaX0TDvewmQ2EdA7hDcVPMXJ1o8kE18efGI/5WVq6g4svjOwqtdh2BJIcR3ukGyBR wA/ho3GKT+iiFqMMePOuOtGdzx6cYStb63+j5pIsivyl92GVlWKrLxJPQUqye9rozvkj c3JB2LjtCpcHzREliwCh0GFk4J1rbOsWtiM5LqyUKmU9zvQCVM2FkPu6NYhhNygye32g pbFJjx9rNKjB2giWO6kfzK916PlO/fqRb8bkTVjMyv5PeWljz7EBbxsDXFO1IkbbtXpb bJO26+XdoOEvSKzBK7bJKMFtv1s0xQBFOpVZqXlPkzuazIIeRSpkZDzaeOq+A4KUZC0m dKzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=wU+MRJZ2jyj6IYY1bpF24ReA1yDG6VKCRH9xkLD56C0=; b=dLcviJG0ZicJxfwi8Q3yvMju9B7GQExpba98ErT4eDIlkapEGGB/ns5vRH2l0GKoKs I563VWylxHMYZ29mJD3OPuUbnMuS5ekHj8MDU/vxdfouUqP+OHvTvCtSh6AlehpH+Xp+ El0sSIHwfkAfutKBRqz1GuSWf4e/XOcHBSRDWCMZ69lfZkHhmMf2O4Vs03Q2ci8O4RS9 nV8vcovP+2tMKxuPs+HI0ZBN6jvSfyXBuHlHmfZufY8IsULiiLqchZYHa1ys+jXHf2g4 AAG7TW5wA9aRDGmc+5MNIPvayHZQfTx7BneEXeMzFqH/P5o4LMOzm1aG/l+MrpAhHLYa P6+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=hDrd5+ne; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o28-20020a05640219bc00b00412e5ea2339si3598646edz.356.2022.03.04.07.12.45; Fri, 04 Mar 2022 07:12:45 -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=@haasn.xyz header.s=mail header.b=hDrd5+ne; 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 BC53768B143; Fri, 4 Mar 2022 17:12:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7DD8A68B10A for ; Fri, 4 Mar 2022 17:12:34 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 5208C43612; Fri, 4 Mar 2022 16:03:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1646406195; bh=+7E+ledJzkDncAiWTZA7QUVb/eEu0x7o+T2qH/Z7EUA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hDrd5+neHejnujZCx2wFcksIPgnEeAnF5KYtm2dIVOkxt4RuUg+vul7nyF1Od0/YH jXAn9lMtYi+YfpkONK63/2XmYuAFIsAoczNw5sArYLW7bXZK2ZOJl5CTRdx+dJL8K3 tLgoKg7bCTE9x0F2B3dWg2PNelNcBRFiT55lyT+A= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Mar 2022 16:03:07 +0100 Message-Id: <20220304150307.61769-2-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220304150307.61769-1-ffmpeg@haasn.xyz> References: <20220304150307.61769-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavu/tests/opts: add tests for filepath options 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 91iWXok0NLoj From: Niklas Haas Using the venerable HEADER.txt as a small file to load. --- libavutil/tests/opt.c | 38 +++++++++++++++++++++++++++++++++++++- tests/fate/libavutil.mak | 2 +- tests/ref/fate/opt | 4 ++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/libavutil/tests/opt.c b/libavutil/tests/opt.c index e6ea892373..e3d4edee4e 100644 --- a/libavutil/tests/opt.c +++ b/libavutil/tests/opt.c @@ -113,7 +113,7 @@ static void log_callback_help(void *ptr, int level, const char *fmt, va_list vl) vfprintf(stdout, fmt, vl); } -int main(void) +int main(int argc, const char **argv) { int i; @@ -355,5 +355,41 @@ int main(void) av_opt_free(&test_ctx); } + printf("\nTesting av_opt_set_filepath()\n"); + { + TestContext test_ctx = { 0 }; + const char *samples; + char buf[256]; + uint8_t *value; + int ret = AVERROR_BUG; + + if (argc < 2) + return 1; + samples = argv[1]; + + test_ctx.class = &test_class; + av_opt_set_defaults(&test_ctx); + av_log_set_level(AV_LOG_QUIET); + + if (snprintf(buf, sizeof(buf), "@%s/HEADER.txt", samples) >= sizeof(buf)) + return 1; + + ret = av_opt_set_filepath(&test_ctx, "bin", &buf[1], 0); + if (!ret) + ret = av_opt_get(&test_ctx, "bin", 0, &value); + printf("av_opt_set_filepath: bin='%s'\n", + ret ? av_err2str(ret) : (char *) value); + av_free(value); + + ret = av_opt_set(&test_ctx, "bin", buf, 0); + if (!ret) + ret = av_opt_get(&test_ctx, "bin", 0, &value); + printf("av_opt_set: bin='%s'\n", + ret ? av_err2str(ret) : (char *) value); + av_free(value); + + av_opt_free(&test_ctx); + } + return 0; } diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak index 1ec9ed00ad..587aa810cd 100644 --- a/tests/fate/libavutil.mak +++ b/tests/fate/libavutil.mak @@ -164,7 +164,7 @@ fate-tea: CMD = run libavutil/tests/tea$(EXESUF) FATE_LIBAVUTIL += fate-opt fate-opt: libavutil/tests/opt$(EXESUF) -fate-opt: CMD = run libavutil/tests/opt$(EXESUF) +fate-opt: CMD = run libavutil/tests/opt$(EXESUF) $(TARGET_SAMPLES) FATE_LIBAVUTIL += $(FATE_LIBAVUTIL-yes) FATE-$(CONFIG_AVUTIL) += $(FATE_LIBAVUTIL) diff --git a/tests/ref/fate/opt b/tests/ref/fate/opt index aac3fa0e7e..341693d097 100644 --- a/tests/ref/fate/opt +++ b/tests/ref/fate/opt @@ -417,3 +417,7 @@ Setting options string 'a_very_long_option_name_that_will_need_to_be_ellipsized_ Setting 'a_very_long_option_name_that_will_need_to_be_ellipsized_around_here' to value '42' Option 'a_very_long_option_name_that_will_need_to_be_ellipsized_around_here' not found Error 'a_very_long_option_name_that_will_need_to_be_ellipsized_around_here=42' + +Testing av_opt_set_filepath() +av_opt_set_filepath: bin='46415445202D2046466D706567204175746F6D617465642054657374696E6720456E7669726F6E6D656E740A687474703A2F2F666174652E6D756C74696D656469612E63782F0A0A' +av_opt_set: bin='46415445202D2046466D706567204175746F6D617465642054657374696E6720456E7669726F6E6D656E740A687474703A2F2F666174652E6D756C74696D656469612E63782F0A0A'