From patchwork Tue Jul 6 09:20:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 28810 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp4922845ios; Tue, 6 Jul 2021 02:26:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzR9YiLBJiqPpvWdNIYWgjuJI13xosfbslgc37XZY2hDKhHMoYjgJuH+uW6OQ0F5T/fiIGn X-Received: by 2002:aa7:c405:: with SMTP id j5mr21861507edq.122.1625563613392; Tue, 06 Jul 2021 02:26:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625563613; cv=none; d=google.com; s=arc-20160816; b=aToADx2BuaMy0KoB+KrM1OgiFlNnQHtawYJEEYIe6RMedirS31BozkJpJ1/GrXEKPH ZPpyFjpWUKRsT5F0ZkFaXAVWR/vMZuodYJkiMEbd/0v8ubjT+eDXq+sIeS2WMjPrW/4X jFK2kj0F+iO8RflUNnDYIxJOd7YV/z7/co9NpXbaS0QD3swlzYOa6ZFl6pDpU2glMOVj CinZ+G8d9cO4QpdFnlHZ7uZa6pLoHqBDJqFUCMLhEcmYjHBQbT8AkDciDJlAbI6hSjMs RbGZmFbNj/xxPDhvzaq7vmsPaaPZe62TGzxnjVld4SNm+5loWsU9GeE4JKlMuszt5Gly y48w== 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=tl1zOn+BN4wKoigslojN/S17c5oa5jgqvsjLynM3l5A=; b=CFAzGAnRGmVex0aeQoc1Gj6nOvGITTDXJySN7Kmx0VmE2XoVfbvFGMl+yZT01K78AL rxPc/49q10t1Cne9Z/+Lw1G4X1gkCGJDncnBhbhZMoL7tPXFRHpWO2e+iqsnj5D/+4Sf SJokvJydyb/dTFRyPJzBd6RVO9KvzegbmYkNOmIRK2lKcmFuNtjYAKXfvIOCTYG2OhHc DJnME60qC80SoxpJGoM5PgZcPiE34GddGyuiL0Z5FctMz4KvtW+jizjEyIFKyt8+FIeE sXrXptxK/HxEWnmNnyEfQryeb+Ov4LbztKMxZ+FUwbMjLtJalK4l7CQTcBhdIb3lqlkx YtpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=X8uYdJzR; 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 b9si12227359edt.280.2021.07.06.02.26.53; Tue, 06 Jul 2021 02:26:53 -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=20161025 header.b=X8uYdJzR; 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 8AA6168A920; Tue, 6 Jul 2021 12:26:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B44268A906 for ; Tue, 6 Jul 2021 12:26:29 +0300 (EEST) Received: by mail-lf1-f43.google.com with SMTP id n14so37189092lfu.8 for ; Tue, 06 Jul 2021 02:26:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qfFKQXhkcuhRl2ADT89geLysnLo2M+neSwQ0qOQEo2Y=; b=X8uYdJzRLOW0RHzXbxyaJU6pF9LbLOCjU0Ov8pQVyqlrDCGscdvH0p53ybV1RAcze5 tBFmvole+CrbHuXMW166DjKtHcEDtdbQ98vzrxJylbsk0W31cFvuqfQp7NuKpa15biwc tCyZTNrOdKwlCK3+wpxif253YSLX8/ew+JBu7+/85ZV92kEK4hsjgldRx+LivGU1RBJQ cdiGwCKDmVyY7NLoODM70+wkKxHplsEXvvGjFcvFM36dnU7HaKcHBVOSxiOkoaTtpy2O EFTUcbxmFUkhcUsEPUNSp7vv65mtKlnxZag/knqOIr5cBX3tyXZZdXSfs8orGfVau2UN h1PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qfFKQXhkcuhRl2ADT89geLysnLo2M+neSwQ0qOQEo2Y=; b=rRb3/yUtGrC61nkadhSRAVr9RD9uLLvDnVULw+mLW/gMJZNG00Av1vhKJxAAfSv6sf cPZemix6TfmOgozrxKJ2VopWTHj2OBJ0WZRR6UrbFvlqi80h8iONwcGcDqkALY1eUevL J+hGfu6zH5Tb0MxgNtnjDCxZ/IKQkUA4cVIlIZvdYJ2sqKQijqiHCYaka4saeCRm0q2D yADEBJ56pSIq1VV/429Pb7LiY7029yu0jQbs3T3HPSsWW8FYWw7F41CncjqcPmJTqnU9 lYxxZ/WAmJt2C4SJOiuBXe8BNTAxXf+6484o0B8CxTO+YmY1eDb4w0SSea/j/w6Jw15R jOlg== X-Gm-Message-State: AOAM532dMVpoAoR9rDi17gT6Tfurs8y2X9emyUazI79mhTbqkArUsO/I 6YVyCm5+TYuVSXMSeCcsNnM1Z38R/vs= X-Received: by 2002:a05:6512:239d:: with SMTP id c29mr2003210lfv.355.1625563588655; Tue, 06 Jul 2021 02:26:28 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id i4sm1339401lfo.308.2021.07.06.02.26.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 02:26:28 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Jul 2021 11:20:15 +0200 Message-Id: <20210706092020.1057-30-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210706092020.1057-1-dcnieho@gmail.com> References: <20210706092020.1057-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 29/34] 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: xYilKnxfLXYU 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 590a007073..f900e89988 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -963,6 +963,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; @@ -1580,7 +1581,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) { @@ -2465,16 +2467,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, - .control_message = dshow_control_message, - .get_device_list= dshow_get_device_list, + .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, + .control_message = dshow_control_message, + .get_device_list = dshow_get_device_list, .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, };