From patchwork Tue Dec 21 13:53:32 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: 32797 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5444900iog; Tue, 21 Dec 2021 05:55:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJzndvgKtaKIAN4yXIg8fZjVdjytsBneOvTTvN3yZI1kjNIGf4gTAUc1BGqYoSlsMuBU/yIm X-Received: by 2002:a17:906:6d0f:: with SMTP id m15mr2653778ejr.619.1640094927193; Tue, 21 Dec 2021 05:55:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640094927; cv=none; d=google.com; s=arc-20160816; b=T+BfTzDk4Pm9ZFfmo+dqLIJcG7F+Vmxh1owBozISNvv8Hnf+I1Woc0yTxAbQEf3MKY BdnPE0Hku3HS5bjUbZIzvUlOZzv540AkLxdcOe3cRmpWVa77aoguhdFprAk/hTEHLfVj hBS4E02EiiVhaEjDS4oip6VsZqCHoEvcAl5HfAAg+3EnSBY1ibbFhIm2YQSMx+5ionrG UAwCVqEGciV5CSlnm/aSXyEQdr+xYfIUW+PK44hzv2iXa4DZ3qDKP1PiHAd+d/lG9K8w Q9UxD6hewHYTiJcl/69jWaImZnrrtUPSwPAdwaqJxb24/ykWyTniUI595AuHhl9jFlFE NU0A== 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=ckchGMdpEiP1zFYFdME8cEHxrtpNiMzR+wSs5u6/avo=; b=QCcKFxtCHuY0a2EtZhoy9LYpCkn2CVyhxGg9eGZAdEnCwzkYXNJEV8PAwE1WNJvBqZ AFB6Z1ORFdTOmn5UrHmFxiAf1GVedEozGXJTM9oU7M6rwsEPlHYDpeW/sqAuma85ul0Y dhJ3ciR8ffplYygytLm81kYsrP/11tH0G/yQVXofnH47CcpT5V4m+B8sL1WNHOJgFMMS NmYZWaA/4aOFlB+L/EoDSHKDCwCHg4C/8UKmqag8uhKKGXNRgSA6ViLJ5CGPLa53YIuc ZDK4q4o18NtBg//TyciRCXZILIpIKQkMgsqhN6l2I2HxihotZyeCxvzxAgmS8CtHNnlZ THTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=F+dXnAe9; 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 hp38si8049570ejc.170.2021.12.21.05.55.26; Tue, 21 Dec 2021 05:55:27 -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=F+dXnAe9; 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 98ABE68AFEF; Tue, 21 Dec 2021 15:54:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 505DC68AF52 for ; Tue, 21 Dec 2021 15:54:41 +0200 (EET) Received: by mail-lf1-f41.google.com with SMTP id bu9so7968913lfb.7 for ; Tue, 21 Dec 2021 05:54:41 -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=LtqzHYGVuzjBr2UxmIJX18AIY5hVdJD9RAAMd5KqA0c=; b=F+dXnAe919IznYXuwlMyxjSrpHe3u6UlMP+g3kh70xeF8WKd5rtBgdrPTJV/hEWpD1 TkovTDBTQSCke44K5v/+QPbFcuLxpFgYoeXEbjVQVjXqOj5epAv5MV0ee4LNqLXwccIy 0F7INDPGRBTtknKnkukvA6j2aRecdFoXvqBnYgkj7eKXMZ+DbrEPg4EWjfRDrtKYE9jt WUjzEIAav7KZ69QjYmt6vY2m+xVSitQvUkvsfG0sMh0XTssa3kDSHhiHMqpm6/2eWtg2 WqCxyh26fWuOkDDoJ2nx4qdBlVKM1blqIqRO+ytkYRbtlX9Qi/l1VL4+Z/daCrSR8PhV E/Hg== 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=LtqzHYGVuzjBr2UxmIJX18AIY5hVdJD9RAAMd5KqA0c=; b=jT9pjSm4HTMO9Yu3RhnoGHKt84mCcuTrnqGdIJnmIzqiSwz3KODr0vCUTz05ZnVt7n aWdtzzz6oB79atkXIMpJsuNyOZtukziClMymsUweO+OCer/RHf5M+sW/uDIaGf6+jm0W 4GSj30MucXFkNKkbRuLKtRu0Ro6Txw3Cg/zBSyNC5zN2ioWg4DhxqaMrfUtYF6X6OL3p j/x1TV/071IuXvshJ/b8OEdG2lNQx93J1Wtny7bVk72Om5FDzLguLNbxK+X4fIfSzccx VzC0PfpwEH7fHIzLW7Q53LRYq2wzt5N2ek2xoKUBiNGboBfDgQ6WLOzjrmFJCfYKMioj 5hZQ== X-Gm-Message-State: AOAM530OAiRDcIXpm/Q4jmv1kzDZs+YtdEpUsEhC1MsOf3HBAQ4XtfhP caKsTTioVO2QvhEfiGf7Xp2GJsYa4tTpIA== X-Received: by 2002:a05:6512:5c2:: with SMTP id o2mr3138541lfo.8.1640094880389; Tue, 21 Dec 2021 05:54:40 -0800 (PST) Received: from localhost.localdomain ([196.244.192.13]) by smtp.gmail.com with ESMTPSA id e12sm990656lfr.179.2021.12.21.05.54.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 05:54:40 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Dec 2021 14:53:32 +0100 Message-Id: <20211221135337.1348-8-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211221135337.1348-1-dcnieho@gmail.com> References: <20211221135337.1348-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 07/12] 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: 8psufG+Yr6jE 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 e1702c8519..8dba04a787 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -197,6 +197,80 @@ 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 +316,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 +362,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) @@ -308,12 +390,25 @@ 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) { + const char* media_type = av_get_media_type_string(media_types[0]); + av_log(avctx, 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(avctx, AV_LOG_INFO, ", %s", media_type ? media_type : "unknown"); + } + av_log(avctx, AV_LOG_INFO, ")"); + } else { + av_log(avctx, AV_LOG_INFO, " (none)"); + } + av_log(avctx, AV_LOG_INFO, "\n"); + av_log(avctx, AV_LOG_INFO, " Alternative name \"%s\"\n", unique_name); } } -fail: + fail: + av_freep(&media_types); if (device) { av_freep(&device->device_name); av_freep(&device->device_description); @@ -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;