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 BD83740551 for ; Tue, 21 Dec 2021 12:14:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B98BE68AFE1; Tue, 21 Dec 2021 14:13:48 +0200 (EET) Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C28468AFB3 for ; Tue, 21 Dec 2021 14:13:47 +0200 (EET) Received: by mail-lf1-f45.google.com with SMTP id g26so13055398lfv.11 for ; Tue, 21 Dec 2021 04:13:47 -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=eknp3wqIbbuGNVTK1pUxaX5j7YrXyBPhTLBAgj18quMkh2SbV1YsolMtn1PkXoT1DU tdqDtDH/ysZAVPzgpq99oCMV0csd0yRTEo2S2u4idK10YgpNEzTEaPw7veJlsPxH+4n5 jXODYFg6BR7xBIwTh83I4/7uCFCDOzFozi0XsX8KPBVvsEWbcdPpAyNBfV4zt3il5n9O tYZLf/qh2cpVESpdwgiYlFsPmCOLiWaT16je5HaLwPO3trXZuiurF7gMCJVaSLnouCwc vYl5keh1SmJT6Oa2z+UYkrX1RK3lzbqQJm/WpPrbQIfQn+sTje8mZ6UqVLzmP2OeqCEi 0ubQ== 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=MsW+Af8JB6z6nvXjlfCOItnHpRHZFjC/FhqC+bqxkBpfBhVMvQdIJZJnKR2VhS7gD2 nBRuwkZgbdfEVS+bXcGikXnn5qfJl37nuPCezgHplagVTDoTe49uToIDOhpfhsdWQR2D vQgAFWPH1segEAefzkIvJ4uA9DKGHDz9ws/6+ALK4yPzQ8a6Mf5t1c30TY72SuCbauVC l/ZZXAQkS4+Z4i7utmX6FhqBQc7l9ajZEWY04iQstkm8GEIUTa9qeuUSOHtDqae/zT5m Fzj40BkGXam9UrkyJFJWaV2NFCyXPztIVGeqBmzJMF0tS8niWwkDT9l++N/gySG4ET5N ORzw== X-Gm-Message-State: AOAM531i52dJjBWRd0i8TDgTq1Ymuflw7tTYRzxf1MuEV25OmX4kEaKT 10SN0gghauh2owEIBkY5puBZG2wyRPCJZg== X-Google-Smtp-Source: ABdhPJwLtyYJEyHyAFVypIY9Ko5V/Ss6FtoS+g6qGyJFE2AwJCDoxsv1axoUi4kbDnidrb/5NmSQQQ== X-Received: by 2002:a19:e308:: with SMTP id a8mr2796040lfh.220.1640088826157; Tue, 21 Dec 2021 04:13:46 -0800 (PST) Received: from localhost.localdomain ([196.244.192.13]) by smtp.gmail.com with ESMTPSA id l5sm1267493lfk.167.2021.12.21.04.13.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 04:13:45 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Dec 2021 13:12:35 +0100 Message-Id: <20211221121239.1201-9-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211221121239.1201-1-dcnieho@gmail.com> References: <20211221121239.1201-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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".