From patchwork Fri Jun 11 20:30:40 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: 28227 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp763649iol; Fri, 11 Jun 2021 13:34:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbalcC9Thdt79ON+fUs3nCjh9Ly+b9aCEtQ2Psv+ZnuLJuOSqb/dj8UFVWqnVnsQCXKt4J X-Received: by 2002:a05:6402:2049:: with SMTP id bc9mr5554505edb.298.1623443659117; Fri, 11 Jun 2021 13:34:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623443659; cv=none; d=google.com; s=arc-20160816; b=UTtJVQWiNEldbjrpG5rsHo8kElpufuIP4IQCJEt6As9ZgP6VtTzZAaJOrPheq8tk+Q ZywtOlLkfzvsAunVEKmpQAMKx5armUy/9qVnxamCDvDwKcHNprhdKRENObtyeaaB0aBn S6Wyaj3/+CsCmEOnKYKibHx5Zl+k/hRkowuIIiPgy03wTADW3SyWSNKtSYA+BHVbyqfk VB21wHiBiUvms+GiVkxMrJ+Atg5MYcwIJo6Z0yDcJAqDkZ0ugtZszhM3CgvC99c8rLto 3P02NGQeioxQcJUmZ2dkT2snYKTwldEQK2mrxfeR+lIcRvOPoXfVN2ttBtkNPsXZsgji PI+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: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=VYovX04yvtBmGUvtMmqfxUhgmFYZc8zPOOCCuJCieso=; b=HfpZLPtqFhWkYp5s9tGdGqQR3s4kcnwjbKNkxVCQWmXGYTeM6jJ/5eDV7ELsavTIAB iZvz9fOWcw2HUzRReBkr0xvSrg/BnyN0KgbLKr/C9PaD3sQxAG9p2i81oGIEdds2sVtt +oxWIWx4hXyNPxzK4RxOnRtLnsAkNQOI3NRdz8t5vR97lMO6IvWKOF6WxQRHLQnah9zh eF8qqf1+CHye1gJ5xsrT46NY71MODLwarV5gKqGzx6av8fFABBFFSBjjI9fRiYkuvRL9 zGr64blf/dMa2xLUnr2DIRglp7ifq53x24LyIX5Y3fS1k7RvfASWtBladUquhg/h4QmG OaJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ebKRCvHy; 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 c12si6390362edx.372.2021.06.11.13.34.16; Fri, 11 Jun 2021 13:34:19 -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=ebKRCvHy; 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 2362E6880FC; Fri, 11 Jun 2021 23:34:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93FDA681871 for ; Fri, 11 Jun 2021 23:34:11 +0300 (EEST) Received: by mail-lf1-f47.google.com with SMTP id v22so10384118lfa.3 for ; Fri, 11 Jun 2021 13:34:11 -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=XQsT+HJ/fpI/+IE04CMwa1gpL/ijG1wbnVrrc1uV5K8=; b=ebKRCvHyUXnN0CxN3NMozGeUTzjMQXFuPaDrA1T4jzTa0mrbBDLWpYSz0J1TlgXUAR qj8TEskCMePPLEaF2KRSkiHlTCtjLbZnWlHNccaYbRrkadn/l1btWs1Oy0hrqe4f5PtX FzcLfl9dm6KZtjH9hlKz8BW13+8nMX/dV4fI5yzuUWbydTbeBAy2N9sXJ/lLQ7wu8iZO mGUKUVse6wmJnbtIygQpkdtTjnSWeAgu8LFESwYMRs0Jc3Spn9ljIGcuJKnDMqKu3bIv 7pjiBk0xbRQE0HI+1LNj2HwuOVyD+wZ/IRlFw8P4gE34JAp1B/AW4VqV/OzGRCgYP+kx oxrg== 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=XQsT+HJ/fpI/+IE04CMwa1gpL/ijG1wbnVrrc1uV5K8=; b=ki5boCcKKjDPlPEBYHOUMoG/bSSHXa/cmkYOEPVhs+ueADrLLZyR83oWRRkymF0LP0 3OPaP0lDLvg6SQFtBaO5ePvqPaft7PcXrO7WeKVWotLQ8vlQFhcfuPLzkOJ5ccIuNC2C PNb38YsPQ+EHsKtQIHCHX6LsLJtZPRccEPu3ZqH5ov93uoVVD6IFSS1c1gWteUzRDsX1 RmYBCSAZueqTZVpqgVyBu50BqWQTUzF5nW7iN7MzjEMUwbHabvEppdf3XQypHtTYEDOX aiSSS/ecbtE5jkxwb6PT/JwDOb2FBVhZXU5uGmzFUOzNpwURO3D00H2dUdiEL00FjOkZ CTMA== X-Gm-Message-State: AOAM530fok9UwoPkFJSA/d+TEka6/Ri8IFkAGOp3aXBfTle/j7tikU1K AgsChz0cWZidgTDrr9bmFyBCHqkjtvvc4g== X-Received: by 2002:a05:6512:11e7:: with SMTP id p7mr3510949lfs.615.1623443650462; Fri, 11 Jun 2021 13:34:10 -0700 (PDT) Received: from localhost.localdomain ([196.196.203.214]) by smtp.gmail.com with ESMTPSA id o6sm685575lfr.268.2021.06.11.13.34.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 13:34:09 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Jun 2021 22:30:40 +0200 Message-Id: <20210611203104.1692-10-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210611203104.1692-1-dcnieho@gmail.com> References: <20210611203104.1692-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 09/33] avdevice/dshow: add media type info to get_device_list 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: TVxqlwZE9cNk The list returned by get_device_list now contains info about what media type(s), if any, can be provided by each device. Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 5d7f065a8c..3e41f4f99f 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -377,6 +377,11 @@ dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum, if (!device->device_name || !device->device_description) goto fail1; + device->nb_media_types = nb_media_types; + device->media_types = media_types; + nb_media_types = 0; + media_types = NULL; + // store to device_list output if (av_reallocp_array(&(*device_list)->devices, (*device_list)->nb_devices + 1, @@ -412,6 +417,8 @@ dshow_cycle_devices(AVFormatContext *avctx, ICreateDevEnum *devenum, av_freep(&device->device_name); if (device->device_name) av_freep(&device->device_description); + if (device->media_types) + av_freep(&device->media_types); av_free(device); } if (olestr && co_malloc)