From patchwork Wed Jun 2 11:28:56 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: 28049 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp456715iof; Wed, 2 Jun 2021 04:29:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyitukjEf+VcUI0cWTZtVZhWu8bKhVQGiu28Q1aYaorwDvKeCYTCxKJJZR/CbMxEf85Slc9 X-Received: by 2002:a17:906:1912:: with SMTP id a18mr6358849eje.117.1622633384143; Wed, 02 Jun 2021 04:29:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622633384; cv=none; d=google.com; s=arc-20160816; b=ETuvi68v/L1X8kvykWYpKUp+1o20MKVGeVAWSb50xfN2BsAHAOAdS6O/RgNM0/UtqB apd28fmBWxNitGM39Rv3dYy/4nEPhVr/6z11l+VmhsyZncb1XU8ymBAL/bVwS5gMEzsN EISzlrzlPoQ/KWJVYC2jIk+5cU4DtyEp5VQpuY+lqgRsEhGW3KOmjYPX5cnyCMSgokib fRmPXBcvOHV/kTREkzdDhhJ+oetpO5Eb1exO+b7xoLHUqMn6Sf1NesXKcjVfhSDiP7Hy xlUaZAXYdhQxkC6d3zGr5/W1K+vywjV2hCI79oS6PN+5NHw8yg3LqPpswgaMdZUX0vu8 w4xg== 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=d9p0lPZzZi/hRhzj7ZVSaZiKwzgrnpyYgqY1Lvulkkk=; b=lWxikvlRFU+c3rhdydAWQs4lQmEIwPzYV496L9eZsh8B55IC4cU8XnkIylTHAjzGgD n/IOukR3S2AHTEtG6deBUoG8KNjSUFvNyRHjhws3R6PQ3svCeLFFS80olyfgX85As37Q 76YWaQL2DS1fAbUctfnSwZP4mKhA/2KU6MzUBiC7VqLg5VGfT4g5SI+vkjhR15H4yjCv nR/Msog6PJnivAC3MD5WuJFQdFLfDWRVOAwRZJszIkVMzmJcO13lgfhLp7Gljm2qOb2s 0pdShL6Hdyqp7VMwB2WNlYQ5NeVikOkG5V8EEGAyZrnuGqyA6mdMFZaQn3Gw+NTvnabt 76+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Y68vj7x3; 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 n9si1753624edd.98.2021.06.02.04.29.43; Wed, 02 Jun 2021 04:29:44 -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=Y68vj7x3; 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 1AB2B68A037; Wed, 2 Jun 2021 14:29:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28DE36804A2 for ; Wed, 2 Jun 2021 14:29:21 +0300 (EEST) Received: by mail-lf1-f46.google.com with SMTP id j10so2786764lfb.12 for ; Wed, 02 Jun 2021 04:29:21 -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=8FZ/3mPjoi+sy9OfbHiUqSdbm5jYHI4/2O9IuPgAQgA=; b=Y68vj7x3+ediV6KN3+LST4ODaUf7c/ow8hfwkFGQ5ley0XCTjEzV2CwOp0FYWvBdp5 OQPX8gHK8Qe2aiLrviVPHENJAACFXyL5h/IXmlBqvuRRkf1ful2Jg4Q3BnH01/FAJ+GL DXzlJtkEjzsOMRNjQO93lR/EOE430gHWYBEWHpnp4guqsf+13rr+5s0FsfYzBcKRDLOF 1w0Pc31hVkTr0PiV8miGqlIQLR7KEgjIFHs9WUiWYOT/vAsaLJdciol4O0+LtL5SY81i E+mEJGVOSRFXY9eEurrrd2+IV+Zsk9O43xY9XxYwfn1w5g/kaznCikBoOy/fnmjH5Ln0 khlg== 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=8FZ/3mPjoi+sy9OfbHiUqSdbm5jYHI4/2O9IuPgAQgA=; b=IaKWjDB7DW0dxVZI10FRClUc5Wt+RRxNFhVzAJ9kKswvLvrigCna0kkZoMEII22lPg Q0W7LITve4R9rGAdA8VfD1AShCfFRbccNh9FKIO7LA9o2htI9EbicDSaReyyn8K+xOgi PJMFn/s9RUYDVIM/1M9oujJZ1XieU54qC7fcPBMEBBRE8LqEt1GeEnNZn+A7gBtr1riK tgqV3koI/IPPmdaWpUG1OE6kXWmQihEOsZNGeeouAnahPoH3SyehUhYRul5OO8To9mjd AHCEWa0obHhsxMEDDFPV0tFHtAfCG0w41gjTMyRJV60oqU5UhK2gyZJc0A++y3niFmAn lqpg== X-Gm-Message-State: AOAM53154cuqd+tuGUt5LROhrHMSNXsGXW92muYAfJSegz1ksKf396E+ ND4Z0AAEJebwzE2WXaDP/iRTgFyrEqW5gg== X-Received: by 2002:ac2:5ddb:: with SMTP id x27mr22300916lfq.31.1622633360271; Wed, 02 Jun 2021 04:29:20 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id v6sm1249497lfr.182.2021.06.02.04.29.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 04:29:19 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Jun 2021 13:28:56 +0200 Message-Id: <20210602112901.2163-2-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210602112901.2163-1-dcnieho@gmail.com> References: <20210602112901.2163-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] 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: SN8KrefXkPJT 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 | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 22b7595ab1..cee4b0cb0d 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 a28ac372da..adbdd712a7 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -737,6 +737,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 5de0814316..7f02e18f24 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,8 +32,8 @@ // 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 2 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 3 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \