From patchwork Mon Jun 7 23:03:46 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: 28151 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3889914iof; Mon, 7 Jun 2021 16:10:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyC/ln4h5POg1SpOUbFzZACBcQjUlIM+JorEFYYeqksTpjCJqz4MsxBdsUE/PAqNkW4rPGF X-Received: by 2002:a05:6402:177a:: with SMTP id da26mr22524600edb.40.1623107445517; Mon, 07 Jun 2021 16:10:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623107445; cv=none; d=google.com; s=arc-20160816; b=aCvDrjJp2O71rTDcM6GJoqLHBhnNgBei0BY6yzHaSI4EhmfDEMxnQfSIWo1T3U5OTx EW4eVHNnAHgtrdzy/KwgxSzrv7TOQXzqbIUkiJWQWHp8l+Qd92PyTY83zYDVM2r+pbIO pmEKGWUMLszCZg4J1gzl2GTR4uzc5uC9WuCrjuefVZvpP6L0Zh5pvXk3W+drG50k78h6 Tmb3x0qQ9pVauj5I3ajb3xG3jnPIjvxIHHLe0ykoce8Z1KRWEJTZpf5n+jDzFIDl1GXP cEudWyfxKw44sHsdF7wpQnALHEADQq62DwPRTPJSEqHeEubBB6iFQCehKZ2waVWHUDIM nstA== 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=hhFq6hp+ssRRMmGA0tLg+nF0fqnJplc57K1C7Fk+NLE=; b=YUoNec0zZOVMzkEegOJWwepkhjunSn8boALxxBnuSGmu3ODkw/1ph8LnhW7RQYOn0W HFW2eNEmlo9H+qbeatJJoJMC8xEDv5OBHnot2os4uJ2/Z0G+5LlfSAUfSzlVHfWp7zp1 B/d1I69q+J/0TrJTY0tnvnLo06kpxOnjio30pkukboHrZe5vGznFm2vbkXTw2kMEDPAM 9XqNTcXZpblD4IOgFf5yd4Jl7xTuySlGMmhPAFJFLolehiHXbwSai9m/1ciLMhm9VLRd Kio/959vMvXj6EKWVKskTnvBB21hunY8frJ5P2+jsaXHn7XQ3XewmlWdZirZJmCoSFbF cO1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=KccG9101; 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 q1si14024340ejy.298.2021.06.07.16.10.45; Mon, 07 Jun 2021 16:10:45 -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=KccG9101; 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 55727687FC5; Tue, 8 Jun 2021 02:10:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA871680B74 for ; Tue, 8 Jun 2021 02:10:33 +0300 (EEST) Received: by mail-ej1-f46.google.com with SMTP id a11so28662052ejf.3 for ; Mon, 07 Jun 2021 16:10:33 -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=q8yKlHTQIoC7D5SknHSClmRWbR3S6+R58ys/tpqsGFo=; b=KccG9101KnNDC/qMUSaOuAJCr8yZHsvXQPh13lLIaWcB8DEHYXGQ4u89ySO2kKVwNF LKTf4coz3CQVq5kaL4Dp4i6eKnqGU+YT/5bhDM0kpO5coAPrSzFsmuEI22t0syESJht8 +LnpRyjcko9YRx8zDA+qEIjYGe8nuRHhPlynLNpi0LmelM3SadkroeAFCR2xoaulANjz rPkZ409T/zdc1zi7IE0lKJUY/lWM4k8r9k5ZobYtq6SwtevoxSwEj5gylEfzQkV/ojs6 jNTxCG/lEvj6UJ/VN2e807U/qdEUVYRjXH0z22VTykw2ie+s1jgOJjfYbmGBt6CwJyFE Oj1Q== 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=q8yKlHTQIoC7D5SknHSClmRWbR3S6+R58ys/tpqsGFo=; b=FoBe8SVtQBR49xmpi5UgJ9ela2Ur4UXAOFzbVSA3XMLdFseWQwIioezv/s/ekoqEh+ wB8KHcgunFbDqgZen27LKYDRztLs2mz6KAA0Zwn32wRBveiw+FamPCwdvjFeEOaZ0AOh 6iCLdyQTG7q6F1jE75oiaPKqN98JEXlncj3171Hw5St6KswQcpkgQiqQTKc+kOeuT3zC UFXFwwGBypUcA8NLscFtC5BQjAtRn34mpxGBout0JCHhGz/RaxC0mb5MQ0txQiDcpwXM /HXDeeU9SS9ZhAu6MJoDCHYSh3YENeBgXt2SGsUgWfx73ZedfppgL0JRggNO2WwHfzkY 4zgw== X-Gm-Message-State: AOAM531r9hjaxyHueRtU48ott5XWeLGih79mTzFK0xB193WoOuC05Cvf laYSJrkeBp/r8lRG7sHhH/P+D7KzWjtRig== X-Received: by 2002:a05:651c:308:: with SMTP id a8mr8012614ljp.330.1623107073697; Mon, 07 Jun 2021 16:04:33 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 16:04:33 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Jun 2021 01:03:46 +0200 Message-Id: <20210607230414.612-8-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 07/35] 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: uAEv8rQzFM1e 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 25de6b1acd..5d7f065a8c 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); @@ -1194,9 +1289,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;