From patchwork Mon Dec 13 07:21: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: 32410 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5073466iog; Sun, 12 Dec 2021 23:23:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJyVd0QCBMpcUM9i7GVfHCUUtU0XUct3d2c7UI8sAu+Kc59crvxscMACcv4oDSdJER2hLyiA X-Received: by 2002:a05:6402:270c:: with SMTP id y12mr62037704edd.258.1639380233184; Sun, 12 Dec 2021 23:23:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639380233; cv=none; d=google.com; s=arc-20160816; b=wl9Aw6YC+pbQSolZtYJkvPGAEx6kt9K7LnDQdtXZKNdmZcnOdn3mvD/R7Qxf/5hhcL qHSkWfxlXKIplLHICmLJTc9jnIivXTdpWmVhIwU/9VBtl5N/3aZA99tnuo/ekOCTEKWf dA2+tGqeAWXxSx5PgUI+txIMrRcCnm7V0Cgjk1VWA8mOX5roZPbFMMciXYDnbsjHpluZ 6s+PIvJk/GH0boJv56P3ArmqfCR9p5GNaSNIzQ3Hae8cFOBtL1frAT05GbqharuKbLBp c60Teyv1g0pvxuUAk0Ientlp5qQoWWYkYq1SPlsxMAG4Z3m1CnFip9DsZEI2aRjXEXSk yHhQ== 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=I99bVLkf4f1gGNkFQ7B/WUO2BMay5a+zdoMy9Mk53xU=; b=ns+KoTnzMXykV4DAFE3Tnnp/OMgZDtxikjfOBBlC6OVBMwpdsb14wcUATXfy6rfnX0 3pUkyYI4Nf0yxRe/+vvsAuiTH0dpeH6BU6MBGah7/efPs2c+JpoPgsQ7olsdtnkvP6eO jrn/YwLIq+JPrwOtLTmWDRONAzZh3L60NS78WGCDUgw3t0QEI2PHEqmyzjxgr/lh6lVr lv9vRX7IeJ/rNdYKLTUJQQbJw+7k7zeNEtsNQNKKvShwRswGwkdSeVsR8wug6VP/DsDy RWqgPlpCb/WE037wIhWKlSJ0KEetWk5HYoCnZ2Y8qkgsnvpOAAu6oAdxvBvjGUZ+kCgr voXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=LxPfrQyi; 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 oz6si15892279ejc.728.2021.12.12.23.23.52; Sun, 12 Dec 2021 23:23:53 -0800 (PST) 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=LxPfrQyi; 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 5A04A68AEEA; Mon, 13 Dec 2021 09:23:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D7BC68AEEA for ; Mon, 13 Dec 2021 09:23:08 +0200 (EET) Received: by mail-lf1-f41.google.com with SMTP id z7so29010634lfi.11 for ; Sun, 12 Dec 2021 23:23:08 -0800 (PST) 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=BGjJKuN4tAYhDYMwIqjARqL2KwgR7BpzwzoTWujEi0U=; b=LxPfrQyiHH39/9zp+flSjBBUTmw6IS3CEqjPGtSCjKo5s6mIkvK5VE/bqAezse0BlO 1bA56MqDo9k/RdpzqpwvqvD5tFTetrp2Vh91rrY6ukPAzAdg9DK5ETbAOwtdOf6OruJT Pr0wU3mmLSN35qtl6zwe9GUhCaF1c5dFwjJuvIMBjl9yCd8/m7yEyVXbWsK0Hj8cktqy YsA6qOvTLI9R4KvCe/5x08kptnPgUUrsAHbe5GZzMAJGabovLlTUlI2MmANFaMhf4BGV mxaHqy3G64K3Mw3rJqNgnlShxXC36fEZfziwz76KuQb3rzq3cFZzxd/eLxw+kRrU7QNo q4vg== 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=BGjJKuN4tAYhDYMwIqjARqL2KwgR7BpzwzoTWujEi0U=; b=N4HOl06gx43meDCQJiJrfmXhFHJN8vsMI3VvEbeq2uBH3KZNY1fvh+IfOGw3xwRKTM xMbRtnW6uwfuMfCW74B9H9BX9Y5ieLF4L1DSlxOV+w09qTF92QVhfk5DWZJdB0Ex5Ybt aJ7o9i85wbSXMfdBqQKQr77DQP3pGFLp9bHdAALQvSl4KkSm+OetQFARudHFS78D2Ku2 kJuju31v+4LOeM+dTIxOCUjoEJ30z6+PFSUk9ssXwco6+ue7ruNiWSni4yWCspkZSq0W T1nwd+2fP0dKkS8ky3SbmA2enUCPwZiYbRgZc3twL2cs89ct5m4LqhMX2qeH20dxsnNw GdrQ== X-Gm-Message-State: AOAM532k979e+vX1mcGtQJE25zw4SyI4Cq2E3q8HPZZ6tq3t0VMYVQl9 AaR6J/zlptyT7JAHl3asJZJxEE5EPiXImA== X-Received: by 2002:ac2:5f74:: with SMTP id c20mr23101624lfc.77.1639380187152; Sun, 12 Dec 2021 23:23:07 -0800 (PST) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id x18sm1334641ljd.110.2021.12.12.23.23.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Dec 2021 23:23:06 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 08:21:40 +0100 Message-Id: <20211213072143.993-11-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211213072143.993-1-dcnieho@gmail.com> References: <20211213072143.993-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 10/13] 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: 9SZHz8QckQcw 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 f25537db5c..fa3a06c077 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)