From patchwork Mon Dec 13 07:21:38 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: 32408 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5073212iog; Sun, 12 Dec 2021 23:23:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJwG0dCdHsqnj7kpIOH4LNoBeP2sc4wQvp1CvDIMpEiUlg8T4HYRlHi7JZtaYxi6NMy0+Ges X-Received: by 2002:aa7:dc15:: with SMTP id b21mr63236684edu.237.1639380212156; Sun, 12 Dec 2021 23:23:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639380212; cv=none; d=google.com; s=arc-20160816; b=L1cyjllu4IXaEVJQ7f2MV9HxQvTBGzAQJ7n3PsnsUKynqzWJYkkZnN1N/LilmAd6b3 n1H+63snC0taFeS5nNcdpsLnuxQMKWrlDpGzLo31fcJzRJ16XKKh27dAFvi2hAypIzO3 CSjWcuiSGzHZwRV9kHA7w/IqWTQh+FmuksZsAwHobWzFqJMF67o2xUP3zPhrOtYplRyC gS5Xwl9Tsmf9XMYBKbE0Nn9ESsbohvx71e7DwfRTUg+olHq5Y1fjYFhgUaA4/ueYauOj Mx+4UTaGzXTWh8uqvQgq5YPS4mktXw8NHp4ZWukQBBW8Z+wjIJiVISvmUwpUvJL96HeO zyiw== 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=ep0qABdxjg1h6CLbCgDLgcQXY8yyFa5UpraZH4jfw0CJBZMHC3Vj3QJ85yO+XBjl4b jnwhYZNkvaauv669+9jqNFgjuI2zkdH3nYC5NMfKhzIhcgTkt6a+LF8AAxtuZea3xUAH rTyQFgO+4pCzLTV8k7bCYt3EZclhvIlWiBeGL6+Box6DKpBkMyYhKhg5NdoATSz35Kqx +hjcD1ypnu4NgdgxSw9MW5l0hoczqMZkFuqcvbu4HhFLPyAoZ0hnJWNizj60WH5wF6Pb SoLvcRYPgajTL92hHBYf7zdzTma5ZWuaMAlj5xP9eeaE7gwa/pCAKzCArvnGD+zPoVKQ cwIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=q6rYa5pT; 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 cw13si18339349ejc.125.2021.12.12.23.23.31; Sun, 12 Dec 2021 23:23:32 -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=q6rYa5pT; 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 3A2D668AEFD; Mon, 13 Dec 2021 09:22:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E25A68AEFD for ; Mon, 13 Dec 2021 09:22:55 +0200 (EET) Received: by mail-lf1-f48.google.com with SMTP id bi37so29096156lfb.5 for ; Sun, 12 Dec 2021 23:22:55 -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=q6rYa5pTqk8piUnlMl6oBH4toL6Nj/BltZGQOePxQwF1F9u5nZt+A6WY2BROVhSQKn 6VcWkF3BaybpbYJa9Om2xWSS7Ms1m308CuOlKpQ0wGRdlMUMRLpDBxaP2mw323BAs7w0 WoNA/1jgN9NH29zHa0YWO2wj2SDQR0QhjVyDpQC5QhnaYwJX6RtidAUbYpXick/BaTO/ 7S2+N8530NCed3Pz8Dc9P0QlRzSiKUicCYYXKVfZWL5ip4UMfGtEgWSnotRngSPT+nBL yl5+0UuBa5Zp2PoH2xHqFgf6KqUukky0z2siVfyq85jtiMd75FEYi0vimwozztNjKYUI HzPQ== 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=dhLVb9kVgKJr5m6qtGf/QkLGVqWDidRN7xX08Z+mHPD/Z+rv5MfG+z+uKX2dcPAap9 b/IvNlQiZ0VKdZNQ/AnTz3CS5HBqyh5sgQFOD7xnaDXT+DrudVJBTwsvCiqZv+ntxAau ZpVJfZv+UxQEdCaNgUWcZel/hPyCGYealY2S5qAo9Nk8jP8+0oSu44hrSPQp5FqgxF8k aFw0G1ReSLNvePpGsx5OvyB0kmTh+OZbv6/qjH/kXHfsm6S+eIMQao3bef8APui7aWmw iT0n5T8ntbvKsH//rNQmurwuvfUYbGNTZRQZT4vACw1k8E/OF1PF5c1Bygn39RfxWT6V tJsQ== X-Gm-Message-State: AOAM531NAvL2Ffq8hCBrP4EQU2UY6tlf8XfWR1q0vdu43nj8GuYszUSs W/jD4b04Anqb75ziXhBSk5qxts2vVK9XVQ== X-Received: by 2002:a05:6512:3402:: with SMTP id i2mr27565935lfr.447.1639380174394; Sun, 12 Dec 2021 23:22:54 -0800 (PST) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id x133sm1309366lff.282.2021.12.12.23.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Dec 2021 23:22:54 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 08:21:38 +0100 Message-Id: <20211213072143.993-9-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211213072143.993-1-dcnieho@gmail.com> References: <20211213072143.993-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: MEdiO56YOyDy 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;