From patchwork Thu Nov 4 02:09:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Isbell X-Patchwork-Id: 31283 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:a610:0:0:0:0:0 with SMTP id q16csp6024092ioi; Wed, 3 Nov 2021 19:09:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3THKzHmzlFWgafqPyKwyCWexnrz0LgQogi3/EH7NQxV0Va0haBgFlxbt3iqnNvb7yA7kx X-Received: by 2002:a17:906:b884:: with SMTP id hb4mr57327215ejb.376.1635991786526; Wed, 03 Nov 2021 19:09:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635991786; cv=none; d=google.com; s=arc-20160816; b=Fj3N7tSjb9Qji4dhDFz/5uXjaf4cUgAVN/WQ8aHCtHeJxqjdgXnRxSShOfFKqOUEkH Yhpavz+hoK4NlLQaageZk9UJVcHFGaaYyn8nnAaeVkQqGGDStCWBTXJU7I82+8IpWu3k eWA1R1uspec5rfyZ1iOHqjCqJNyRYaPh2ZYFmkhNDAuHeKtiHS5rbR6Rckn8fAbtuWtV pPv25chua+fuejOaQ+IKLoxxxUqRSWXxhtx7lhAL4fis7vkUqq/qyuQhtys7f9PiqCPM Yu/un/nSp5nRM53dk1OewWUD9mPFFwGRBRmW/D3It5kp3WmK5PlCn2iej21kXN6T2nx+ HP+Q== 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=sCahSQuPadepGbChHG1H4XO0JAVx/JIDPsqncbk5O2Y=; b=zqYC0BiThZUhJ6PgiTClWx8AJ3eqhZD7tNaH2irDt+/2R6cnCTNCl50QhrtbvFP34w KVsL5nXTI7gGiFGmLxQflE3RQAcWGwG8vwI9vVIT2olA9pPfxIBvDfYqC/5kCWRl2H7T Ui6pveZ+9gKOmW+qU2ITMxKJJZ+zESRJ8noruafFrq5ZbHICHoq0a7hxrCLF1zlcOEst CQpwtLTiZrPeJiMN87UmOEMqDyAF2fVmUrBtdjLV9+4PHZFi2vL70+JYO/WBp34agjvO 6F0xjO1bpqKK4/8anTRziXq4Jo81D6dOQh+zPEyZHVwKY+lX/0JCiupkS8qvbCMyv3nv atiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@audiopump.co header.s=default header.b=GQwYMZGJ; 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 hs37si238890ejc.418.2021.11.03.19.09.45; Wed, 03 Nov 2021 19:09:46 -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=GQwYMZGJ; 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 CD32368AC48; Thu, 4 Nov 2021 04:09:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from hedgehog.birch.relay.mailchannels.net (hedgehog.birch.relay.mailchannels.net [23.83.209.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0791E68A5C2 for ; Thu, 4 Nov 2021 04:09:32 +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 7432D460251 for ; Thu, 4 Nov 2021 02:09:29 +0000 (UTC) Received: from ostego.snhdns.com (unknown [127.0.0.6]) (Authenticated sender: totalchoicehosting) by relay.mailchannels.net (Postfix) with ESMTPA id 6B6D04604E6 for ; Thu, 4 Nov 2021 02:09:28 +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.114.196.210 (trex/6.4.3); Thu, 04 Nov 2021 02:09:29 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: totalchoicehosting|x-authuser|audiopum@ostego.snhdns.com X-MailChannels-Auth-Id: totalchoicehosting X-Whimsical-Versed: 0022beb1262205f1_1635991769223_327833062 X-MC-Loop-Signature: 1635991769223:3343632521 X-MC-Ingress-Time: 1635991769222 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=UCp8lmDA06nGGPx3SWwOTBxqw/PAD3t4VzkftozZS3s=; b=GQwYMZGJoD3bGTlcGPgcPbxQ7k 8FLIAlw00Gg440Tz9aMgfgw2k5e5NbclLrFtKlJJS7gBkSVV4KqItOPICFIK9UUN/dMmj7YqI2Bl1 B0rrfYUFVNTlIvlylt3KSSJR7VbSkGw4yf+ZhhlN6n/EV5SUKjkBvkLkt3nFp78rndZwzhnC7Bu25 c91ChKJuciXN9MfPcRnPhI6nj16NAm662JOXVlzCO2GuDKo+C6ae3YUwlCXIyP4Uk8i6yFg7LL1SI 4u6xTHcuvY7pqxwD1twyn0hL1QDjDcSfcf6WRxxJ/pVmFwScWX+xyN7RgG6pI4nYssmxnyeuF/U0T tQurhQ9g==; Received: from mail-ed1-f45.google.com ([209.85.208.45]:39478) by ostego.snhdns.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1miSBy-000844-C7 for ffmpeg-devel@ffmpeg.org; Wed, 03 Nov 2021 22:09:26 -0400 Received: by mail-ed1-f45.google.com with SMTP id r12so15979322edt.6 for ; Wed, 03 Nov 2021 19:09:27 -0700 (PDT) X-Gm-Message-State: AOAM533iT1t2ewWUU2kcM2Hd2lwbdSdazi/qnGnhrRHuXYaXl2sWEFze KNDEmPr0ZljVrdiQPKS4W70kUNT8QW0b0WQxt3s= X-Received: by 2002:aa7:cd99:: with SMTP id x25mr20462636edv.249.1635991766423; Wed, 03 Nov 2021 19:09:26 -0700 (PDT) MIME-Version: 1.0 From: Brad Isbell Date: Wed, 3 Nov 2021 21:09:00 -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 1/2] Use WAVEFORMATEX from AM_MEDIA_TYPE for describing device capabilities. (Fixes #9420) 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: wX209n679wlw From fd6bfd237d4d25de04d8179ccb1ff2d2f0aa904f Mon Sep 17 00:00:00 2001 From: Brad Isbell Date: Sun, 3 Oct 2021 00:16:05 -0500 Subject: [PATCH 1/2] Use WAVEFORMATEX from AM_MEDIA_TYPE for describing device capabilities. (Fixes #9420) Signed-off-by: Brad Isbell Signed-off-by: Brad Isbell Signed-off-by: Brad Isbell --- libavdevice/dshow.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) + (ctx->channels && ctx->channels != fx->nChannels ) + ) { + goto next; } } if (IAMStreamConfig_SetFormat(config, type) != S_OK) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 8d0a6fc..5c1e494 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -422,28 +422,20 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype, goto next; } if (!pformat_set) { - av_log(avctx, AV_LOG_INFO, " min ch=%lu bits=%lu rate=%6lu max ch=%lu bits=%lu rate=%6lu\n", - acaps->MinimumChannels, acaps->MinimumBitsPerSample, acaps->MinimumSampleFrequency, - acaps->MaximumChannels, acaps->MaximumBitsPerSample, acaps->MaximumSampleFrequency); + av_log( + avctx, + AV_LOG_INFO, + " ch=%2lu, bits=%2lu, rate=%6lu\n", + fx->nChannels, fx->wBitsPerSample, fx->nSamplesPerSec + ); continue; } - if (ctx->sample_rate) { - if (ctx->sample_rate > acaps->MaximumSampleFrequency || - ctx->sample_rate < acaps->MinimumSampleFrequency) - goto next; - fx->nSamplesPerSec = ctx->sample_rate; - } - if (ctx->sample_size) { - if (ctx->sample_size > acaps->MaximumBitsPerSample || - ctx->sample_size < acaps->MinimumBitsPerSample) - goto next; - fx->wBitsPerSample = ctx->sample_size; - } - if (ctx->channels) { - if (ctx->channels > acaps->MaximumChannels || - ctx->channels < acaps->MinimumChannels) - goto next; - fx->nChannels = ctx->channels; + if ( + (ctx->sample_rate && ctx->sample_rate != fx->nSamplesPerSec) || + (ctx->sample_size && ctx->sample_size != fx->wBitsPerSample) ||