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 DA8B44059A for ; Tue, 21 Dec 2021 13:55:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5464768AFF5; Tue, 21 Dec 2021 15:54:55 +0200 (EET) 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 5C6F468A897 for ; Tue, 21 Dec 2021 15:54:49 +0200 (EET) Received: by mail-lf1-f41.google.com with SMTP id bp20so13852466lfb.6 for ; Tue, 21 Dec 2021 05:54:49 -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=4axSseDA+cc32lWcTsH+1ta6Ma+i8aKWlLXmXGb90K8=; b=mmaB4jEwHt3AyXAea56u7AEu/1EbmH1oPcYJeCfoVsMbsJia6COFU6BKdaKuPQXNhK pNlg0daQfTtDyt0BpcFIXjzjBehxrzX4W0tHoc3Dax5OWGRsR9TAcxVwo5Gc35vmoNbl rW1eFtktfUSQeAcIPPIsYv8M35WjoKMMoOR91FACUEgBquVxm/aCzAyBoU+IACVLVADH YiIu79dIOMto9uDCCNbAjcnZU84DzHrZkAXNRIfXoP49D7esvYCEgZUMl4V1ZAz9Yc05 Pa3yhkLClgQyZcTGm7lBzCsj4yVLGV8ilHH/18CZTCMhzt9VhcztEEH47EG0WetCMh56 njrw== 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=4axSseDA+cc32lWcTsH+1ta6Ma+i8aKWlLXmXGb90K8=; b=umrXBtnDUGm0xLh2/qHJbEIxFzHVrVGn7Z3kSHUnC9GgQ5MOvLgsIkmMr0t0oU637j PlT16Pg9oyt6GrYfnuK71iQQhcjUkoKkKFmjicPc1XPIk2Seha27WbrG1JxqmYO9q91r k43DNGZfuRmlhN5JFfyPb/BDW3ivpmGPh/y9sglwPWL2uyrnDUwyhoIFxfm6Kn0qNGA/ fIoZ9ibiAUAt0fZ3xvMkXZZ0E15xo1q388pei9NigwWk1ywIALWdjtgjreZAtUFznzgN nDrGQieVUYKmh/osXhQVREGfcX06hzfPomNwh6wd6+xTpof4XOLabWDalpRxTdpXNHjt 3CcA== X-Gm-Message-State: AOAM530KDD22JPfmilBvN90jy0JH/fuzPDfbs7HnHa1OC6igU/9StC1C Va+ja+34BXbX9ovtSz2gjZmfPZpBr6fqiA== X-Google-Smtp-Source: ABdhPJzzmX+7Tgdta0CwCizVlhd1CvuyR3N2dh1rpGxKqGVUgLlzTxhnfk8glkw37qRMjgzoMjEaFQ== X-Received: by 2002:ac2:5b43:: with SMTP id i3mr3086460lfp.647.1640094888554; Tue, 21 Dec 2021 05:54:48 -0800 (PST) Received: from localhost.localdomain ([196.244.192.13]) by smtp.gmail.com with ESMTPSA id m3sm2735958lji.112.2021.12.21.05.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 05:54:48 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Dec 2021 14:53:33 +0100 Message-Id: <20211221135337.1348-9-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211221135337.1348-1-dcnieho@gmail.com> References: <20211221135337.1348-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 08/12] 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 | 1 + libavdevice/avdevice.h | 2 ++ libavdevice/version.h | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 2ae26ab8e3..8f460c7564 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -157,6 +157,7 @@ void avdevice_free_list_devices(AVDeviceInfoList **device_list) if (dev) { av_freep(&dev->device_name); av_freep(&dev->device_description); + 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..41f568d6b0 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVDEVICE_VERSION_MAJOR 59 -#define LIBAVDEVICE_VERSION_MINOR 0 -#define LIBAVDEVICE_VERSION_MICRO 101 +#define LIBAVDEVICE_VERSION_MINOR 1 +#define LIBAVDEVICE_VERSION_MICRO 100 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \ -- 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".