From patchwork Sun Dec 19 19:21:29 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: 32733 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3695759iog; Sun, 19 Dec 2021 11:23:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJzyxTUIa3OcKKWfs5Uz/ct9jVhyk5zO4SB3OHEy/ahpoadj5uG3TeDn0WgD3qqC7uKTnm0N X-Received: by 2002:a17:906:af69:: with SMTP id os9mr9809793ejb.656.1639941806011; Sun, 19 Dec 2021 11:23:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639941806; cv=none; d=google.com; s=arc-20160816; b=unGEBQLimQFn1pm8UxMyqd3PeWjDHYpnCw0251leJ3GlRkSQwqHa+uwMw7EnAEAE79 UygE2oqE7hJhKpER/zeUfdBvUlDzOkyqSfQ2FhcqNvDN20a1M82CneH8H+oob/KHA2SE FFOiG0ZytFHSuDbrqXdJil1NByNUjwN8LyVrlfgxB6eZ25i6gWQ9CZ3e7hlbrsTFcHIh HkiHIQlDVRXSg5SZZzjOJbgSjiL/U4IAsSvEaZzlUybr9VCYz4BywgcK6PYosKmEC6z6 wF3EnSaz/GE37D9fLy34JiucSw84SPXaE8g8cSDARt7ViTtlhDH8DF2iKlPxSqqDPJgb qEQw== 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=P/Nb+R18r7YiYrlW0B0+ap1kvBaWBeFlqtv4rvWiICE=; b=omfkF6PMzMBgBZwXwL9rAXjKwwtgbITLFfJ/4RN4EmYekso4NtGObMPFthz4kk9Z6m ZSbKb5EgDIn/tt5WTzaj++TY8DIKLSCxKI7TgUr4zE8ou8xxHYqwWSgu/EjXv2rCYKbQ NULeKn4IQIxNxJF6+17M5QTq2kEr2xilZ+npyfh1qSowHciYTi3FeNE4uIK2sLYPew6J LJ9RfpcOUM1ZcOMCw8sFBs5IsKmMPPi2bnEFT7Nr0jvTkENbXgPpDpSp0+jneGg4xXkW zsy77xbej3QyZT5+s7QpHA15gmQj2XAZF6kCC+ao9q8i5RP883ir7W80pGj3UyEJVa5e 4lbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=lPf3I4LU; 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 hc44si8847734ejc.674.2021.12.19.11.23.25; Sun, 19 Dec 2021 11:23:26 -0800 (PST) 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=lPf3I4LU; 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 D2A0668AE8C; Sun, 19 Dec 2021 21:22:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B70368AF86 for ; Sun, 19 Dec 2021 21:22:45 +0200 (EET) Received: by mail-lf1-f54.google.com with SMTP id d38so17056978lfv.0 for ; Sun, 19 Dec 2021 11:22:45 -0800 (PST) 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=Orw5EJxf/TzKUx8s11toOLkErxFmfQr8jVi7Kb/rKMU=; b=lPf3I4LUMUyT2+qKk72Muy/roHITMyUn5u59b33wBDbomfrSsjwu9x88nqZL0ttpyr 8yge89W4Pr4SKrunWQdpVHeUH98maA6JG84+H0A65l7K5NZmsak4cC/GCGBsX0SDNnIw +WT+aXU2cA3Hs56uNRh5EMU4RcDq7OhCoNi4S7MHen8ksAlbAamg+V1GrsEtxEMMiXkm MhQoKfOYmbERsw20MPPg3hRpDrrX4JGG1Ai91zWXSLUz5JtnHdMl6Mw7jkFveEuu7uFt Q7fZPPiwVNKzWjl6Gl0BEEQOVVKPYzMtOPaO/cb0WshizmUCbGx0wk9zxqEiQrESgGW2 d3EQ== 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=Orw5EJxf/TzKUx8s11toOLkErxFmfQr8jVi7Kb/rKMU=; b=DyFAjCWs+uaEMXTBV03K6slEn/latfzpc0iPz2bEZsqkxemgeqEfcJsswsvbztXTA8 mV4g0+nl0c+pRYjGoUypXnaDxuxiHKRseBfiYxLlWX1x+H7BcG9kY7m8YWX/0JQwKZhF ELZDGK7cb7R2ZJo0L2lh61LXXG8K0I4ct1Of3rWKieKQLYH9vhYkCwV4UjwjTMYJ4gMg DeWJAtT9b4E0syfQHExeoRVqelgv1V4lquJ/WbqneOCsNdSY4Yd87e7xRxV0mj/SsjLy uKxlbstrwv0FK5uZZQik1K0ZVm1QuP8E3DtXb9ziL5MkQXBuQ1uu0RJf5SdrT0hX4WRw ZacQ== X-Gm-Message-State: AOAM533lpFAW2brL1SjYPnPuYTUyXM4P6yV/hsiDr97pGkPOB4+WkD4k NKJAOI+rOaCgEZDws7+fj4Ai04BvmjW0uu0E X-Received: by 2002:a19:8c45:: with SMTP id i5mr12436937lfj.307.1639941764682; Sun, 19 Dec 2021 11:22:44 -0800 (PST) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id u23sm2342037lji.56.2021.12.19.11.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 11:22:44 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Dec 2021 20:21:29 +0100 Message-Id: <20211219192134.1296-9-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211219192134.1296-1-dcnieho@gmail.com> References: <20211219192134.1296-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 08/13] avdevice/dshow: list_devices: show media type(s) per device 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: rxmqwrFBUpr2 the list_devices option of dshow didn't indicate whether a specific device provides audio or video output. This patch iterates through all media formats of all pins exposed by the device to see what types it provides for capture, and prints this to the console for each device. Importantly, this now allows to find devices that provide both audio and video, and devices that provide neither. Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 103 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 98 insertions(+), 5 deletions(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 8c257ca8e7..f25537db5c 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -197,6 +197,79 @@ fail: return; } +static void dshow_get_device_media_types(AVFormatContext *avctx, enum dshowDeviceType devtype, + enum dshowSourceFilterType sourcetype, IBaseFilter *device_filter, + enum AVMediaType **media_types, int *nb_media_types) +{ + struct dshow_ctx *ctx = avctx->priv_data; + IEnumPins *pins = 0; + IPin *pin; + int has_audio = 0, has_video = 0; + + if (IBaseFilter_EnumPins(device_filter, &pins) != S_OK) + return; + + while (IEnumPins_Next(pins, 1, &pin, NULL) == S_OK) { + IKsPropertySet *p = NULL; + PIN_INFO info = { 0 }; + GUID category; + DWORD r2; + IEnumMediaTypes *types = NULL; + AM_MEDIA_TYPE *type; + + if (IPin_QueryPinInfo(pin, &info) != S_OK) + goto next; + IBaseFilter_Release(info.pFilter); + + if (info.dir != PINDIR_OUTPUT) + goto next; + if (IPin_QueryInterface(pin, &IID_IKsPropertySet, (void **) &p) != S_OK) + goto next; + if (IKsPropertySet_Get(p, &ROPSETID_Pin, AMPROPERTY_PIN_CATEGORY, + NULL, 0, &category, sizeof(GUID), &r2) != S_OK) + goto next; + if (!IsEqualGUID(&category, &PIN_CATEGORY_CAPTURE)) + goto next; + + if (IPin_EnumMediaTypes(pin, &types) != S_OK) + goto next; + + // enumerate media types exposed by pin + // NB: don't know if a pin can expose both audio and video, check 'm all to be safe + IEnumMediaTypes_Reset(types); + while (IEnumMediaTypes_Next(types, 1, &type, NULL) == S_OK) { + if (IsEqualGUID(&type->majortype, &MEDIATYPE_Video)) { + has_video = 1; + } else if (IsEqualGUID(&type->majortype, &MEDIATYPE_Audio)) { + has_audio = 1; + } + CoTaskMemFree(type); + } + + next: + if (types) + IEnumMediaTypes_Release(types); + if (p) + IKsPropertySet_Release(p); + if (pin) + IPin_Release(pin); + } + + IEnumPins_Release(pins); + + if (has_audio || has_video) { + int nb_types = has_audio + has_video; + *media_types = av_malloc_array(nb_types, sizeof(enum AVMediaType)); + if (*media_types) { + if (has_audio) + (*media_types)[0] = AVMEDIA_TYPE_AUDIO; + if (has_video) + (*media_types)[0 + has_audio] = AVMEDIA_TYPE_VIDEO; + *nb_media_types = nb_types; + } + } +} + /** * Cycle through available devices using the device enumerator devenum, * retrieve the device with type specified by devtype and return the @@ -242,6 +315,8 @@ dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum, LPOLESTR olestr = NULL; LPMALLOC co_malloc = NULL; AVDeviceInfo *device = NULL; + enum AVMediaType *media_types = NULL; + int nb_media_types = 0; int i; r = CoGetMalloc(1, &co_malloc); @@ -286,6 +361,12 @@ dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum, // success, loop will end now } } else { + // get media types exposed by pins of device + if (IMoniker_BindToObject(m, 0, 0, &IID_IBaseFilter, (void* ) &device_filter) == S_OK) { + dshow_get_device_media_types(avctx, devtype, sourcetype, device_filter, &media_types, &nb_media_types); + IBaseFilter_Release(device_filter); + device_filter = NULL; + } if (device_list) { device = av_mallocz(sizeof(AVDeviceInfo)); if (!device) @@ -306,12 +387,26 @@ dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum, device = NULL; // copied into array, make sure not freed below } else { - av_log(avctx, AV_LOG_INFO, " \"%s\"\n", friendly_name); - av_log(avctx, AV_LOG_INFO, " Alternative name \"%s\"\n", unique_name); + av_log(avctx, AV_LOG_INFO, "\"%s\"", friendly_name); + if (nb_media_types > 0 && media_types) { + const char* media_type = av_get_media_type_string(media_types[0]); + av_log(NULL, AV_LOG_INFO, " (%s", media_type ? media_type : "unknown"); + for (int i = 1; i < nb_media_types; ++i) { + media_type = av_get_media_type_string(media_types[i]); + av_log(NULL, AV_LOG_INFO, ", %s", media_type ? media_type : "unknown"); + } + av_log(NULL, AV_LOG_INFO, ")"); + } else { + av_log(NULL, AV_LOG_INFO, " (none)"); + } + av_log(avctx, AV_LOG_INFO, "\n"); + av_log(avctx, AV_LOG_INFO, " Alternative name \"%s\"\n", unique_name); } } -fail1: + fail1: + if (media_types) + av_freep(&media_types); if (device) { if (device->device_name) av_freep(&device->device_name); @@ -1186,9 +1281,7 @@ static int dshow_read_header(AVFormatContext *avctx) } if (ctx->list_devices) { - av_log(avctx, AV_LOG_INFO, "DirectShow video devices (some may be both video and audio devices)\n"); dshow_cycle_devices(avctx, devenum, VideoDevice, VideoSourceDevice, NULL, NULL, NULL); - av_log(avctx, AV_LOG_INFO, "DirectShow audio devices\n"); dshow_cycle_devices(avctx, devenum, AudioDevice, AudioSourceDevice, NULL, NULL, NULL); ret = AVERROR_EXIT; goto error;