From patchwork Sat Jan 1 16:39:55 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: 32986 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14856363iog; Sat, 1 Jan 2022 08:41:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJy9hzdEawcvYWHUP7EyicnHm/hdzh9hx+QgdhCnz8vyr+5UkBfSIwHIRqR6wjwtssFiF8VP X-Received: by 2002:a17:906:d54d:: with SMTP id cr13mr33133625ejc.711.1641055260271; Sat, 01 Jan 2022 08:41:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641055260; cv=none; d=google.com; s=arc-20160816; b=YRxUC1XidKGje2O6aTdutjUlh7j5bCdxhaCvzMoOZqVFsNee4Nt1NHFyW4p+QdmF4B kQt5KMESzU89c+tycnXblBuIVkHwe8exfOTcgx/ssX8LSm6XbE8wIQvRoYfjrCNS/C1x /A5oBMeN3gwMvhaTcqVYweZOyIBfTC0Jg2/fjM3lHUZTGbKM8LAjs3iFhOeItGJjAc2/ 6GmdRMMG+kdFu5zmPw0zVCoc6CyBRrNDPv1EV1BRpsbOy1J9zAHjQaHjvfi8ZgMCslWp f9p2LvtVbOgOer9bHbx2b3g7Um4Og+31JHrcT+NqiJ533Mxn5qhA6+I/u0tItzR1ngGH BCmA== 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=DdPue27c3QISKq4jFONbUUxFtqra3Swzsq3IITW0nPk=; b=XM1wOXR9VRqLGTaL7Pc0QlOCg0uIZFwk/82A8+onvz9DAqKq7P9HsqTPgXV3uDlRns fkzH6Eh0VqyiElzgpvoyb7EQQHcpJGpm7f26bF+IMzi0WOpE0G8LFw6kBOSd/W7J7waw 461vjjnboN4gu8cc7Qle/QE8J2gGIuzFVgHYFmq67bfPHA+agNQzLFrgkwKzFoK7BdJe uiKI9bObmcKdNS+PzaMNXg/1TJ+Gg2MgFSFZ8iWRTR7iSnMnbuOUpgIP02jKlwdjZdc7 Hyrpls6BE89HOcV2foivRR5cHcfZ3B9OUczZ7MnB5H85pNBnONrDaPpWpmsQ2RA6H+/c W7WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QEbZrr7R; 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 qa41si15272483ejc.248.2022.01.01.08.41.00; Sat, 01 Jan 2022 08:41:00 -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=QEbZrr7R; 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 9E16768B0EF; Sat, 1 Jan 2022 18:40:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DAA8868B0DE for ; Sat, 1 Jan 2022 18:40:47 +0200 (EET) Received: by mail-ed1-f46.google.com with SMTP id m21so120326862edc.0 for ; Sat, 01 Jan 2022 08:40:47 -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=GMBpykA84OxHTgcPMSmDr9KyYsuSk2YRv6QA+VOaN9I=; b=QEbZrr7Re5VM5R6lRAb/7VOMp2KkIXakFP26Mvz8ARGDTmUe/GUzJJI8jaa+f9qDoP 13b/kM4EEtyntm9AKpsCKQgwExwfzgur1gI1q8mkvVjGMlycFR601li1eNXt5j1EpDJF pJXBUkUsJjLlmRQCS3l8sMntaL3cutX3TFWA6E1H94agssoRuzEOLCrEakuQdIB5T6Ye kSPRNzVeeByzsrwMYraUoH/9mwWigRXdaolUyhkzZ6uuH1pEeUlCvBPXMH8bZsZVaMdN 3KqOrZaQfdx+6nWgAVjTWRUuuLWCPaiNUe2yDrh8y4pK4JQQJT4v3a+i+//yooA+u3Rn QS0Q== 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=GMBpykA84OxHTgcPMSmDr9KyYsuSk2YRv6QA+VOaN9I=; b=kiNl7INvscxMg5FKYJ7dSzGPTmDk7vmbVS23lMTEP9v/A4s3RZuNY+aW8ySkID2GW0 hDshXw3UGrelGCeaveWo4LzHIvPyIWbuRfhREx8tZYmPL6Sd571UlQ9vUTxwkS6ETv1z fi66m3SHnh+zslozjJy8/zd0Nwh3HL4YokkkLVoa/3lAUNRvR2UcpCgK2jU2pCYo8TiO rXclo7ZcjW+Jrc2TvTkBlLFd50XzTSRzfnC3PVQQpon9OnyljVJ7U5i9ufHx71lSDUak W95uV4pAkZo7uTgCVj+0cbHk66hJbBXL58Kw6suK6HTTlCbfZhLvzE2kW5KwJbzivzCk 22uA== X-Gm-Message-State: AOAM5337eRfRfzICf+lp6UevpLW3U2C/tcY4ugTmH5TgbHqWGaB1w+MZ T34nUImgT+YeGhXCkZPbsAxnjh4c5NVIUg== X-Received: by 2002:a17:907:62a1:: with SMTP id nd33mr30939764ejc.578.1641055247211; Sat, 01 Jan 2022 08:40:47 -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 j5sm9310987ejo.177.2022.01.01.08.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jan 2022 08:40:46 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jan 2022 17:39:55 +0100 Message-Id: <20220101163958.1147-2-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 1/4] avdevice/dshow: tv_tuner_audio_dialog cleanup missing 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: pYGsK/aZOEch Cleanup was missing for when the show_analog_tv_tuner_audio_dialog is true. Signed-off-by: Diederick Niehorster --- libavdevice/dshow_crossbar.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavdevice/dshow_crossbar.c b/libavdevice/dshow_crossbar.c index 2438683cde..961defe690 100644 --- a/libavdevice/dshow_crossbar.c +++ b/libavdevice/dshow_crossbar.c @@ -204,5 +204,9 @@ end: IAMTVTuner_Release(tv_tuner_filter); if (tv_tuner_base_filter) IBaseFilter_Release(tv_tuner_base_filter); + if (tv_audio_filter) + IAMAudioInputMixer_Release(tv_audio_filter); + if (tv_audio_base_filter) + IBaseFilter_Release(tv_audio_base_filter); return hr; } From patchwork Sat Jan 1 16:39:56 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: 32987 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14856455iog; Sat, 1 Jan 2022 08:41:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJzpN+nxmq31hRVVag2Nmo3aHxYlqL1aT5RQSkVPMMiliRr4d+CAoAfRoYP66noAeE5XitHZ X-Received: by 2002:a17:906:57c3:: with SMTP id u3mr31000255ejr.475.1641055270786; Sat, 01 Jan 2022 08:41:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641055270; cv=none; d=google.com; s=arc-20160816; b=kzYdv0/08kZ8f+4gmDYTDZlOvxai7v6wLn6DUc6PmtefEOWnIiQtoPwTUAMKcsWKiO kqyZO5YYyUT2yknXynBkV1yI6tw6dXOWmK2SEg5kNvfd5VHg0+kIqGXJWZDE9DYQYLDv irz7+qjHNUPp9f42r1bhdjfDiI26MrLq1/9DFWwfKCa8F8sZlLX6tDZKG2JluST2O1Ko tx1bU+kY5CjyZLHqRU2Li31H1Yz1eJPPKXjXXYzqkB3jtkX9OMeulxgN8+88wUI5wL32 WJhg8OSvfakVrCtQsq3hJ/Z7qSOfZtCGctP+ZQzltf6CGLaJp3cvsUBVTNi/SBmtLbax Zi3A== 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=+wLDTY6to8EW1VAdfYHiNjqK/BbCBhkDOaNkxM+iTIE=; b=kHNDitUcz36X1YnMChUUFNiFpcFwbJxQhrbCdmpbfu5QWYuDLq9alM99pNPu5K2Zk/ t4be+3dAb0ZoHvrSnqdg5MS5jy0gxLw9eusWAEl513aZdFQdHftRI5hAuuF7bWnbhNd8 TENdkSmHMXtagNrj4DzbINpcprnBL3atEkrxTcbkPL+yrryZVHjc40af+FwEjs9i90KC 8DgfbQ3inw9IurVR5SNsBzlbMQ9EqqSn51ZQ4Lg84u12ed0gOwFp0I9t7Ep1tyeOW0aq fBRA+yusZ9n5g25TENsOffmm4VddjUBT0Ft/62Mdsyj8Y6YlPhA2blrBwLoiteHKk/J2 RjkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="i/a3tYhs"; 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 qa11si15810151ejc.545.2022.01.01.08.41.10; Sat, 01 Jan 2022 08:41:10 -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="i/a3tYhs"; 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 75EDD68B0E9; Sat, 1 Jan 2022 18:41:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4644568B0EA for ; Sat, 1 Jan 2022 18:40:54 +0200 (EET) Received: by mail-ed1-f43.google.com with SMTP id j6so118974178edw.12 for ; Sat, 01 Jan 2022 08:40:54 -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=CMENJXYLSIioiSUujXw4o0WZCC9rpxCgPy65ESvQpiU=; b=i/a3tYhsxCs7OrKK/aio/XfZc48SbfSvNjJ2RPo/jq66r95xGyxoJVnDviqAivws/T 8KKtjVSBdlyPxALnL9GPmqgJomCYYkADYxbTdYFAIRVMn9j6PNY45DaXKACpm642q64Z 8EGSca25Jcxxv2a9zEZtRYAeSwCETsSY+f+7EhMsSuvJyJZGhTo9DOHmPnCrODY8U5KD GD5/j2QUdBLByxvwUOKSLZkhl/jaNrvRsXWJzoT+pyzkMxb+BherHwfQ7sjwGW2qD1fk Xc4EgA8TcxTJqTxOHIC22muzCgRODpOsR4/32jh6adsfrogptdsyDQGNU8qgp/TzPE9g +Ewg== 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=CMENJXYLSIioiSUujXw4o0WZCC9rpxCgPy65ESvQpiU=; b=sNbB5DebCqVLkNYTV+nGCXHYtQPAl00bOWffDq4wADCF1a4GAl8M0VCMjlu25F5p5k E9+p1ZqvZflMmagztnfDu3gA47TPW34iCJGQh76zX3KWCq6BUzcG5TsqhTuikp6PZAqD YM+Qx5/HbETTjnwZtWcviI4JH/WcXalDbWx0c9Hx3vPhhS15LVXjOfqIHEjqQzLK9yzR QznhslruR3RJO4t4Qj1NfGDJ/i11buBpMwytwbunMZeEE7yoVDEF+OffT8XYxIsV/Sbb D0JQnyhkXSr0fkavNb74vgv0GUXl5TS8ph7+pj7LvWDJMH/aSvbjrqQBh7vH+AER0ugs UvPA== X-Gm-Message-State: AOAM530NeZT1ekRvQ2xud1DutYLBxVs+cgAV8mb2ytFGEZeWw8s77lZ4 vC5ekop1v5A/wQ6U7QUk5cpVQnACrhyt4Q== X-Received: by 2002:a17:907:8a26:: with SMTP id sc38mr32247907ejc.557.1641055253517; Sat, 01 Jan 2022 08:40:53 -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 h10sm11713439edj.1.2022.01.01.08.40.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jan 2022 08:40:53 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jan 2022 17:39:56 +0100 Message-Id: <20220101163958.1147-3-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 2/4] avdevice/dshow: proper cleanup of queried media types 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: 8LjMeofSgfs5 Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 30f1be1ead..4b6887881d 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -953,7 +953,7 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype, av_log(avctx, AV_LOG_INFO, "(%s)", chroma ? chroma : "unknown"); av_log(avctx, AV_LOG_INFO, "\n"); - continue; + goto next; } if (requested_video_codec_id != AV_CODEC_ID_RAWVIDEO) { if (requested_video_codec_id != fmt_info->codec_id) @@ -1038,6 +1038,7 @@ next: if (type && type->pbFormat) CoTaskMemFree(type->pbFormat); CoTaskMemFree(type); + type = NULL; } // previously found a matching VIDEOINFOHEADER format and stored // it for safe keeping. Searching further for a matching From patchwork Sat Jan 1 16:39:57 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: 32988 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14856574iog; Sat, 1 Jan 2022 08:41:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJzXnS1JCdl+s/pddOElZMpgWGmfIcbpIlcUQWf9VDFzh5BugJfSLsXvfUVu1ReAH2swW3BH X-Received: by 2002:a17:907:160e:: with SMTP id hb14mr31306354ejc.328.1641055281504; Sat, 01 Jan 2022 08:41:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641055281; cv=none; d=google.com; s=arc-20160816; b=A0UL0MrnuR+DCKI1Iw7ZeE5hqqqN3YHnswl6KToanxIohC9cnUiG1ij/lqI1ac7/Id 5AxJr5ye2IhYXi2Xe3eQyLuQtLyx/vN/f82B6s/f4yrpOMMYfGiDKEL12VF/ZbaBWd2D mbx8RUKYLD5gnMd9adCqpE7xIwNiIfK41SEhIms1EypX9voJBwFlQn/IANjRCJdBjaPP Mx6Nl2h2nf7FbR1WKykus16CwyBLzBz0y6zTjJIrfwxGpYswuCuhapuKiaoXb8wIEbE9 MqKSJRgQF+b+/FRwSF6ps7Eg6md6aUXziJEvQ/ur1JVsXAKeNTBUVIAtMBYWvA0XzxBr /HBQ== 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=qGWl1X+9zJZQpjwMyBNobnZC8+SSzzIWQqzHt61Oq8U=; b=jG5ngU/2Zj3ok0WePtXDp4v4SsHeCr6GgH8N5oh8V6pO/n0Y8t/0bJ29M7Ik6IxjgN 0i7g1RksrLt7wM5t5gI+9JpNf+pljbKERpCr4UVGeDBRHjX1c1LW7WPbN783hCh5ls/Q xmGAgNeqJFuYByoPzlSTwX7INaTWEAlFnl6kbrCErCOE9VpvHIkAfp1AL/QMbNLEcteP jjx1XtsRZ2T4Etpc3lgfPrXx3Fr+daJwkWSXV139DARDr8CB7/1XTr2JX9ItFn5WXHZ1 tJYwiYR6Ukyvwga9I1tyYiWxRmAo0rYvzND1XH/qiHL1QFBWESUWLH/W0DO29Olw4KnT jJWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="n/8O2+yS"; 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 a20si14933986edb.545.2022.01.01.08.41.20; Sat, 01 Jan 2022 08:41:21 -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="n/8O2+yS"; 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 9237568B106; Sat, 1 Jan 2022 18:41:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 760F568B0FC for ; Sat, 1 Jan 2022 18:41:00 +0200 (EET) Received: by mail-ed1-f46.google.com with SMTP id m21so120328228edc.0 for ; Sat, 01 Jan 2022 08:41:00 -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=yRSAwDBI1mdyzGxO/PSAk3hkVUPHGvRCz5gtFA+pM5g=; b=n/8O2+ySrRAl8gR432xiOzNVjcN2pkEMY71PeGodlp0Ruv88sUql60aaD8MqVHSGO4 8VNm7wfdj+Be1D9Kn6LESQOz2Vh6ToWZhXzkENFR70CxvtX1OIC2yFVybDqtmozA82NU RGg9nG+btaBGuztZsyuGsgEwD12S+vN+6hPgKM5JTJU5kqXNDyWMQvsgXPrR5MbbpVYa LHOZaAyzvVPcEuHL1rv2hGzrq+axAC/8lb/HNRqKnIJHgOIdLKN2uyt3fkImH9LmRW6G YmNPCwk18on6F4Sc3EXbXFDMvI8OHfzgXI3RWbMhuri6IYfVTNIEBRoLMtXRSflfCREm 8JwA== 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=yRSAwDBI1mdyzGxO/PSAk3hkVUPHGvRCz5gtFA+pM5g=; b=MyZEdvbEWtSTjwOaKo4z9jSkq6XYwqUZsuaDqlGjPm62u/TgQXCUth1k0pjA5daVpk 8VEy8uvHCGi5GYHy6an2H2stNM8lq0EfFcvCiNCmIEhkOcpF+i7gmxHSObStisE3KpGu NmdN1vGkCbTn+Tt5qXjkhodr7iRV1QNd5WGN4ttzwTFM29ngegYuYwfCEBclFyTz2CrO YkPhfHTmV6f9hZO101xd451BIjzHkOJ7pIFzGK3rPA0GMLQNTkNkL9nSCxw3tKNQriBf 1WLs6pq4WgpG5FG5g56Um9/YFj7NBa0fO3Y+tXzQiCNDvMpYT6dWW2FKCy10pvjTBRnX OkfQ== X-Gm-Message-State: AOAM533XSaV3IjHDUYc6JyKhNAUoXp6+aYp8NMUTvxqcjHoaZkoMknbN 1M6qOmUIYN9PpdbiHWYKvI+Ct7h0Jgtk9w== X-Received: by 2002:aa7:c319:: with SMTP id l25mr38171439edq.91.1641055259889; Sat, 01 Jan 2022 08:40:59 -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 u16sm11703793edr.43.2022.01.01.08.40.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jan 2022 08:40:59 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jan 2022 17:39:57 +0100 Message-Id: <20220101163958.1147-4-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 3/4] avdevice/dshow: only set pin format if wanted 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: byWkP6+90qN0 Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 4b6887881d..f2d95fa470 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -1046,7 +1046,7 @@ next: // format based on the VIDEOINFOHEADER format. // NB: this never applies to an audio format because // previous_match_type always NULL in that case - if (!format_set && previous_match_type) { + if (pformat_set && !format_set && previous_match_type) { if (IAMStreamConfig_SetFormat(config, previous_match_type) == S_OK) format_set = 1; } 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: