From patchwork Wed Jun 2 09:13:44 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: 28046 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp362289iof; Wed, 2 Jun 2021 02:14:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxiC+72CK/vFK8/bXMwAiiVHSpFH9KdVgKK5u85WFe3jQ66g4pdS1Ov8JqKeX+UZAwyjlhh X-Received: by 2002:a17:906:1f54:: with SMTP id d20mr32783511ejk.94.1622625251297; Wed, 02 Jun 2021 02:14:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622625251; cv=none; d=google.com; s=arc-20160816; b=dstkWfH7e6D3/VKUTELBLKd9QXzBgwbXXYcMN1LUEaOScx1o2ehTm1Q3DHTHS17x45 9hVvCfFsCK7Xw/+5lHym4eBg0GSDSdjWU/Wy4cNuhsncLalCb8yZa9ytpyCd/UXiJz0W 6ry+G/5AdQ5OF+Okv5CnOQMLo5rET6bGcELAdnGmEgHr8XPBqQy+WLenq5cr0VkQXcIE P2hgsFTHQyzMMtrghJ3ZQ8IdiUUBR5rQxk6Ka6FBwXXGQan7awmfSyJxRoX6xPODnbtz ibAkuAT6jBmiNFlVAJ4jGgtyNQPw7wAV1rtDCXF2AwZUVWRhxyTe3xFnRbGwQiDNnI8+ jJug== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=18k1mZwumS7GDcaue9RCXjauKWxoEQ75sjE2omL4m1c=; b=Qha3rQVzTuwO7zf8gFFacHknmIAK4HHScQh3zDdDTRkjqP0c8vtpToI1AylN7RdI3y Q1CSY6BrOPXYKHjj78r5N3Q6w1Varvx+CyDIQunYPgDygYANAjBT31bONTWcLr0IzJq8 /5SCxd6E5TmzUayDKX/0sNnOBEqAMSPGVUzq2k7o4h5EuC2GVWq5sEGNRf/2vRjl+oqr tEottt6VOTRYnreCNAzv7ncm/3p2v927lmGHlhSH8Ac7CxjRwgGpu+dhYn9vg7Q7713J 7nBKrOyYrZ10GEHACAWwnJ7ubUqi0H5jJOZVXy0Afz0QuqOulbkv7dlYBErFwPCgATwe Fehg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="NHT/GAUm"; 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 h4si1564781edw.146.2021.06.02.02.14.10; Wed, 02 Jun 2021 02:14:11 -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="NHT/GAUm"; 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 92A32689F8E; Wed, 2 Jun 2021 12:14:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DB9268995F for ; Wed, 2 Jun 2021 12:14:00 +0300 (EEST) Received: by mail-lj1-f174.google.com with SMTP id m3so1656186lji.12 for ; Wed, 02 Jun 2021 02:14:00 -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:mime-version :content-transfer-encoding; bh=4x51t0ISCqCVat5tq4SWmDUPoENnb5+i1NdGYgA/PvM=; b=NHT/GAUm7QXrCRslOtcuQMi0qZdsY2Dk5puZuCHhlHP1KL5Iw1h87sJeZxwdHi2bCV gYZy8WoSdNZinK5iuI7w37YzoSp3Gs/Imyd5xbhKZUUXTqt0NV6r9Pg6dUJQBH3LU8aZ JGKLUj2tasselmbMygPoZz7Okni4BpRNaVYbmkN5nhUyJB9DhS4MgEmNR5p5PqEDXETu TyTjl0i46wLxC/H2Q5QlWax/fs23CU56ErDPgvwkBz+ewhbgIIqDNjtEkKXxUOUHlKe+ BCvhlbjFRXddmJ0s2koPMnAaxSec9C+91CkYF4GVv5kAn7kCHAaevqH7LFBL+T7t+dhE pA0w== 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:mime-version :content-transfer-encoding; bh=4x51t0ISCqCVat5tq4SWmDUPoENnb5+i1NdGYgA/PvM=; b=qFgJ+JTNKx5Exi7ldYCP6r3pO25bZPA80HN4VY5s6eR69i+3YwAvBpOOtFx5R8Ylnn gpVDPWxHKL7LDxpba9RyUBmcwP5uVBZMDvMFEmGib29AcyuL7KqUtBX9kci2odPUmS9P qlneqo2/lf46N5w7xa3qUHtSFYSILCQdPWzGrUFCe6eXdxUWZkTF5Wf0U/MxCjwYIP0b 8q3q29ZIjqks4cuBF8O/ep/nv/FKrzFtH7Mw3gRa4kfhOO4zORro39aTy1EL6XGksK1X Q9zmVnL77KNdnWFDFFowXAQG56RWyR8FsuqW2gDv9QtyVeJ80VaSafIo/KfkMvyebmOB vALg== X-Gm-Message-State: AOAM530CgJ4HvZRPVScZhqU4cTaVWl8Lim4kosLkRFJ5hju7Ktf7d57/ gUazmc7wZ99MBxNEQMYvcS7AB9Z/u6eOPg== X-Received: by 2002:a05:651c:1798:: with SMTP id bn24mr16375920ljb.72.1622625239116; Wed, 02 Jun 2021 02:13:59 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id f39sm230113lfv.290.2021.06.02.02.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 02:13:58 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Jun 2021 11:13:44 +0200 Message-Id: <20210602091344.1936-1-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avdevice/dshow: implement get_device_list 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: o0krE4dDaBGx Needed to enable programmatic discovery of DirectShow devices Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 68 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 8d0a6fcc09..c17299722f 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -202,11 +202,14 @@ fail: * retrieve the device with type specified by devtype and return the * pointer to the object found in *pfilter. * If pfilter is NULL, list all device names. + * If device_list is not NULL, populate it with found devices instead of + * outputting device names to log */ static int dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum, enum dshowDeviceType devtype, enum dshowSourceFilterType sourcetype, - IBaseFilter **pfilter, char **device_unique_name) + IBaseFilter **pfilter, char **device_unique_name, + AVDeviceInfoList** device_list) { struct dshow_ctx *ctx = avctx->priv_data; IBaseFilter *device_filter = NULL; @@ -238,6 +241,7 @@ dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum, IBindCtx *bind_ctx = NULL; LPOLESTR olestr = NULL; LPMALLOC co_malloc = NULL; + AVDeviceInfo* device = NULL; int i; r = CoGetMalloc(1, &co_malloc); @@ -282,8 +286,24 @@ dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum, // success, loop will end now } } else { - av_log(avctx, AV_LOG_INFO, " \"%s\"\n", friendly_name); - av_log(avctx, AV_LOG_INFO, " Alternative name \"%s\"\n", unique_name); + if (device_list) { + device = av_mallocz(sizeof(AVDeviceInfo)); + if (!device) + goto fail1; + + device->device_name = av_strdup(friendly_name); + device->device_description = av_strdup(unique_name); + if (!device->device_name || !device->device_description) + goto fail1; + + if (av_dynarray_add_nofree(&(*device_list)->devices, + &(*device_list)->nb_devices, device) < 0) + goto fail1; + } + else { + av_log(avctx, AV_LOG_INFO, " \"%s\"\n", friendly_name); + av_log(avctx, AV_LOG_INFO, " Alternative name \"%s\"\n", unique_name); + } } fail1: @@ -312,6 +332,39 @@ fail1: return 0; } +static int dshow_get_device_list(AVFormatContext* avctx, AVDeviceInfoList* device_list) +{ + struct dshow_ctx* ctx = avctx->priv_data; + ICreateDevEnum* devenum = NULL; + int r; + int ret = AVERROR(EIO); + + if (!device_list) + return AVERROR(EINVAL); + + CoInitialize(0); + + r = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC_SERVER, + &IID_ICreateDevEnum, (void**)&devenum); + if (r != S_OK) { + av_log(avctx, AV_LOG_ERROR, "Could not enumerate system devices.\n"); + goto error; + } + + ret = dshow_cycle_devices(avctx, devenum, VideoDevice, VideoSourceDevice, NULL, NULL, &device_list); + if (ret < S_OK) + goto error; + ret = dshow_cycle_devices(avctx, devenum, AudioDevice, AudioSourceDevice, NULL, NULL, &device_list); + +error: + if (devenum) + ICreateDevEnum_Release(devenum); + + CoUninitialize(); + + return ret; +} + /** * Cycle through available formats using the specified pin, * try to set parameters specified through AVOptions and if successful @@ -713,7 +766,7 @@ dshow_list_device_options(AVFormatContext *avctx, ICreateDevEnum *devenum, char *device_unique_name = NULL; int r; - if ((r = dshow_cycle_devices(avctx, devenum, devtype, sourcetype, &device_filter, &device_unique_name)) < 0) + if ((r = dshow_cycle_devices(avctx, devenum, devtype, sourcetype, &device_filter, &device_unique_name, NULL)) < 0) return r; ctx->device_filter[devtype] = device_filter; if ((r = dshow_cycle_pins(avctx, devtype, sourcetype, device_filter, NULL)) < 0) @@ -773,7 +826,7 @@ dshow_open_device(AVFormatContext *avctx, ICreateDevEnum *devenum, av_log(avctx, AV_LOG_INFO, "Capture filter loaded successfully from file \"%s\".\n", filename); } else { - if ((r = dshow_cycle_devices(avctx, devenum, devtype, sourcetype, &device_filter, &device_filter_unique_name)) < 0) { + if ((r = dshow_cycle_devices(avctx, devenum, devtype, sourcetype, &device_filter, &device_filter_unique_name, NULL)) < 0) { ret = r; goto error; } @@ -1130,9 +1183,9 @@ 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); + 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); + dshow_cycle_devices(avctx, devenum, AudioDevice, AudioSourceDevice, NULL, NULL, NULL); ret = AVERROR_EXIT; goto error; } @@ -1335,6 +1388,7 @@ const AVInputFormat ff_dshow_demuxer = { .read_header = dshow_read_header, .read_packet = dshow_read_packet, .read_close = dshow_read_close, + .get_device_list= dshow_get_device_list, .flags = AVFMT_NOFILE, .priv_class = &dshow_class, };