From patchwork Tue Jul 6 09:19:57 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: 28801 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp4920458ios; Tue, 6 Jul 2021 02:23:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0l9CwqPCMQXkTlgeNvz43trZW9pnegIGc9uNVui1gAOlOeaQ+Aj0xW5k/ffE8zRVfalDm X-Received: by 2002:aa7:cf91:: with SMTP id z17mr21787571edx.112.1625563389601; Tue, 06 Jul 2021 02:23:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625563389; cv=none; d=google.com; s=arc-20160816; b=fO6tU7kFZe9umn7ETZNhLggKUVROVjGT3h+uakDcbhRkYkpKy05OwASEPliP+MKLa1 hfgAKtB6s5ssZy2uRoIoJmqVr2Mv4HJlWa7yjJmEvPRvepaG0hJrdteGJFPv22LfxMaQ 7noQk5ea9eQBxxrAjJDc4iwXvJCSj9JGO6JRreasiijQ0MR0mq4o5jXBnOa1RORUn7nu OAGl6gjs4VCwmz1QIeM0q6kPBoSJkjv/r68/q5WU2wiAU0EPTyZDut3UAbm13LmiLgeU 4cVc6THCuYh1GlR2JBQh3QSKM/ecUxFgpdu2ZCjqykGIsdPuqOK3Ujr6J1HjZK/3ufJ9 +bZw== 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=cybFjn8vU2wbEPBNJiZZ6c2IktiSehe9ecG1z3U8g9g=; b=a2sxQjAYf+LjmvlHrB3ds+vDb0TH9OblfIWGYXiPjvO5A/yVt9YrbMStZL+PvRFswf eJRABxTSDcOqKgjONaOOzB3rGdOR/fBxnPQdbyjwE/0/pDUWzdLSi0sCtF/+LL+HiI+u OWMQw5fdxqliBXcoqR1NI6mchNndpWOddJ05181/cEIN5Mlctvb5UMBjtr7CjMDoD2PR MgOFmFOFSFMoI50/GEQ+Rklc0vuEXG0cVTRFM8SRn/nVJBeWPVKDUEMXpvK9qfekflc0 N9qTPe/9hiWcrkph0KxVwsIisA7/UFl7JSJN6+533gcIU5NBbJv/Wskh3xGGHArGwJAI cWYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PVRNfUKx; 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 d26si14426505ejz.183.2021.07.06.02.23.09; Tue, 06 Jul 2021 02:23:09 -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=PVRNfUKx; 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 6927A68A77C; Tue, 6 Jul 2021 12:23:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0204168A764 for ; Tue, 6 Jul 2021 12:23:01 +0300 (EEST) Received: by mail-lf1-f45.google.com with SMTP id n14so37173445lfu.8 for ; Tue, 06 Jul 2021 02:23:01 -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=lSs2OxjHJXvD9NUzL/owyYl/U/wnpSBcfyOPhHpEjVw=; b=PVRNfUKxpg3ZuKJrmovzG2P7kcbSMc0gt6NIGB/ZiejnTI5NPUmLWRjbQZeFetJWSj J4rA+213wek4nr9xPTCtwYlEqJ+2fyih2vUdQrwJ9u6S2bBWmtL0cldJVwm6SZOCzAWG 8XCdO4IvDqDwocCLprn2bAw5FjPJ32lXT/JE10oKHyGcxJbhf4M05ruiP3QvLgTBMz59 sOTbsoJYEpQHDzw2yUxEu1fy9jp03j8iyUMs+GF5Ly2DD2GQaHEESdTeNV6GvYWgmSVN RXmW0SUF/AOMbMslC0wdji/0fHXGh+WLfjI/vql7TbKohzfwfS2pwIS5JTPbRQiYkto0 QMaw== 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=lSs2OxjHJXvD9NUzL/owyYl/U/wnpSBcfyOPhHpEjVw=; b=RTQPVQh5uuYnAVk9Ni66fdcRm9svIzQeNUdgVPaDUPN167Ly+oR/eI3wPOCkOqq3es HTjdXVWwvp0blnvKyuZG0X8ZcjI1LgLBuDL8vT+bIVYEGA5uYXBE9e6mVIoZcVUYVHb9 MFRyQtdGrxuO2CQE+zV8Odnu24Q+W0JlwZyQlucYxDPhI2y60xz93fvrxXr0vN3y14l2 AkPhdS/2usHw1AUPAEJ+S2jIkHJdHsFaBp4Oo04BTUciYKO4LU+U6ELJOFA7OkJ8HIUF Dsgo+zaQigFa7+m1SiJQ4T/0MMCTE/9cmftHGmh3at6SCLERC/Bj5ONDvrtAF3GspGgD 7LTA== X-Gm-Message-State: AOAM533iQIDhEGNFAdQ3j01LpULrPby1/u/PRdvOEQV+lXa7zBe+j6AI eEyfLBKCu9U/YvqSCl0mBsvHW3IiDXo= X-Received: by 2002:a05:6512:2207:: with SMTP id h7mr9314803lfu.202.1625563380844; Tue, 06 Jul 2021 02:23:00 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id a7sm430360ljp.105.2021.07.06.02.23.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 02:23:00 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Jul 2021 11:19:57 +0200 Message-Id: <20210706092020.1057-12-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210706092020.1057-1-dcnieho@gmail.com> References: <20210706092020.1057-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 11/34] 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: kSy9w9Gb6AI/ 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 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 4a40929007..e339cebf2d 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -53,9 +53,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 cd7b0d941c..ed02b48c84 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -742,6 +742,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.