From patchwork Fri Mar 25 14:10:20 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: 34962 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp1376287uaj; Fri, 25 Mar 2022 07:11:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXUZGJkt1xC9N08llhCHf7dHDgr0UfJUapQ0C71z8eGtVQn7n41k0cAHH6S5cUwEMgxQWR X-Received: by 2002:a17:906:ae0b:b0:6df:c7d6:9235 with SMTP id le11-20020a170906ae0b00b006dfc7d69235mr12027991ejb.664.1648217480628; Fri, 25 Mar 2022 07:11:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648217480; cv=none; d=google.com; s=arc-20160816; b=hG1zaG4Dd6u8HZJ8ZykVNpahjYBdEGaToD6Xgk85ck+rLJ98B5hanRCAZIUVrMvRFP CuDPJIGqPpWV/DMP4Y/h0Fy7N6Vwh3Bzt9vVCQE2gJC/Oj8ikMGvcflme8p4+9D+DdyV aViJdzNLTtvThnMY3nBBcN8YeOqw825syqpIWjsLGTkVZuF3GHer/pkhSPZbn5PpWy8d gvJYkJL9BQ9uX4nnbfuRPMRrWTTGXIwSyvHPLs/iCXWZw9sV1EP/GPP9epd4n8iyhIhb HKiWXDS8LA6pg0r2U/BxHhtw/rs3NDZOLsdzupQ1iCZ2m/nAUV664AteWzg+iENuziZ0 7tGA== 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=OdXWPt/cYUDpKIcG0gYBl/JDGmi3JxvcAX95ZDxyKkY=; b=seVFuppa+Vp6IVSbdNt1gQL41FpabElY1YaEnlC0bG73tRO8F9gd4zIgnbmtC/uC9S InCqYx15LXPO/ztAU863DPJKRfHaAnBKcKxe6RcQzlcXBd4pG5wXt93PcNcr+ZmED82V 0XDE8kROYPlAxzFCsuvfpcExgmDrLX+hEalCgyNfMSUOIF053wig5gLVDsn/JWyR8MKO g19paUgywcx0rsbrBuJ3dYgglx2Q3vP4qfvhtSC4l9MNkd/a6BO6uz2D3ENzNtpFiwTg LB3osa7AB3RwUMbPZJtjw61oQiqTM5ntq8bs4zrlQUyY9hkhOK1b3hMrPAWh9lp1TVK7 7j2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=iXQonLQ5; 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 o5-20020a170906768500b006df76385de7si2730923ejm.647.2022.03.25.07.11.20; Fri, 25 Mar 2022 07:11:20 -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=20210112 header.b=iXQonLQ5; 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 8CB2768B229; Fri, 25 Mar 2022 16:11:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE0FD68A2CF for ; Fri, 25 Mar 2022 16:11:04 +0200 (EET) Received: by mail-lj1-f171.google.com with SMTP id q14so10445962ljc.12 for ; Fri, 25 Mar 2022 07:11:04 -0700 (PDT) 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=og1PEU8UG/emqhcpeOuIkabshXI3ULsjkmvpqXudE4k=; b=iXQonLQ5AbvTHGw9su/1TubTiVnQjhSoYNfTi5WjO5typz9IjOhTdtGj2jmfM+U244 m9+jPVlrMP3vw0+dx9R9b2/FLOsxJcYT0MvGvWwXfxe1ucB1wQrDrtd6zlFUkWOPifr8 fk7u5zOfIL4Z+CtXD8SMfMYpASnEZhD5NwIJ0woXsC9CzWX/wYT27zMofzVcpj5x5bSG 8fxmGFxB652aad/+dEKEd6kDzFqLC+gTISOBFmY6TboPWHTAcIi3ojv68IR2jVXHpdqG h2Ks9bgXS+gq7QScqRI6YqLs+zbIn3hEqcQKBSFNNhBvLDDrS/GKjV9wsjPTi4Q2z01e S/pg== 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=og1PEU8UG/emqhcpeOuIkabshXI3ULsjkmvpqXudE4k=; b=cdgGGP4v3QayeVk1Fd6N5nvIoN2qXkijEcBz4Qpejq9VCU1pefpoQnVANXl0zdkn2X ix1ob+KxAPxRfsz14RbH1zVnhKbZkHEtIKyrbuOoKCZxYKnCsMGE6nw9O3g+KzF+NpeP rS1Q0KtCld6VK6LMlSvNk8JUTwHZ1pdWiof91tcVpt0MUL3IkbK6xCAKIUcg/sRWjd/P kS0+8Lt2258k73G46euj3oKAWjh6PIGGoztBMQsFMQ2mAsGc7N1b1UcXB9KgW2yvr6tj oM7sC/26DX0/ELOmK2KyfkXUXhl78+MJNKBebDOzg67oAzIu1J6kY1RoOOwl3g5YYzjT U/rQ== X-Gm-Message-State: AOAM531GuOkz+AEjMfEY69D0ggE5BI5NYJPePH3ZgVidTSmLtdYaxOYO i8wTrlL0xos+t49xzeAPeX2C0ecPZg8= X-Received: by 2002:a05:651c:887:b0:247:f630:d069 with SMTP id d7-20020a05651c088700b00247f630d069mr8362902ljq.514.1648217464056; Fri, 25 Mar 2022 07:11:04 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id n13-20020a056512388d00b00443d9064160sm718022lft.125.2022.03.25.07.11.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 07:11:03 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Mar 2022 15:10:20 +0100 Message-Id: <20220325141041.1748-2-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20220325141041.1748-1-dcnieho@gmail.com> References: <20220325141041.1748-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 01/22] avdevice/dshow: fix regression 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: +PNQJ9DCFoH+ a1c4929f accidentally undid part of d9a9b4c8, so the bug in ticket #9420 resurfaced. Fixing again. Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 6039578ff9..abb8325bc3 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -1002,23 +1002,12 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype, ); continue; } - if (requested_sample_rate) { - if (requested_sample_rate > acaps->MaximumSampleFrequency || - requested_sample_rate < acaps->MinimumSampleFrequency) - goto next; - fx->nSamplesPerSec = requested_sample_rate; - } - if (requested_sample_size) { - if (requested_sample_size > acaps->MaximumBitsPerSample || - requested_sample_size < acaps->MinimumBitsPerSample) - goto next; - fx->wBitsPerSample = requested_sample_size; - } - if (requested_channels) { - if (requested_channels > acaps->MaximumChannels || - requested_channels < acaps->MinimumChannels) - goto next; - fx->nChannels = requested_channels; + if ( + (ctx->sample_rate && ctx->sample_rate != fx->nSamplesPerSec) || + (ctx->sample_size && ctx->sample_size != fx->wBitsPerSample) || + (ctx->channels && ctx->channels != fx->nChannels ) + ) { + goto next; } }