From patchwork Fri Jun 11 20:31:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 28237 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp837839ybk; Fri, 11 Jun 2021 13:39:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwF5/joTnKsb8dvDX7cdU5c6qKEZsekRANTv10OrHc+/Ui0CnJuM8FADyw1kpzqx9ZmvHXc X-Received: by 2002:a05:6402:520b:: with SMTP id s11mr5455608edd.111.1623443993959; Fri, 11 Jun 2021 13:39:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623443993; cv=none; d=google.com; s=arc-20160816; b=lW4YB/9oolWcvf9fZ7XtLoOLiW05A2fna2LJLpJd1Up/3fhdNt6dapyWQVzZyu/Mph jcr6E1MkBa1xLh+fw0vcaalpR4msxVmAjsQuLdRbV9WKn/jbI6Hqw0luviifqytx5IEE w2icxFTgJDu48364EXTUNQwS9DgmaqxaWqvOLAtvprr8N3pE260U+a+Ha2ygOoB3JK0T Ekesk3gb8WSw35a/2dcomk9LU7hmkmQfnpX6NlJDCpshbLOcacvOnXApQLsh7GL2+Grd B/5xK2auuxfQhlOkleX4WgcMtaEFFaUd8jdAaOJ+dLmxOHZTC5uLRAm02NltFNacp4j4 0wVQ== 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=dNw5PkdZKUZGXGLpkPbRnNtj8PygWiwHNlyhEkB3hL4=; b=lPkplmCCwhkl84t29CYen7+MBTGNkGl32UABUbL9x8HzQB3ivdm3a6D1HaJ4Qkc93s SAQPuF7oN/Mh72n1a4PDc4hNcFYY2SCiiFKGwOd6C0RvObMI+5iPG6C92Y1CAKz8A9K6 1dYDddoHb3dA/I4TQOHJ+Jjjgvsbzm9jW5+GOisFVsOLKMkkRjX1Fp0++wxxJvpCD3lV r1OAVmkkuHqbMHy5FIrKsz4YvNc6QQXrOWxgtILfHOuTussog/3528hJjoqNiSdsxVuY 7Om8SXZmPIFkR/oNIGgHvONJirdWXfKPJYnwUXE7K1JEzcbjz8/R4aijNga44f8gCitp ZE5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VptQS062; 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 m29si5459024ejl.33.2021.06.11.13.39.53; Fri, 11 Jun 2021 13:39:53 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VptQS062; 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 18E54689B33; Fri, 11 Jun 2021 23:39:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A15568813A for ; Fri, 11 Jun 2021 23:39:50 +0300 (EEST) Received: by mail-lj1-f173.google.com with SMTP id r16so11297078ljk.9 for ; Fri, 11 Jun 2021 13:39:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Mp3kOdotOYUMKYYj93Ysqn1Fp3AujUZVQdFSiwb69T8=; b=VptQS06231ZXlOuJm2y9/VV1UdR1/QvUL5480UfHKKKG5LBp4zMbkB8a9lzw6pZdNO r7XmSlFi6/tXsFP6tatWPmpthZpI5xTum8Lr5UI337rrEscuSQDJkrgfFj8+KEYEieMM kIJIfnpET2BzOv+hTyhNb4tfO9xmkvg1jg39vJ/Ir0G10ZuE1bJZmMVgfHsBwtEKUus+ sWhu6pPOpZrGR8I0V7aiEbl7dRcqhYA6KYwTkK9KBIf+nUsND9gI/EI24Fs+tYwmHIKE 6GHtf+ooP7OV7CTnpaD30vNLSDCj7i7QK+MQPVRxxq1jA+TgLgNryKhjPgeO02OSauyT K33w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mp3kOdotOYUMKYYj93Ysqn1Fp3AujUZVQdFSiwb69T8=; b=ke8b26TTUc3q7P8VSNt+NWXmgI0ggZSvI/PCwK5X2VUuWkD+dgFBfeJ8M/iC7gdK7k A+xWmVdxhObrc0pfjNqOF89+XloXHbD/6ZNpyAkQY2/ugVOZ2nVh8EAh51lsBIPDiX0Z 9nUPif98gut8OdJz7GFH/MhQW2ip5RSmfPu/vEvAImNtTFRJytObmU6NfZam39uhN8M1 QScXHCoxnE7N6zwo5deDNOivoGUaiTDoouqaddSo4d5NSBfAsnSdd+mTdE/Bkv8RHPCe 3PSBF5N0rLT+r9A9N9gIZg7toP3lk0pXT3Ts75SFRN/+Z2WuceRYtQd4mgjEGyZtwOB4 Ibug== X-Gm-Message-State: AOAM531Utpr6ObsMs4BTOZF3K0MLPsdh8uFEZmNUEofSTcBeX3c4OQUR YMXqqii6OmUMmgjzwHKTpvA3lzTkB+x46Q== X-Received: by 2002:a05:651c:1422:: with SMTP id u34mr4393102lje.149.1623443989389; Fri, 11 Jun 2021 13:39:49 -0700 (PDT) Received: from localhost.localdomain ([196.196.203.214]) by smtp.gmail.com with ESMTPSA id a17sm687957lfs.59.2021.06.11.13.39.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 13:39:48 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Jun 2021 22:31:00 +0200 Message-Id: <20210611203104.1692-30-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210611203104.1692-1-dcnieho@gmail.com> References: <20210611203104.1692-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 29/33] avformat: add avformat_alloc_input_context() 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: Diederick Niehorster Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DJebomalyvpB Content-Length: 8778 avformat_alloc_input_context function analogous to avformat_alloc_output_context2, except that it does not take a filename argument as guessing the format by just the filename does not make sense. avformat_alloc_input_context can be used e.g. with the avdevice capabilities API, which needs an allocated input format with priv_data (and default options) set, but device should not be opened. Added some checks to avformat_open_input, for the case that a AVFormatContext* allocated by avformat_alloc_input_context is provided: 1. if avformat_open_input's AVInputFormat *fmt argument is not NULL, clean up any already set s->iformat 2. if s->url is already set and avformat_open_input's filename argument is not NULL, free current url and replace by provided filename 3. if s->url is already set and avformat_open_input's filename argument is NULL, do not set s->url to "", but keep current url 4. if s->priv_data has already been allocated, do not do so again. 4b. do reset options to default and apply provided options (if any) 5. add 4b to docs of avformat_open_input Bumping avformat version. Signed-off-by: Diederick Niehorster --- libavformat/avformat.h | 29 +++++++++++++++-- libavformat/utils.c | 74 ++++++++++++++++++++++++++++++++++++++---- libavformat/version.h | 2 +- 3 files changed, 95 insertions(+), 10 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 54457572b1..80575524b4 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1879,6 +1879,26 @@ AVProgram *av_new_program(AVFormatContext *s, int id); * @} */ + /** + * Allocate an AVFormatContext for an input format. + * avformat_free_context() can be used to free the context and + * everything allocated by the framework within it. NB: in general + * the correct format cannot be known (unless the user has extra + * information) until the file is opened. If forcing a format by + * this method, but it turns out not to match the file's format + * upon avformat_open_input(), the latter will throw an error. + * + * @param *ctx is set to the created format context, or to NULL in + * case of failure + * @param iformat format to use for allocating the context, if NULL + * format_name is used instead + * @param format_name the name of input format to use for allocating the + * context + * @return >= 0 in case of success, a negative AVERROR code in case of + * failure + */ +int avformat_alloc_input_context(AVFormatContext** ctx, const AVInputFormat* iformat, + const char* format_name); /** * Allocate an AVFormatContext for an output format. @@ -1974,9 +1994,9 @@ int av_probe_input_buffer(AVIOContext *pb, const AVInputFormat **fmt, * Open an input stream and read the header. The codecs are not opened. * The stream must be closed with avformat_close_input(). * - * @param ps Pointer to user-supplied AVFormatContext (allocated by avformat_alloc_context). - * May be a pointer to NULL, in which case an AVFormatContext is allocated by this - * function and written into ps. + * @param ps Pointer to user-supplied AVFormatContext (allocated by avformat_alloc_context, or + * avformat_alloc_input_context). May be a pointer to NULL, in which case an + * AVFormatContext is allocated by this function and written into ps. * Note that a user-supplied AVFormatContext will be freed on failure. * @param url URL of the stream to open. * @param fmt If non-NULL, this parameter forces a specific input format. @@ -1984,6 +2004,9 @@ int av_probe_input_buffer(AVIOContext *pb, const AVInputFormat **fmt, * @param options A dictionary filled with AVFormatContext and demuxer-private options. * On return this parameter will be destroyed and replaced with a dict containing * options that were not found. May be NULL. + * Note that if a AVFormatContext allocated by avformat_alloc_input_context + * is provided, any demuxer-private options will be overwritten by their defaults + * before applying this new set of demuxer-private options, if any. * * @return 0 on success, a negative AVERROR on failure. * diff --git a/libavformat/utils.c b/libavformat/utils.c index 5582d108d0..cf1a884043 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -478,6 +478,56 @@ static int update_stream_avctx(AVFormatContext *s) } +int avformat_alloc_input_context(AVFormatContext** avctx, const AVInputFormat* iformat, + const char* format) +{ + AVFormatContext* s = avformat_alloc_context(); + int ret = 0; + + *avctx = NULL; + if (!s) + goto nomem; + + if (!iformat) { + if (format) { + iformat = av_find_input_format(format); + if (!iformat) { + av_log(s, AV_LOG_ERROR, "Requested input format '%s' not found\n", format); + ret = AVERROR(EINVAL); + goto error; + } + } + else { + av_log(s, AV_LOG_ERROR, "You should provide an input format or the name of an input format when calling this function\n"); + ret = AVERROR(EINVAL); + goto error; + } + } + + s->iformat = iformat; + if (s->iformat->priv_data_size > 0) { + s->priv_data = av_mallocz(s->iformat->priv_data_size); + if (!s->priv_data) + goto nomem; + if (s->iformat->priv_class) { + *(const AVClass**)s->priv_data = s->iformat->priv_class; + av_opt_set_defaults(s->priv_data); + } + } + else + s->priv_data = NULL; + + *avctx = s; + return 0; +nomem: + av_log(s, AV_LOG_ERROR, "Out of memory\n"); + ret = AVERROR(ENOMEM); +error: + avformat_free_context(s); + return ret; +} + + int avformat_open_input(AVFormatContext **ps, const char *filename, const AVInputFormat *fmt, AVDictionary **options) { @@ -492,8 +542,14 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, av_log(NULL, AV_LOG_ERROR, "Input context has not been properly allocated by avformat_alloc_context() and is not NULL either\n"); return AVERROR(EINVAL); } - if (fmt) + if (fmt) { + if (s->iformat) { + if (s->iformat->priv_class && s->priv_data) + av_opt_free(s->priv_data); + av_freep(&s->priv_data); + } s->iformat = fmt; + } if (options) av_dict_copy(&tmp, *options, 0); @@ -504,7 +560,9 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, if ((ret = av_opt_set_dict(s, &tmp)) < 0) goto fail; - if (!(s->url = av_strdup(filename ? filename : ""))) { + if (filename && s->url) + av_freep(&s->url); + if (!s->url && !(s->url = av_strdup(filename ? filename : ""))) { ret = AVERROR(ENOMEM); goto fail; } @@ -547,12 +605,16 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, s->duration = s->start_time = AV_NOPTS_VALUE; - /* Allocate private data. */ + /* Allocate private data and set options. */ if (s->iformat->priv_data_size > 0) { - if (!(s->priv_data = av_mallocz(s->iformat->priv_data_size))) { - ret = AVERROR(ENOMEM); - goto fail; + /* allocate if not already allocated */ + if (!s->priv_data) { + if (!(s->priv_data = av_mallocz(s->iformat->priv_data_size))) { + ret = AVERROR(ENOMEM); + goto fail; + } } + /* Overwrite any options already set (1: back to defaults, 2: apply options, if any) */ if (s->iformat->priv_class) { *(const AVClass **) s->priv_data = s->iformat->priv_class; av_opt_set_defaults(s->priv_data); diff --git a/libavformat/version.h b/libavformat/version.h index 7f02e18f24..6519bba101 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 -#define LIBAVFORMAT_VERSION_MINOR 3 +#define LIBAVFORMAT_VERSION_MINOR 4 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \