From patchwork Sun Jan 7 21:30:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 45527 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2449:b0:199:85ec:e0df with SMTP id t9csp672808pzc; Sun, 7 Jan 2024 13:31:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IHMyfIKaQc39EASYB5OinszbkRDdwCw5h7JTbMUOnHdIm1qV+roj1Ijjcd6DPghdVlLwpCI X-Received: by 2002:a17:906:7cd:b0:a27:8953:ea89 with SMTP id m13-20020a17090607cd00b00a278953ea89mr717969ejc.60.1704663087542; Sun, 07 Jan 2024 13:31:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704663087; cv=none; d=google.com; s=arc-20160816; b=cyaLheYbo6AFbMBaizTP1VpLqsnSR9JH0Q3PehUGsYV1u3+J9OdgQIGY/TJEk+NWZG O4p2pXg5hABsk9L1FDM7ajkEbLhcYhz+vbEFocQFFGOJv/xKDeFpp2WjdLg/FsoNxxFJ VH8wTmZHcf0/t6UnIDk/v3rT6YHWhVphR3CzmcRuUJUGRDyfNVadyazK5W8L7DZR1OTF uxKh+CUMZf9BMEwEesZNgW5JY1JfrXnC5H60yzusPgHe6sMYbtY/1idBkqztfgph2Q3c I7dZQP9EMo/EBAnOVlYUFrUpDjQSt/L7sJynbOoKWIe3OnIUtwd+OMLwPRRHIn5hU0z0 pwgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=al9ZxV2L4EZbZseT/54bcNc6Jf2Wz2EbbyHu0Em4A8c=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=a90Aj7tyRPGBDEIaCWIRyI0OUq5g3GwD0qun5kdzhDNkwZ3SpzMKtv/Z8BMfFus6rO +vcc1+u18VUCIZyAhBU9OfRYDY9+7RdNzc/UarmtrGvoC02jYekJhKyzODsQNgpsgxjt EjOMOXMvtkts2LUZcIbF8JvmcFJSEEQE6S2i+48W3dgasxNBlAeg/YgBAmgkYueGsJsI RxQ/aiAXI0KMo+561Joa+qcY91g2RefXjExc5pficdXnfFgrMu56Te5ujAKPddH8GE8G BMTx0tyCzLyN5nYRZMIuIRwf6BJ0PZ9o4Pf/kCbHSxju1vsIKPyUJcn6eRHaIa1B2DM6 7tmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=gzI6xhur; 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 r25-20020a170906365900b00a26ae3c6702si2570788ejb.248.2024.01.07.13.31.27; Sun, 07 Jan 2024 13:31:27 -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=20230601 header.b=gzI6xhur; 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 E4FFE68CD64; Sun, 7 Jan 2024 23:31:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BFB868CBD9 for ; Sun, 7 Jan 2024 23:31:08 +0200 (EET) Received: by mail-io1-f47.google.com with SMTP id ca18e2360f4ac-7bade847536so76139639f.0 for ; Sun, 07 Jan 2024 13:31:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704663065; x=1705267865; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ixIIH03PxZKTBKDKtMmaH9N9oJ+gfP01Xmn5cRfOf0I=; b=gzI6xhurLiyira89qstzbFmCYwuNdBT8SkkHxnd6XaFkc1HisKac/rREjqLIu5IG85 +Aam5tW8/ZEhE9jNESO6Vd2JdD3d69iPwyzSn4d8U1SOsRtlYkkCIovcUa4I7PahsXSg 38Lv0PBxSGw6sm7Jl1ztfU7wJB/adD78zSt/1hqXGFE794mqAyIMPQs0GXK/F93TFr13 fSIHVhWYj0ADm22rlra/0Km7WzOaasCvrrVFpqCKPcumgWAc/DWK2Bm5MjZYbfUGbu5Q sqGBoWzMKJz82NJaq3cO3FJ64Y0Uia/9DT+5G1AgPw9CRQFVwlkBTNIjc1vjWYuIpY2a UPXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704663065; x=1705267865; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ixIIH03PxZKTBKDKtMmaH9N9oJ+gfP01Xmn5cRfOf0I=; b=tkYkl2WJowoE3CL7MjWdnHJg7vaT4IpC2YFLjUGKZSkc0/9hQnV6K+2VCyu4akP/tc j6DpF3vzwZ3yzc0DSsh9+b3RzV6ODQl1bAoIuFfajdzIAftKRYLXBvPvrBQal4mtczfB SEfvL/7+MppqDwlE5jGFpNxmCdEqahNK31iSp/lojHkCM9cunCfBu2GQZJeJkaYN1Wph op3exppI+X8JN4YCZ7RO87HdW6yw4cMadIKekXGTQKhb2p85l/sRS997nabqIf4t0FzD /CmJ122A3GSspPupdBxSwOG11/BFPSwkW3RX8YE8DDEf6SvdcNaAPLMAhW834RblFy4h jWaA== X-Gm-Message-State: AOJu0YwSMjam7MCv8ZexQOtrKmaMAXEkvUHMbVQXakSXny4QUB71XsNj 3pcSv/ih9qpGyl1SCvgh2e+PW4P3jTU= X-Received: by 2002:a05:6e02:2487:b0:35d:a0c8:5d85 with SMTP id bt7-20020a056e02248700b0035da0c85d85mr5959330ilb.5.1704663065340; Sun, 07 Jan 2024 13:31:05 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id a21-20020a1709027d9500b001d403969bf4sm4805939plm.309.2024.01.07.13.31.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 13:31:04 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Jan 2024 18:30:58 -0300 Message-ID: <20240107213100.16205-2-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240107213100.16205-1-jamrial@gmail.com> References: <20240107213100.16205-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] fftools/cmdutils: add OPT_TYPE_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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: C8pswuD5/eQD Same as OPT_TYPE_STRING, except it takes a file argument whose contents are read as a string. Signed-off-by: James Almer --- fftools/cmdutils.c | 34 ++++++++++++++++++++++++++++++++++ fftools/cmdutils.h | 3 +++ fftools/ffmpeg.h | 1 - fftools/ffmpeg_opt.c | 32 +++----------------------------- 4 files changed, 40 insertions(+), 30 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 44228ea637..40623a9ace 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -37,6 +37,7 @@ #include "libswresample/swresample.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/bprint.h" #include "libavutil/channel_layout.h" #include "libavutil/display.h" #include "libavutil/getenv_utf8.h" @@ -266,6 +267,13 @@ static int write_option(void *optctx, const OptionDef *po, const char *opt, if (!str) return AVERROR(ENOMEM); *(char **)dst = str; + } else if (po->type == OPT_TYPE_FILE) { + char *str; + str = file_read(arg); + av_freep(dst); + if (!str) + return AVERROR(ENOMEM); + *(char **)dst = str; } else if (po->type == OPT_TYPE_BOOL || po->type == OPT_TYPE_INT) { ret = parse_number(opt, arg, OPT_TYPE_INT64, INT_MIN, INT_MAX, &num); if (ret < 0) @@ -1088,3 +1096,29 @@ double get_rotation(const int32_t *displaymatrix) return theta; } + +/* read file contents into a string */ +char *file_read(const char *filename) +{ + AVIOContext *pb = NULL; + int ret = avio_open(&pb, filename, AVIO_FLAG_READ); + AVBPrint bprint; + char *str; + + if (ret < 0) { + av_log(NULL, AV_LOG_ERROR, "Error opening file %s.\n", filename); + return NULL; + } + + av_bprint_init(&bprint, 0, AV_BPRINT_SIZE_UNLIMITED); + ret = avio_read_to_bprint(pb, &bprint, SIZE_MAX); + avio_closep(&pb); + if (ret < 0) { + av_bprint_finalize(&bprint, NULL); + return NULL; + } + ret = av_bprint_finalize(&bprint, &str); + if (ret < 0) + return NULL; + return str; +} diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index 53227abb47..016ee325b9 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -81,6 +81,7 @@ enum OptionType { OPT_TYPE_FUNC, OPT_TYPE_BOOL, OPT_TYPE_STRING, + OPT_TYPE_FILE, OPT_TYPE_INT, OPT_TYPE_INT64, OPT_TYPE_FLOAT, @@ -470,4 +471,6 @@ void *allocate_array_elem(void *array, size_t elem_size, int *nb_elems); double get_rotation(const int32_t *displaymatrix); +char *file_read(const char *filename); + #endif /* FFTOOLS_CMDUTILS_H */ diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 6137ac991e..cdde3c2c03 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -652,7 +652,6 @@ void remove_avoptions(AVDictionary **a, AVDictionary *b); int check_avoptions(AVDictionary *m); int assert_file_overwrite(const char *filename); -char *file_read(const char *filename); AVDictionary *strip_specifiers(const AVDictionary *dict); int find_codec(void *logctx, const char *name, enum AVMediaType type, int encoder, const AVCodec **codec); diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index c189cf373b..7ae1b55cf0 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -43,7 +43,6 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/avutil.h" -#include "libavutil/bprint.h" #include "libavutil/channel_layout.h" #include "libavutil/display.h" #include "libavutil/intreadwrite.h" @@ -108,12 +107,13 @@ static void uninit_options(OptionsContext *o) SpecifierOptList *so = dst; for (int i = 0; i < so->nb_opt; i++) { av_freep(&so->opt[i].specifier); - if (po->type == OPT_TYPE_STRING) + if (po->type == OPT_TYPE_STRING || po->type == OPT_TYPE_FILE) av_freep(&so->opt[i].u.str); } av_freep(&so->opt); so->nb_opt = 0; - } else if (po->flags & OPT_FLAG_OFFSET && po->type == OPT_TYPE_STRING) + } else if (po->flags & OPT_FLAG_OFFSET && ( po->type == OPT_TYPE_STRING + || po->type == OPT_TYPE_FILE)) av_freep(dst); po++; } @@ -759,32 +759,6 @@ int assert_file_overwrite(const char *filename) return 0; } -/* read file contents into a string */ -char *file_read(const char *filename) -{ - AVIOContext *pb = NULL; - int ret = avio_open(&pb, filename, AVIO_FLAG_READ); - AVBPrint bprint; - char *str; - - if (ret < 0) { - av_log(NULL, AV_LOG_ERROR, "Error opening file %s.\n", filename); - return NULL; - } - - av_bprint_init(&bprint, 0, AV_BPRINT_SIZE_UNLIMITED); - ret = avio_read_to_bprint(pb, &bprint, SIZE_MAX); - avio_closep(&pb); - if (ret < 0) { - av_bprint_finalize(&bprint, NULL); - return NULL; - } - ret = av_bprint_finalize(&bprint, &str); - if (ret < 0) - return NULL; - return str; -} - /* arg format is "output-stream-index:streamid-value". */ static int opt_streamid(void *optctx, const char *opt, const char *arg) {