From patchwork Sat Jan 1 16:39:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 32989 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14856634iog; Sat, 1 Jan 2022 08:41:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJwlRutLUN37hR6RNUCdd7mONcCWOxRFsTZW94L08p9E9DatJYieCHtkm19cAg3sBvlsxA/d X-Received: by 2002:a05:6402:3496:: with SMTP id v22mr37914831edc.263.1641055290560; Sat, 01 Jan 2022 08:41:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641055290; cv=none; d=google.com; s=arc-20160816; b=JDvzlgezf/e/dLyG0yTkOSbNxa4u2DXqQv0/R4YisSrJLXbKpZJIZCvLjqh9Wta4dC UYwdZaqRvOaVm8R/IqJc3fkSg+FNGQXWCf63ka3LlWd2zmfEDtmnocsnA2I1Qy1f2j3j U2B8k5UI91fliqkCL+jqbNLpXaxWVsU+4oXLADEiDYgZWEulxCV4QUsGh50ucvT8qgsH 5PrNtrIlKV05QuGLRts2bGM+qBLJHc8ZJ/pU6fX4eRiUk/GHfHOyqfZS3gpUUqPjAXdT qfRNvBELEfuWvy0O+tyugR2ECmRrYIRCnEwC5c7VK2d5xKOGFFYYmGpRBQrP1+qmGenZ jYmw== 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=yHqactkU3NdC35kPMC9Jo+CTRY+Ff4r4PA5FNCsOoeU=; b=GmkVYjtKlki3zIv6zO+WeBpBsDrvTj5qLn4L/V8BfobbvsmFBm5GeaUxsLMkSa3N4G UDeu5nqP7SKTRdH7FgGhWe6oVKtl1Nt68HRXzJargzpEkJ7VflloCjCsPDLpcjPc+9yA bJhgBmlx/G40enFd/s12K4u5JYp8Hu02gpb7MAKQo0tkRZmJtWnR3sw5uJeqIop9NaXL zIXfHOkS6TMYUhKApY2twDB7Vj7fKS/DUltIPjKlVVtuMDN3cqdgUYTuI3l1obov4Xgz odkr7BblwjOTMekUl/FCJx5XbaSCtDkEG5GRoAcA7RkXmZ4DptlXTZZZGi4Juu+zLAdm knuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=gIknue0R; 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 ba3si14713781edb.399.2022.01.01.08.41.30; Sat, 01 Jan 2022 08:41:30 -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=gIknue0R; 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 A840068B0FD; Sat, 1 Jan 2022 18:41:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 86AA068B0FC for ; Sat, 1 Jan 2022 18:41:07 +0200 (EET) Received: by mail-ed1-f45.google.com with SMTP id m21so120328963edc.0 for ; Sat, 01 Jan 2022 08:41:07 -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=jUdp061Jtxg+9lCL5+6GxGq1mpS8cV7sHW5fFx3rDbQ=; b=gIknue0RgZ1dVaQZYqew45NKEhe5OpkVPICZPmNqCD5Pz6+jurOMMi/8Hmm4oHQA+e ubno/bMsM5KwLeS9QSvvTGqLam8I45k0hVubM8EgcD266CMFeuTUCjIWTidhyajz/yxU eUbR/fWm4Br9rXEGZv8XiPLKXwW4uFuqCBAlBfmj4ztcapqJLG6V+VhwlitogR42kkz/ LLbIDMtYl7AwSE8SPdmif42lhR+HVgyKCuKSsiiDxomIcV4fASSje0QFLvQqKCeAPOhn 3CP4jQ5vaMtN8TnwuEqNyBQyQrlCY5eI0pHylZKeMW/uEJmTqB+S6JcCzf6D8WbeR1Tu oJPg== 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=jUdp061Jtxg+9lCL5+6GxGq1mpS8cV7sHW5fFx3rDbQ=; b=TrCHiMtqdgTQTtWILDMJ5zo9y0kMcwZ+lhcBZyZp4prAwQv9sGE3LnHgoo/2uYn1If BZjdr9qfy5IJEwFi7kFyWV8hYYnXMvsiEJ1utNFcV2W4l98Bd6FcwvbAypRvHVNBEqMQ vo5FBKJOTvhySNtS109kAg4quRARVx3dRkWhS76YctmuwMB0vOm0xtrVFmhb472eagm0 SHqDd5x/hskYf8duQlnXaYMx/lHkvOMmEGIY7R69avfYpHgTkTlmXcsZH4CC2VQ6xMP6 SqApLGg6QRc1YElhld91HCIH4tj/LZd7jnAk4EmXDrAXbkwJEQ/R10NGuNniVMBPeXGE u2mw== X-Gm-Message-State: AOAM533gKozJAoaa21pn9XICEi4QAPUp35AYpoWzx4NNK4fdRkK/l68m kJvq8dIbn44we33kpLrTE9AqXsZoGc8qTg== X-Received: by 2002:a17:907:171d:: with SMTP id le29mr31709106ejc.626.1641055266288; Sat, 01 Jan 2022 08:41:06 -0800 (PST) Received: from localhost.localdomain (83-83-48-81.cable.dynamic.v4.ziggo.nl. [83.83.48.81]) by smtp.gmail.com with ESMTPSA id e6sm11806432edz.54.2022.01.01.08.41.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jan 2022 08:41:05 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jan 2022 17:39:58 +0100 Message-Id: <20220101163958.1147-5-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20220101163958.1147-1-dcnieho@gmail.com> References: <20220101163958.1147-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avdevice/dshow: ensure pin's default format is set 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: +XSXYzLIQ14d Fixes regression in a1c4929f: there apparently are devices out there that expose a pin default format that has parameters outside the capabilities of any of the formats exposed on the pin (sic?). The VirtualCam plugin (v 2.0.5) of OBS-Studio (v 27.1.3) is such a device. Now when a default format was found, but not selected when iterating all formats, fall back to directly setting the default format. Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 88 +++++++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 34 deletions(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index f2d95fa470..a435ae1807 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -758,6 +758,31 @@ static struct dshow_format_info *dshow_get_format_info(AM_MEDIA_TYPE *type) return fmt_info; } +static void dshow_get_default_format(IPin *pin, IAMStreamConfig *config, enum dshowDeviceType devtype, AM_MEDIA_TYPE **type) +{ + HRESULT hr; + + if ((hr = IAMStreamConfig_GetFormat(config, type)) != S_OK) { + if (hr == E_NOTIMPL || !IsEqualGUID(&(*type)->majortype, devtype == VideoDevice ? &MEDIATYPE_Video : &MEDIATYPE_Audio)) { + // default not available or of wrong type, + // fall back to iterating exposed formats + // until one of the right type is found + IEnumMediaTypes* types = NULL; + if (IPin_EnumMediaTypes(pin, &types) != S_OK) + return; + IEnumMediaTypes_Reset(types); + while (IEnumMediaTypes_Next(types, 1, type, NULL) == S_OK) { + if (IsEqualGUID(&(*type)->majortype, devtype == VideoDevice ? &MEDIATYPE_Video : &MEDIATYPE_Audio)) { + break; + } + CoTaskMemFree(*type); + *type = NULL; + } + IEnumMediaTypes_Release(types); + } + } +} + /** * Cycle through available formats available from the specified pin, * try to set parameters specified through AVOptions, or the pin's @@ -813,32 +838,11 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype, use_default = !dshow_should_set_format(avctx, devtype); if (use_default && pformat_set) { - HRESULT hr; - // get default - if ((hr = IAMStreamConfig_GetFormat(config, &type)) != S_OK) { - if (hr == E_NOTIMPL || !IsEqualGUID(&type->majortype, devtype==VideoDevice ? &MEDIATYPE_Video : &MEDIATYPE_Audio)) { - // default not available or of wrong type, - // fall back to iterating exposed formats - // until one of the right type is found - IEnumMediaTypes *types = NULL; - if (IPin_EnumMediaTypes(pin, &types) != S_OK) - goto end; - IEnumMediaTypes_Reset(types); - while (IEnumMediaTypes_Next(types, 1, &type, NULL) == S_OK) { - if (IsEqualGUID(&type->majortype, devtype==VideoDevice ? &MEDIATYPE_Video : &MEDIATYPE_Audio)) { - break; - } - CoTaskMemFree(type); - type = NULL; - } - IEnumMediaTypes_Release(types); - } - - if (!type) - // this pin does not expose any formats of the expected type - goto end; - } + dshow_get_default_format(pin, config, devtype, &type); + if (!type) + // this pin does not expose any formats of the expected type + goto end; if (type) { // interrogate default format, so we know what to search for below @@ -1040,15 +1044,31 @@ next: CoTaskMemFree(type); type = NULL; } - // previously found a matching VIDEOINFOHEADER format and stored - // it for safe keeping. Searching further for a matching - // VIDEOINFOHEADER2 format yielded nothing. So set the pin's - // format based on the VIDEOINFOHEADER format. - // NB: this never applies to an audio format because - // previous_match_type always NULL in that case - if (pformat_set && !format_set && previous_match_type) { - if (IAMStreamConfig_SetFormat(config, previous_match_type) == S_OK) - format_set = 1; + + // set the pin's format, if wanted + if (pformat_set && !format_set) { + if (previous_match_type) { + // previously found a matching VIDEOINFOHEADER format and stored + // it for safe keeping. Searching further for a matching + // VIDEOINFOHEADER2 format yielded nothing. So set the pin's + // format based on the VIDEOINFOHEADER format. + // NB: this never applies to an audio format because + // previous_match_type always NULL in that case + if (IAMStreamConfig_SetFormat(config, previous_match_type) == S_OK) + format_set = 1; + } + else if (use_default) { + // default format returned by device apparently was not contained + // in the capabilities of any of the formats returned by the device + // (sic?). Fall back to directly setting the default format + dshow_get_default_format(pin, config, devtype, &type); + if (IAMStreamConfig_SetFormat(config, type) == S_OK) + format_set = 1; + if (type && type->pbFormat) + CoTaskMemFree(type->pbFormat); + CoTaskMemFree(type); + type = NULL; + } } end: