From patchwork Sun Dec 19 19:21:31 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: 32735 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3695890iog; Sun, 19 Dec 2021 11:23:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJzx4H7aCCZE+bsJ1nQmBhbyIrlM3y5mQKXIu4TC6DJmjg4vCKDL7meTTh1Oyi0gr3P9OmpL X-Received: by 2002:a17:907:728b:: with SMTP id dt11mr9517363ejc.225.1639941823334; Sun, 19 Dec 2021 11:23:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639941823; cv=none; d=google.com; s=arc-20160816; b=A7FvWS0G6bVur6AE+f61pKfnps0WyOwcu6F9NYkFO+TpWg4txAmopLxUUIwJZ4h7oz w85KzgulQKGoFScYCJNTL0z5tNHaDfmNNulsYWJb6QFlkXBxn2uxA29MgJgilPXqt22E FWc9qT0RVUU+1T3Ldd1+CxL3T8S46w1p0rO7JW1NKDF3zK7VERHJCluMqPYmugDMODsW UGnPi1FOsSC9UV/eWN/rDk4jo6UFhUAhfHxa5vr00iOiLbpKPMYI/nQj8PsUTQnycvt8 pyLJXqCoBTnie2ychWfM7cRJiiLzzafGODSCTaJdNhmV1ciHSoRVI9hEGmUI6jV8GXoD 3Fzw== 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=Zu2T4ab5HxjOHbuCrEaxxFyBmbPFlvt2PWCGxRCSK1wTEuBYy2glLWd7y9gFBRnq0p AH+2676jOaKHR75mgViyjW0LMKapI0hFsNRNaCGj9nWoR8a24aB5Oa1Qxbkj9rSQ8KiV rMqrLLQf2rXEjCTJHDHQcjGPSM8ljAY0eV2NMjNGdRKogkp6Nxv+871Xrz/YK5b2L8iO eZRLIEpOtHzbB/tt7X4e/cPr4/2iG2DLVZKxTyJbKFQLFTyhJ6DvIXy61QkDK0npOuiG iXyhO/1nWH9NepVU4TSffPUvWFI2+OdxFXyohYu5scFAJ+Yc1rMZj6XA0uXDXL02gMCz vgrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pqJIZd93; 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 gs39si2931807ejc.803.2021.12.19.11.23.43; Sun, 19 Dec 2021 11:23:43 -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=pqJIZd93; 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 A2ED768AFC0; Sun, 19 Dec 2021 21:22:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6659B68AEE7 for ; Sun, 19 Dec 2021 21:22:58 +0200 (EET) Received: by mail-lj1-f173.google.com with SMTP id b19so12434318ljr.12 for ; Sun, 19 Dec 2021 11:22:58 -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=pqJIZd93KVdyP2UDibyqechn/NnmScTp1XX9GCPIPqEhNEf+SFJYTT6MtMxM15Kswi XRAZtSlFj2uvfwtMihs7W1YTKCz8sMJMlSwOByd1rJrLPA6TKD9EUrD3H46As0TQZICU wOFj6paAmuwvP+y6EjUoTf7hv1fd6JSDGuwbJN/N+DRrFgYxbBtPUcp6dmgA2yhwnyHZ 4XLLj8MW1ZaHDHQEJrSSxCTAB8LDlo6by+XZWNf2FH8IiDzzMeO00BDG8AXW+3HQ6nbv hO30RN4FzCdnfC/5fu5EyXWPw09HmwoqP+ftI4Ta0JgsqUffE8xX3nE0QoMZAAuciFRA M81w== 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=fmdHhBQGVCP/y9XKaRsbhIKLYV1fTTMTd/AFF6I7CLU0+PxpBkmQ9VWM4MnfH3KHi0 7r19fANtw/Tl/vKM8pm5yW50NuYcjXii5x+cMu6/lH20NawxuIVfnejm+KHMbzUZER7A AZkN1CmET5pJaYxlTHDwcXUyj9LZcIxG4OehL4GVY04cDlXf1Rwq7OmPWoU5pSmMskmI PhXTfqiLBTij7STpjJ1YO0k929Nphyc3GoSMUoV5m0Pveu4aVSdK3v+kr/3McRKZIakP dTkwJkApIwtKa36DX0Ywj8h+ClV+zqi10Pl3qwgaQe8Ba+rT7IAEhYJEMOukzpqlK2X4 YF/Q== X-Gm-Message-State: AOAM533y/UrQgtUDlIO70iMlF1KXUOiLPKRLzzRpPvntIInQxGaCCTQy Rv+bHsHIEME/IAm6DUczfbBdPqnwBJdCujGg X-Received: by 2002:a05:651c:1049:: with SMTP id x9mr11493552ljm.121.1639941777548; Sun, 19 Dec 2021 11:22:57 -0800 (PST) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id d14sm504531lfg.55.2021.12.19.11.22.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 11:22:57 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Dec 2021 20:21:31 +0100 Message-Id: <20211219192134.1296-11-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211219192134.1296-1-dcnieho@gmail.com> References: <20211219192134.1296-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: BorzaTW6cPCw 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)