From patchwork Wed Mar 30 12:17:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 35057 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp773723pzb; Wed, 30 Mar 2022 05:18:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPaDddPMf3TGu7GsH1UUBiqqOdyonqmpmOQm6YwFnXH174qsfcngQlJ1z44Do0WNfUDQKU X-Received: by 2002:a17:907:97c7:b0:6e0:defd:342d with SMTP id js7-20020a17090797c700b006e0defd342dmr24516990ejc.231.1648642730163; Wed, 30 Mar 2022 05:18:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648642730; cv=none; d=google.com; s=arc-20160816; b=sVMKNlNblLjaIZ6JFJ49hzVNYKxmtMdQnovYFWXFcDiy2RiF8/rTQ/lTF1rJvLGQDX Y3GQHNFj5AUERym80Fpa4P3feoeWb+DNPs0SoRtBJoZOOLF4RRgygD4/0yLtJPy+8Q8h 3wGl7YKc4R3YmK+ax3crhMgLCwtIsD/2dF/U0OBO1W33Yms8T3kI9Mf4ph6OHo4pQ+Df GrTrZ4b3Oi1vrMVYFN6A0P/t+hVtQyq2nDSD/gb6PsJJjpBDUIyXZVy7618RS7LElk6c IjUCv5y1JBdimBwmKQZ+Kp1q7UCh2SXN/kMPRBIaPyI0mLcHYyVr41/PkgA77fmgogOD sQ4Q== 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=WmVuaO+az511jkoe2m+hwvc87+7RjxyNxG06HLWq0hg=; b=P+zMRpvl502stGQ+M4tHDa3AFxceN8saMxJT0Gc4YQeqRO/0Tb5U50SWa74TLRnK0N hFhXunkM/ymEx5oaomm5vW9NGwcIY7EXAaBnO3Wxo54BUvQLaYCezpZREiNKQgobuGmM fR+CS7h4DIgz8VFtmGbR2CasDG1tzrGucsJV2N51d1UqL/zCTkiajXw4bNq3be6OhVvL Xs6q56tGFyMmAn6TWNOJfFgsAUS3EE345oMaJNamEjNdvJulfMRHo8mSA7lk52k5qigQ depktFU8U5R13A9bYcPK6LDpANpOJDm7PrrhPpuI8pQdC1IDgY63owbuMwxmpmYPJtOk KPVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="p//Eyz2d"; 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 qx5-20020a170906fcc500b006df76385eebsi20248204ejb.907.2022.03.30.05.18.49; Wed, 30 Mar 2022 05:18:50 -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=20210112 header.b="p//Eyz2d"; 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 1CAD568B1FA; Wed, 30 Mar 2022 15:18:41 +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 8C49368B1C7 for ; Wed, 30 Mar 2022 15:18:34 +0300 (EEST) Received: by mail-lj1-f173.google.com with SMTP id q14so27376291ljc.12 for ; Wed, 30 Mar 2022 05:18:34 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=uBEdleHp9I6jn/h5hd+DfiHaZTDwq6y2m0kaAQSrxZU=; b=p//Eyz2dU9huA49o9opmWr6EH604ZdlHMdMJjqRCouIi8qtru46xeVtt+2exER0G6z Rdqpd8bbfi/Oy7wm2nUMNDljdA7F5D+B1fJxnHzk5F5vEC78JxKnr8KAlhMwC4H+teCl IrW3YUnc/thOo2OVH1a6zxVW1XmovUaWQ5HPUnY9EN2bqXafgy7PtZ+tjSdN0ESgHgYM 5pR4wSE+qMOadNTeqehfHunTg6k0K6Tz2+ObvsaYFS4LFvcr9uqUTBVW2QFcKVKiWgau cT9VVxuQ6pM4mKYsHBAkbq1XpwiOc4gsoWmoB9kr+N2ArVZu/9Svn0VEFVfeG3w98jB+ c2Tg== 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:mime-version:content-transfer-encoding; bh=uBEdleHp9I6jn/h5hd+DfiHaZTDwq6y2m0kaAQSrxZU=; b=3scz4BO8PYAna4iqKkt0amCGqXz4deS2860HmLxFyPIpv9Qb1+eCH0jKSqXUXQZbC3 zC6mPUZQBOHH7y4RR+JwTwDt7y7TnbzNGbSfKe/5oi+FiVg9mUkLpqcHRAHqfqQiWeiG 171ezVJbXoXv1T9+WgjoZ8COSQEYvYNnieYHfYQ3OB5+F+pD/NYIVvgNMgqviOYfSWRJ SImxIrbTlPgls4IawyJkwQTWAoj0drc3/6MV6QtsS+0L+7FlNiQ+hQXPIdYLQs2FUEmC ijcs9Bb+4JgTOu3KeiA+QtAlLmD7bijtec4jIAlNgqvIx4Z9VJUbN9fUINRB+X9Jvso+ RoJw== X-Gm-Message-State: AOAM533iWtGcweNJdEUWwJ4X+vkFvGhYEE8ayKfXtgv4BsHd0vTVJKwv C2oAWTrCZ1HuEnzvqGTn8rT0ebXhqS0= X-Received: by 2002:a2e:a4a8:0:b0:249:6444:d29a with SMTP id g8-20020a2ea4a8000000b002496444d29amr6461670ljm.447.1648642713616; Wed, 30 Mar 2022 05:18:33 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id y18-20020a056512045200b0044a35fd9945sm2319264lfk.23.2022.03.30.05.18.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 05:18:33 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Wed, 30 Mar 2022 14:17:47 +0200 Message-Id: <20220330121806.822-3-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20220330121806.822-1-dcnieho@gmail.com> References: <20220330121806.822-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 02/21] avformat: add control_message function to AVInputFormat 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: AtAYhUqYpxEv Control messages are useful for programmatic control of not only outdevs but also indevs. Bumping avformat version. Signed-off-by: Diederick Niehorster --- libavdevice/avdevice.c | 8 +++++--- libavformat/avformat.h | 6 ++++++ libavformat/version.h | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 98934abfb7..43d3406670 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -66,9 +66,11 @@ const char * avdevice_license(void) int avdevice_app_to_dev_control_message(struct AVFormatContext *s, enum AVAppToDevMessageType type, void *data, size_t data_size) { - if (!s->oformat || !s->oformat->control_message) - return AVERROR(ENOSYS); - return s->oformat->control_message(s, type, data, data_size); + if (s->oformat && s->oformat->control_message) + return s->oformat->control_message(s, type, data, data_size); + if (s->iformat && s->iformat->control_message) + return s->iformat->control_message(s, type, data, data_size); + return AVERROR(ENOSYS); } int avdevice_dev_to_app_control_message(struct AVFormatContext *s, enum AVDevToAppMessageType type, diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 350912e272..06db024559 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -785,6 +785,12 @@ typedef struct AVInputFormat { */ int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags); + /** + * Allows sending messages from application to device. + */ + int (*control_message)(struct AVFormatContext *s, int type, + void *data, size_t data_size); + /** * Returns device list with it properties. * @see avdevice_list_devices() for more details. diff --git a/libavformat/version.h b/libavformat/version.h index bb6a7d4510..d195704a31 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 21 +#define LIBAVFORMAT_VERSION_MINOR 22 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \