From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6CF91401B9 for ; Sun, 19 Dec 2021 19:23:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 45A9168AFA4; Sun, 19 Dec 2021 21:22:53 +0200 (EET) Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A21468A6F9 for ; Sun, 19 Dec 2021 21:22:51 +0200 (EET) Received: by mail-lj1-f178.google.com with SMTP id k23so12519274lje.1 for ; Sun, 19 Dec 2021 11:22:51 -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=yie/XzRqV5tcCF0aofRHOPPC3ODA4BaeMNA0NuLD30k=; b=Xhvxnz6QOwgFav5wiLyWNPejnm+mL/YDS1sZGXDSdQgSt00jh+hz/0ofQvfejD+i3e 0bIENVla+6YbE2/hw9HoSSu1ImncEejQaUS73mwFLj9bGNGKXzeTeuhNDNmCjqhArIU0 qfLIGLI5/qWEzSoBMkJ7Yn7cx2X3aeXps6OqLdzD3cVRCho6ZOuMVmxW48d6gD4RBUQ3 CYqjYsR6XoAahcJeO+lmGiVslTGNtccFIpcmumC0Wyqmx4723K7fqdHKqZsecurrOGoY BK79VqChV5GJKEwyjDwWITmDCftATnBgZRFvAxtX0yNzYlm8r567pNay+PiAnq/nLFQs FmXw== 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=yie/XzRqV5tcCF0aofRHOPPC3ODA4BaeMNA0NuLD30k=; b=nm6W2Rmr1qqVKSy89Q46SR6aGFptxJt8zKLNMOOULTGf5d6FxJqFfCfmRC3lpIQK1R fOFqWrIq0xaQqgcxLMlNVs7wCTnrHJcQWVCllB9V7GMpmb0DnbX/xvi1crSVNxE1BP4o W3RX7kVSVygRL7Hee4JBIstgb7vffnm6jyALRP/7l5NNa7b34Hi2Wb1dxqR/fwa8lm9W z51xlas3CowC50x2F20p3OhrlJMnyJtQB2HfoX5ZS1XiF4uL5W6rQLpk72cOQIc40pI/ 92mxJaDqfPOd6EKcy61GP0a6QNRamOYvAo9fP8wxzxQN6us21tXG5Gc+wcNEN/ykMRVV jKKw== X-Gm-Message-State: AOAM532P3cFmc8Q8e9an6kxtycal/VRLJBXmBSx6xK1dRo1w8qoF5Xfa xYpN08vXbbIos8H5Wwaa2rNoZ+jkTu6C4k5O X-Google-Smtp-Source: ABdhPJzk48HYWirmIhH4EBvN8uZbGb7B0NHMOBLtcv4U7yEaJFVUqt5UZZKd3n/zlIOiQsBHwLY6BQ== X-Received: by 2002:a2e:8753:: with SMTP id q19mr11495607ljj.310.1639941771074; Sun, 19 Dec 2021 11:22:51 -0800 (PST) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id u22sm2127360lff.118.2021.12.19.11.22.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 11:22:50 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Dec 2021 20:21:30 +0100 Message-Id: <20211219192134.1296-10-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 09/13] avdevice: add info about media types(s) to AVDeviceInfo 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: An avdevice, regardless of whether its category says its an audio or video device, may provide access to devices providing different media types, or even single devices providing multiple media types. Also, some devices may provide no media types. dshow is an example encompassing all of these cases. Users should be provided with this information, so AVDeviceInfo is extended to provide it. Bump avdevice version Signed-off-by: Diederick Niehorster --- libavdevice/avdevice.c | 2 ++ libavdevice/avdevice.h | 2 ++ libavdevice/version.h | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 2ae26ab8e3..712ef1e80c 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -157,6 +157,8 @@ void avdevice_free_list_devices(AVDeviceInfoList **device_list) if (dev) { av_freep(&dev->device_name); av_freep(&dev->device_description); + if (dev->media_types) + av_freep(&dev->media_types); av_free(dev); } } diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 8370bbc7f2..6f24976dcc 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -457,6 +457,8 @@ void avdevice_capabilities_free(AVDeviceCapabilitiesQuery **caps, AVFormatContex typedef struct AVDeviceInfo { char *device_name; /**< device name, format depends on device */ char *device_description; /**< human friendly name */ + enum AVMediaType *media_types; /**< array indicating what media types(s), if any, a device can provide. If null, cannot provide any */ + int nb_media_types; /**< length of media_types array, 0 if device cannot provide any media types */ } AVDeviceInfo; /** diff --git a/libavdevice/version.h b/libavdevice/version.h index 914e156ec7..c549768e12 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVDEVICE_VERSION_MAJOR 59 -#define LIBAVDEVICE_VERSION_MINOR 0 +#define LIBAVDEVICE_VERSION_MINOR 1 #define LIBAVDEVICE_VERSION_MICRO 101 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ -- 2.28.0.windows.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".