From patchwork Wed Mar 30 12:18:02 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: 35071 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp774806pzb; Wed, 30 Mar 2022 05:21:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRlHjoUM+dqk1UXRIBzT/uZloSJXkWGRGVrn1VkEBlSY92iOSXw7iMY/lELG21OL3RDQTU X-Received: by 2002:a05:6402:3554:b0:419:402f:f632 with SMTP id f20-20020a056402355400b00419402ff632mr10054443edd.1.1648642887885; Wed, 30 Mar 2022 05:21:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648642887; cv=none; d=google.com; s=arc-20160816; b=bXuGBcHjgLx4kFi9Gl3xNPOvtuC4oM59ARQH9hBKJQbh114fSRavQg4jgNI+C+B7za xLr78bFhTiCuJCgfaw6gbPlwOpSSoNdOLezumdq64rVsdChenyJr5SNKyaOdo4KzNBkt GEo8fbrOYpDhmGhH8euU0uZMcIGdhZPXEyUAFk9eH+NQiLGcwBe5ufaly9CcojHQ/x3P ZGvUBIQAsBdly2fLbEJwXAw1BVITBUk0BcZaCErwaL1pwMNSvw6aUP4qidE4k3vutBQv lDxq53Ug7l3yUlCzEntJPowRU22qcDjH5ZmMpog5W5wYxeu7VCw5hL17kGSnyN5aBVWQ hz8A== 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=9q0K6xCH1EMWG9qZSqurzxouXJYIegfeqFJvhzIAUqY=; b=sejMuAAFE+gIiq/FThrOTTGEzjebrOAjfU+9KhqFd8QXp5RujQyJBKbc6EQBVv+3+u l7lN/53VV3j2Sg36L8T4u2hjVDYppnvKHaOLXAjZ+JhXtx4neN9ZYv6f2S3XSR+1QTwN zdETofFfkhwFTjCajEVQDX+oLHMCOJsLC94pdxAqjGXwJCqKtacHdgYmJfAnDv0F6s7+ FQYqsrjgTHupnoqXFdKQetbXFGH0YUgyjft/a19MHJmNo+SSlI2CTSsDsVzMqFL1RdKf EngNw/aDJFtWqdQjH4HJHfuQQwGPBUNE8fsnPGYduvTUQiR3wdcIcSzxv7JtlmG34H8i e5Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ho6A+SWX; 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 p23-20020a1709061b5700b006df76385ef3si21216625ejg.915.2022.03.30.05.21.27; Wed, 30 Mar 2022 05:21:27 -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=ho6A+SWX; 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 1C7DE68B2A9; Wed, 30 Mar 2022 15:20:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D2D068B223 for ; Wed, 30 Mar 2022 15:20:12 +0300 (EEST) Received: by mail-lj1-f178.google.com with SMTP id h11so27409115ljb.2 for ; Wed, 30 Mar 2022 05:20:12 -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=ioa9BeZmT/y7hHfyDoKcG7T9Jmai5VFmSaZcjXM/uLY=; b=ho6A+SWXq11yKYfrYLiyQb71apg+QW8o858yPnTwmlamZ8Kcb7WqLRrjLsv7YQrejf sYoJmAQjkA174q1ay/mcKCIDVClveEBMzlh+O4QBbpbRbD9s9wc8DcJ1+zstWbwy6/Du YvzZHShJ9sGgbjm1SK7Mc1050DdVXr8/v/HAUfIF7/rWqmcSasHSpbUMZ1UYKujI/r8V ymp+geBTNDjj9iRnpXRfgTtNckqvUZ/xWYxyDMcRF0ipL/siSxKmT202pOAVX35X5XAY aOscvirXBIou0c4+Z8B+nIzxP5KdWOoTtFHfv4GvqIK1GyKa4BJTDR6Dd4vjc48uWitb lANQ== 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=ioa9BeZmT/y7hHfyDoKcG7T9Jmai5VFmSaZcjXM/uLY=; b=LFoat2WZOlge+fKvwgyGe21dKCwHVAA5TXhS2mTn2SBVBjXpYPjgPnVyZwiEaL5Igd u8ui7FVPFunSXZRslNvUYKQUG6djdPRgAhp0KDskOaSsI+eSu7UrYCJoUqnzRWE9/lEE Zn10I4bIdskFC/HnlVzUtqhTl05aXluD9cldVUiUMGfcueYk6x0GMNFZMyreaNlzj0Yw zFvFrpYfOJfIwPb67oMk5LYgCzNpK1ir0w04Npi4NDMfEqgLhpm+YxQODeTE5c2bbuaw vH2kDWG8kf29dq2EAM4hdXuoSY2Qiy4Y7WzoLfEWWTSVh5MJvUX3EGLhUlDVfnFBVdTP vyDw== X-Gm-Message-State: AOAM5312GxNQt88q/NtnzrpI7e+w1Yrc5iEcTPtd0nXtdFG+tdFhW0nM 3n2dT2kF+WNl47l0R+5FfCP1sZHxbr4= X-Received: by 2002:a2e:8851:0:b0:249:9504:d19e with SMTP id z17-20020a2e8851000000b002499504d19emr6275210ljj.153.1648642811868; Wed, 30 Mar 2022 05:20:11 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id h16-20020a19ca50000000b0044a25081cf9sm2313065lfj.133.2022.03.30.05.20.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 05:20:11 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Wed, 30 Mar 2022 14:18:02 +0200 Message-Id: <20220330121806.822-18-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20220330121806.822-1-dcnieho@gmail.com> References: <20220330121806.822-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 17/21] avdevice/dshow: cosmetics 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: /WZlBHAgJG6C Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 58476a0f40..3cae7d265e 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -933,6 +933,7 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype, AVOptionRange *new_range[3] = { NULL }; int nb_range = 0; struct dshow_format_info *fmt_info = NULL; + r = IAMStreamConfig_GetStreamCaps(config, i, &type, (void *) caps); if (r != S_OK) goto next; @@ -1558,7 +1559,8 @@ dshow_open_device(AVFormatContext *avctx, ICreateDevEnum *devenum, goto error; } } - if (ctx->device_filter[otherDevType]) { + + if (ctx->device_filter[otherDevType]) { // avoid adding add two instances of the same device to the graph, one for video, one for audio // a few devices don't support this (could also do this check earlier to avoid double crossbars, etc. but they seem OK) if (strcmp(device_filter_unique_name, ctx->device_unique_name[otherDevType]) == 0) { @@ -2441,16 +2443,16 @@ static const AVClass dshow_class = { }; const AVInputFormat ff_dshow_demuxer = { - .name = "dshow", - .long_name = NULL_IF_CONFIG_SMALL("DirectShow capture"), - .priv_data_size = sizeof(struct dshow_ctx), - .read_header = dshow_read_header, - .read_packet = dshow_read_packet, - .read_close = dshow_read_close, - .get_device_list= dshow_get_device_list, - .control_message= dshow_control_message, + .name = "dshow", + .long_name = NULL_IF_CONFIG_SMALL("DirectShow capture"), + .priv_data_size = sizeof(struct dshow_ctx), + .read_header = dshow_read_header, + .read_packet = dshow_read_packet, + .read_close = dshow_read_close, + .get_device_list = dshow_get_device_list, + .control_message = dshow_control_message, .create_device_capabilities = dshow_create_device_capabilities, - .free_device_capabilities = dshow_free_device_capabilities, - .flags = AVFMT_NOFILE | AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK, - .priv_class = &dshow_class, + .free_device_capabilities = dshow_free_device_capabilities, + .flags = AVFMT_NOFILE | AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK, + .priv_class = &dshow_class, };