From patchwork Thu Nov 4 02:09:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Isbell X-Patchwork-Id: 31284 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:a610:0:0:0:0:0 with SMTP id q16csp6024589ioi; Wed, 3 Nov 2021 19:10:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvJtiU4HrsXn8XlwjJz7G/w9pHmXC2DPvoPlgpWcMy5RQQ401pytsb77K+zLo5GHq9pj2H X-Received: by 2002:a17:907:6e26:: with SMTP id sd38mr42382269ejc.90.1635991831029; Wed, 03 Nov 2021 19:10:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635991831; cv=none; d=google.com; s=arc-20160816; b=wIYyet9zTDLMpEME5OweRTqFTKf/3TEIsJUVSN105f3J+XVHFhUxB8VkUmHrF7MSPB XUrVgT5b8Spakc6PWXMqpgyKeZ7Pfs36HYF05+OoGSYkprbpRVkjiMyQ09tQXHN1zkSO KThTCZuAsu2IksRsCz2uL1wMWss+D4mJsYruxdC6uTjB1XGh4g9OKhJlNrWLoWOYLVAO t0a5uJYf3daa5xowjowhJLBskE2p0xVb3EPoB3bSBDj1N2DWquQ0wbVtBknyFROhVD27 EExCLghPiSs1BzZoPT4IgVrjZN4G55d4RmoC0OZyU9mGjBieq+SYUY5NzKqMacDPledU u5Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:message-id:date:from:mime-version :dkim-signature:delivered-to; bh=YhTsX/cDclk2OAxoTunokzV745N+ifGUvbgZ1VNgc5o=; b=d/4IKqyBYrwwESHNGTnrMJx3uOQ4sJgYMVKISzFecjLY4FH+E01OynnjvVXeQXnA7s /kiYb1jAQzpU30jTb9RObAEnuMQhpEtajQt/VertXwJUE9ITFaBg/qwR1cqKk38Xkw3S vGtfJ8ITWvxKLVAwrPfk3etizAGqNKeZFKzSGqRGT170/4o9bTfvhMYxiEcZjtgY6hvx UUdumnm8PT4WJ4Dpvb7B4WQKNvfy1kA5rVNr1MG7eqUPPbjkoTJ4pSXwbGM3s/+zgXeI FDLal7K5zgHQsA4O89gdk8bGju0gQ/9M6smpt3b9KBVQ6VhLyCJOwBsjDpzAX4pVrIr3 8miw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@audiopump.co header.s=default header.b=EV92G7o4; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jg16si8220999ejc.752.2021.11.03.19.10.30; Wed, 03 Nov 2021 19:10:31 -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=@audiopump.co header.s=default header.b=EV92G7o4; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6B64B68AC7B; Thu, 4 Nov 2021 04:10:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from fossa.birch.relay.mailchannels.net (fossa.birch.relay.mailchannels.net [23.83.209.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC76D6898A6 for ; Thu, 4 Nov 2021 04:10:20 +0200 (EET) X-Sender-Id: totalchoicehosting|x-authuser|audiopum@ostego.snhdns.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 64B1F541FB1 for ; Thu, 4 Nov 2021 02:10:18 +0000 (UTC) Received: from ostego.snhdns.com (100-96-99-51.trex.outbound.svc.cluster.local [100.96.99.51]) (Authenticated sender: totalchoicehosting) by relay.mailchannels.net (Postfix) with ESMTPA id 482E9541FB8 for ; Thu, 4 Nov 2021 02:10:17 +0000 (UTC) X-Sender-Id: totalchoicehosting|x-authuser|audiopum@ostego.snhdns.com Received: from ostego.snhdns.com (ostego.snhdns.com [198.38.77.142]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.96.99.51 (trex/6.4.3); Thu, 04 Nov 2021 02:10:18 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: totalchoicehosting|x-authuser|audiopum@ostego.snhdns.com X-MailChannels-Auth-Id: totalchoicehosting X-Lettuce-Stop: 15c4d99d3ccb8b47_1635991818091_3494461635 X-MC-Loop-Signature: 1635991818090:638398904 X-MC-Ingress-Time: 1635991818090 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=audiopump.co; s=default; h=Content-Type:To:Subject:Message-ID:Date:From: MIME-Version:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=5L2AtZ6jaiCJWFrQbTF/73d3zKJGWusWfr8yPAiVf/I=; b=EV92G7o4AbEh8kKQwftdRHdl2F qINNTJY/7W6gqiPcVY+DJFPbXF2UOec/9k71FHs+Y627tlb59JnKhiOkRIHDQrsaU/HqPMJAx3Qz8 8js7DV3T2xspPciT4CWCxNxpfjAn0cJEQVvqqHvGYmZKRc8hpWP4avRiLK4CHxiYrk9Kburxl/d/D 9/i/2KHbQWYwl8cR4B/QBvEdHDn/u7zNfXM2SlZAIQS8+tq98d6NajunrEI1JUVN+fnkzQgCTi1+S hwPIcrnU/JEUPRYwOt63wknXJpCIH7vXlKC3Z4o+XqF3I0Xvy52zI12Q4ABjX9QM17Xceo/OM6nwh o1YP8KcQ==; Received: from mail-ed1-f50.google.com ([209.85.208.50]:33672) by ostego.snhdns.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1miSCl-00088g-GY for ffmpeg-devel@ffmpeg.org; Wed, 03 Nov 2021 22:10:15 -0400 Received: by mail-ed1-f50.google.com with SMTP id m14so15554348edd.0 for ; Wed, 03 Nov 2021 19:10:16 -0700 (PDT) X-Gm-Message-State: AOAM53382n/X48ozb07JdhOyIeFqQ7nl2st4mVen4AnGDOAjEp18tzQF s8yPa1tKp4eKrC1OWiFCLsh3znIJNnk/ndwRxPE= X-Received: by 2002:a17:907:c0c:: with SMTP id ga12mr60953215ejc.475.1635991815500; Wed, 03 Nov 2021 19:10:15 -0700 (PDT) MIME-Version: 1.0 From: Brad Isbell Date: Wed, 3 Nov 2021 21:09:49 -0500 X-Gmail-Original-Message-ID: Message-ID: To: FFmpeg development discussions and patches X-AuthUser: audiopum@ostego.snhdns.com X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 2/2] Fix missing PCM sample size option when it is used as the lone option for DirectShow audio capture 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: c+C04jadwLRN From 25e34ef9f995afffe67e519bb6f03a750aa09ae2 Mon Sep 17 00:00:00 2001 From: Brad Isbell Date: Wed, 3 Nov 2021 20:38:59 -0500 Subject: [PATCH 2/2] Fix missing PCM sample size option when it is used as the lone option for DirectShow audio capture Signed-off-by: Brad Isbell Signed-off-by: Brad Isbell Signed-off-by: Brad Isbell --- libavdevice/dshow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - || (devtype == AudioDevice && (ctx->channels || ctx->sample_rate)); + || (devtype == AudioDevice && (ctx->channels || ctx->sample_rate || ctx->sample_size)); int format_set = 0; int should_show_properties = (devtype == VideoDevice) ? ctx->show_video_device_dialog : ctx->show_audio_device_dialog; diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 5c1e494..e313c9a 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -569,7 +569,7 @@ dshow_cycle_pins(AVFormatContext *avctx, enum dshowDeviceType devtype, (ctx->requested_width && ctx->requested_height) || ctx->pixel_format != AV_PIX_FMT_NONE || ctx->video_codec_id != AV_CODEC_ID_RAWVIDEO))