From patchwork Mon Jun 7 23:04:05 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: 28135 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3886831iof; Mon, 7 Jun 2021 16:06:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysFZ3TwFNJhUBJbyLL4Dn2atYAQlYRT68nPWcyo0eB0kqYtQ7Ue67fNzfhI9l8/nCv+And X-Received: by 2002:a17:906:ae91:: with SMTP id md17mr20894855ejb.433.1623107178954; Mon, 07 Jun 2021 16:06:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623107178; cv=none; d=google.com; s=arc-20160816; b=y65INKRYuVPIl+VeoQDBy7t0Iem2rqJeZenRogT3ewWsCVRIAIImu/eY4WdSPKUd5g fniLzBM6mdSEtHROzcOlx1yZm/Ox6INVO98sE463Fw5/pB4tITlcFTvpOEdmyyhXS/Ku QI3SZDi2Nn4UkJu6z66gaoPPOMqRmSj5/vtkd9FfHt3edw68A2CvD2pgx272ZNY5Vnb1 vgL1n5lPXvNK0oUYFvxJpabyXzMhkp0krsoYJQw3mHx1QKisW0HJPAZeA7q8E8RDo4OX t5yOW4HQqH4zA5xacVmf9jyXHl4D4HDknzURCJcrTMOpsCU45v8i9m1CIQfeG7NUwByu MKOg== 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=bnd/zRI0Jmme15Ta46WmA/JfEXbu0OJsjFMIywX0F48=; b=UJ1nsQLYf00RR0T9PTdIbnvrYvc2T9NgR31QeKVZswZtAEG/Ev59hK1NHRDmNCuZJf nIlsg0GG2wKLgeeOEVGrioisNUZ84ZJwT78LIQ8cJkPSu9pYq4d2B2khr1PN5l0aGmpl gOCdx8zYnwuCIsZ4PSLjyRkqnmKX9nTyQucyMNmZsj4j7V0+/ApHPX9Vi/5N0XNX5Tyb pKnvHN4OOLOjloMefQfT+8ISj1LzkQLf8j/PgcHN6cQ1/4aCa0S5FxWxk8HGythjDKW7 rocVGEAoeVUj92MD3XbGj+cFHqMDoyF5a262KKZGbbiJ7oMgLiqqbEP3ZmtER4vQB3jN 7rDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HA5dD6Pa; 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 y3si6842383edr.383.2021.06.07.16.06.18; Mon, 07 Jun 2021 16:06:18 -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=HA5dD6Pa; 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 EBEC6687EBB; Tue, 8 Jun 2021 02:04:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29030680BAD for ; Tue, 8 Jun 2021 02:04:51 +0300 (EEST) Received: by mail-lf1-f50.google.com with SMTP id m21so13271991lfg.13 for ; Mon, 07 Jun 2021 16:04:51 -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=Hudq24CVdXclAlL3gXpQklvP2RodUiETeAWyipBe6Kk=; b=HA5dD6Pa9uKwYOFAdhPVUuvHvT7ZOUwaB7MBXAGkXuNbCL42qqRJtjmg+T4/x1cq4E B0wad5WPP+DSPBUVM9xILASW3gCITdWkFATPCk/8LU6lq9fm6rHD7fH8Id3cqSZvgGp8 t0667ihRsDQYquQ4QSFOsFZs9wbuOY3FGoszPYAMa2YvQgN2uucXKZDLrMOsidkI2SXY Y0wf2lEwshftClqlFqJUuoiB5o3EUsTIfGll7dnmhBmzTF1joxIEI39QJvkeSRQursYO YNbcCieJriPWfoO+pdwuaChn2zC9K3jn5O5b1pjr65xrmKWExR1177+8vmL7cm2CsagH aIog== 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=Hudq24CVdXclAlL3gXpQklvP2RodUiETeAWyipBe6Kk=; b=W6FMSXMnG2fjZpHBmaoArTis2P53omVFU9tm7076OurGVEtr2FJF4SIPL0BbaLYP2X t24pptvNZfOflla5gKIxgSr98syMsrSJdDzLfqwO5FtVlxntx5JXiNXDUMKZsSm6LtId x6g1nw1FgSF1hsjB6u874uS0wb7WTUeTVhst0iQhqaLQZeBlwLt6C0Qo49ScuVHFCnoT i+uQAAbJOKln4Gr7J0wrrgaqk+dhERVWZ+Q0OJw9gsXF61dDu9qXvowAWcU7SsbQOdrx gW/9oCn5oGOYRSZ/3YLFICZQ9iXVtMnO0SQ8+VZdEtBBqcKMkgBrk9wwVZBrInuQdnER GZWA== X-Gm-Message-State: AOAM530P/Qiz9RPS8/BjgG2yJsMUBIAArMVWpqat5sNfyNeOVoPKwtFl jNVlI6lXIuKQtpNG3Pe4cc3AvkU67jrpCw== X-Received: by 2002:a05:6512:32a5:: with SMTP id q5mr12821778lfe.171.1623107090973; Mon, 07 Jun 2021 16:04:50 -0700 (PDT) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id v9sm1999563ljv.131.2021.06.07.16.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 16:04:50 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Jun 2021 01:04:05 +0200 Message-Id: <20210607230414.612-27-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210607230414.612-1-dcnieho@gmail.com> References: <20210607230414.612-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 26/35] avdevice: Add internal helpers for querying device capabilities 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: uiK+pRAC6Ra9 Signed-off-by: Diederick Niehorster --- libavdevice/internal.h | 31 +++++++++++++++++++++++++++ libavdevice/utils.c | 48 ++++++++++++++++++++++++++++++++++++++++++ libavdevice/version.h | 2 +- 3 files changed, 80 insertions(+), 1 deletion(-) diff --git a/libavdevice/internal.h b/libavdevice/internal.h index fe4be64ee7..10e1cdb80c 100644 --- a/libavdevice/internal.h +++ b/libavdevice/internal.h @@ -58,4 +58,35 @@ typedef struct AVDeviceCapabilitiesQuery { */ extern const AVOption av_device_capabilities[]; +/** + * Enumeration indicating which device capability is being queried. + */ +enum AVDeviceCapabilitiesQueryType { + AV_DEV_CAP_QUERY_NONE = 0, + // both audio and video + AV_DEV_CAP_QUERY_CODEC, + // audio + AV_DEV_CAP_QUERY_SAMPLE_FORMAT, + AV_DEV_CAP_QUERY_SAMPLE_RATE, + AV_DEV_CAP_QUERY_CHANNELS, + AV_DEV_CAP_QUERY_CHANNEL_LAYOUT, + // video + AV_DEV_CAP_QUERY_PIXEL_FORMAT, + AV_DEV_CAP_QUERY_WINDOW_SIZE, + AV_DEV_CAP_QUERY_FRAME_SIZE, + AV_DEV_CAP_QUERY_FPS +}; + +/** + * Find AVDeviceCapabilitiesQueryType enumeration by means of options name. + * Returns AV_DEV_CAP_QUERY_NONE if not found. + */ +enum AVDeviceCapabilitiesQueryType ff_device_get_query_type(const char* option_name); + +/** + * Get component name from AVDeviceCapabilitiesQueryType enumeration and component index. + * (Some options have multiple components, e.g. AV_DEV_CAP_QUERY_FRAME_SIZE). + */ +const char* ff_device_get_query_component_name(enum AVDeviceCapabilitiesQueryType query_type, int component); + #endif diff --git a/libavdevice/utils.c b/libavdevice/utils.c index d9a52c53ab..73fdc5766e 100644 --- a/libavdevice/utils.c +++ b/libavdevice/utils.c @@ -19,6 +19,7 @@ #include "internal.h" #include "libavutil/opt.h" #include "libavformat/avformat.h" +#include "libavutil/avassert.h" int ff_alloc_input_device_context(AVFormatContext **avctx, const AVInputFormat *iformat, const char *format) { @@ -57,3 +58,50 @@ int ff_alloc_input_device_context(AVFormatContext **avctx, const AVInputFormat * avformat_free_context(s); return ret; } + +typedef struct AVDeviceCapabilitiesQueryTypeEntry { + const char* name; + enum DshowCapQueryType query_type; +} AVDeviceCapabilitiesQueryTypeEntry; + +static const AVDeviceCapabilitiesQueryTypeEntry query_table[] = { + // both audio and video + { "codec", AV_DEV_CAP_QUERY_CODEC }, + // audio + { "sample_format", AV_DEV_CAP_QUERY_SAMPLE_FORMAT }, + { "sample_rate", AV_DEV_CAP_QUERY_SAMPLE_RATE }, + { "channels", AV_DEV_CAP_QUERY_CHANNELS }, + { "channel_layout", AV_DEV_CAP_QUERY_CHANNEL_LAYOUT }, + // video + { "pixel_format", AV_DEV_CAP_QUERY_PIXEL_FORMAT }, + { "frame_size", AV_DEV_CAP_QUERY_FRAME_SIZE }, + { "window_size", AV_DEV_CAP_QUERY_WINDOW_SIZE }, + { "fps", AV_DEV_CAP_QUERY_FPS }, +}; + +enum AVDeviceCapabilitiesQueryType ff_device_get_query_type(const char* option_name) +{ + for (int i = 0; i < FF_ARRAY_ELEMS(query_table); ++i) { + if (!strcmp(query_table[i].name, option_name)) + return query_table[i].query_type; + } + // not found + return AV_DEV_CAP_QUERY_NONE; +} + +const char* ff_device_get_query_component_name(enum AVDeviceCapabilitiesQueryType query_type, int component) +{ + if (query_type == AV_DEV_CAP_QUERY_WINDOW_SIZE || query_type == AV_DEV_CAP_QUERY_FRAME_SIZE) { + // special case: different name for each component + return component == 0 ? "pixel_count" : (component == 1 ? "width" : (component == 2 ? "height" : "")); + } + else { + av_assert0(component == 0); + for (int i = 0; i < FF_ARRAY_ELEMS(query_table); ++i) { + if (query_table[i].query_type == query_type) + return query_table[i].name; + } + } + // not found + return NULL; +} \ No newline at end of file diff --git a/libavdevice/version.h b/libavdevice/version.h index 53af6fa0d0..e0361aebc1 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -29,7 +29,7 @@ #define LIBAVDEVICE_VERSION_MAJOR 59 #define LIBAVDEVICE_VERSION_MINOR 3 -#define LIBAVDEVICE_VERSION_MICRO 100 +#define LIBAVDEVICE_VERSION_MICRO 101 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \