From patchwork Tue Jul 6 09:19:55 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: 28792 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp4920240ios; Tue, 6 Jul 2021 02:22:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3MLo3G9LPrVt3zaUw7H+LzWv83rWH7RGVbqBk/qwXFMa8XrX5AhcpgZc0gxHbs1Pa4KEs X-Received: by 2002:a17:906:1284:: with SMTP id k4mr12953153ejb.329.1625563367341; Tue, 06 Jul 2021 02:22:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625563367; cv=none; d=google.com; s=arc-20160816; b=XIq9UVamQ1lDHRV0UAs0inaeejEFaG1iTE+6SEu/0QYtztvHMEzWvqUZBvUswyL0rM TDU9bULwfBf6p8kmKkp95iWaDIlXNoBLpJKVjh7+vk2jbFRvJ0MC8JWXsOIEJpicDfcz 1pCNvlR+0A+rwxZpKWR0O3IMYAXbSoM9rwRaqOgqxCshLigpv3+eDBftykj46UT5YXW8 YglR0B1E3oEwjNHCwF8/kfuCnAPXxHfRkBalexBJviFZ10QcUOB679ZjWpZY0UTZNPiu NBZu61yu55Z1BoIC5PZ+6Imo2xa6Ze5SK3+/XoeUDmwaeaT/PeCCJv3dUiBkBqF5eZ8e 5DhA== 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=zKvzKuV2sS5bYhwxHcu0E7tY07j48sPxCoiuRPb5T3s=; b=AjmUHlDtFAtCrTzuHXkLwBPwTRvM2GMmiySzN8ft/46ELwwtKe195fAQnyRrZ6BJF3 vvCue9B6ICzn0isRbeA0shvkcq40t7Vb9GnUzyhZyNDnc/a/ot+BQMgYmVJxdZRx+uex tXdBqDkvxOMzk0pDv3vXSfFR3QlT6FLIX8wEnCaMxCWB4jlCvtAdqLy2ruHgWvgf5z8J spNUnbGRaehG1KVbwzMH6cWPfPAkWxC07QjYfBPZJ46zxQ1NLRJYdvt0rtrB/S9bYZnW VphwrK7i/qGV3X8u2FQdJNRPBhCPviZ3zNXfFJt55/p4GBC9SdH97TCufn6JcTD8RDL3 oJ1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VTUReunC; 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 w6si13754675edd.335.2021.07.06.02.22.46; Tue, 06 Jul 2021 02:22:47 -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=VTUReunC; 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 9451868A6EE; Tue, 6 Jul 2021 12:22:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11E4B68A6EE for ; Tue, 6 Jul 2021 12:22:38 +0300 (EEST) Received: by mail-lj1-f174.google.com with SMTP id t30so8231054ljo.5 for ; Tue, 06 Jul 2021 02:22:38 -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=JphIRvuq57WFNLxic8QTmnM9DmaANeYI80UYvktL84Q=; b=VTUReunCr/1e/SwpeiGvJHAsitnr8asMlyf0/dp3GXByBBfKSDOOwh/uaziuJtuUnx AdML8DIfGpjY+Sx5c/JxCPGSy7uZ6zuDI8gKt+rKQSPqmicBvAZZjr3ZL+gR7pXa1EYk ljhJwWn6FN5JqOH/2+8J9kQDygkvjew8i0qHrp9cbfRK6DMoN/VwJqhXaJbmEQThnq/U YEf5lp3uDL9Aldtuh+GWY8CsWvZ0Kt5PFBi1MAyHMrTSjthQE/JJoVu4p3SQR4Xg4vBu gGr2RTpKN4OVZCKNxnCukG8sDKd2d0pvIqIypxfDRLOaHRYtAGd7NnsVEzZu+Owey8AE vD4Q== 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=JphIRvuq57WFNLxic8QTmnM9DmaANeYI80UYvktL84Q=; b=f2lCUQ1V71xc11QwD0fAPxvrwTUIriVL0BvaqFw8+yJdhhehkGAjcn6s8K2aicoMQf fPW3ubyJehpaPiEExmmHnoMCUoDvC1UtKWyPAMShGEAZoKHKZUn1R/teg+N8WuVDqniC r2Ir9CQndd/rn20Q2Hf8SX67UnMGLLINNdlj4j8QMv8iViUVNnM7jG7nj+lGmqrXSR7z D1Osdrui6QsWtQmfGv2nxvhtAGNWgVxTfPG1AhPjxBC/zsBf3CtCAojSCvlnOcCVs9NH NOHIdGUMvRS2BgaYn3vC4/B9ITb8Yel4l5N0I1OpHJVq3xSxxXZXt5vV737uAAjWeWjT HSDg== X-Gm-Message-State: AOAM533gNg3yrSWk9bTKGwNgTyRaErGbQPiVeXHMGPu0UTTy8X3rLiSt YhDf7llVUzAT0FD3/KMxnuy//AY3y9s= X-Received: by 2002:a2e:8210:: with SMTP id w16mr14567418ljg.278.1625563357920; Tue, 06 Jul 2021 02:22:37 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id m6sm1338824lfu.238.2021.07.06.02.22.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 02:22:37 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Jul 2021 11:19:55 +0200 Message-Id: <20210706092020.1057-10-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 09/34] 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: 0k0NrsWPvTeR 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 8e693875c6..dae0ae5d70 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)