[FFmpeg-cvslog] fftools: provide media type info for devices
Diederick Niehorster
git at videolan.org
Fri Dec 24 10:40:50 EET 2021
ffmpeg | branch: master | Diederick Niehorster <dcnieho at gmail.com> | Tue Dec 21 14:53:35 2021 +0100| [5c90c13a569fb8c6e11edd1ef9213831f264a8a7] | committer: Gyan Doshi
fftools: provide media type info for devices
fftools now print info about what media type(s), if any, are provided by
sink and source avdevices.
Signed-off-by: Diederick Niehorster <dcnieho at gmail.com>
Reviewed-by: Roger Pack <rogerdpack2 at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c90c13a569fb8c6e11edd1ef9213831f264a8a7
---
fftools/cmdutils.c | 34 ++++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index 882584e9c2..1444ea2f07 100644
--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@@ -2244,9 +2244,29 @@ double get_rotation(int32_t *displaymatrix)
}
#if CONFIG_AVDEVICE
+static void print_device_list(const AVDeviceInfoList *device_list)
+{
+ // print devices
+ for (int i = 0; i < device_list->nb_devices; i++) {
+ const AVDeviceInfo *device = device_list->devices[i];
+ printf("%c %s [%s] (", device_list->default_device == i ? '*' : ' ',
+ device->device_name, device->device_description);
+ if (device->nb_media_types > 0) {
+ for (int j = 0; j < device->nb_media_types; ++j) {
+ const char* media_type = av_get_media_type_string(device->media_types[j]);
+ if (j > 0)
+ printf(", ");
+ printf("%s", media_type ? media_type : "unknown");
+ }
+ } else {
+ printf("none");
+ }
+ printf(")\n");
+ }
+}
static int print_device_sources(const AVInputFormat *fmt, AVDictionary *opts)
{
- int ret, i;
+ int ret;
AVDeviceInfoList *device_list = NULL;
if (!fmt || !fmt->priv_class || !AV_IS_INPUT_DEVICE(fmt->priv_class->category))
@@ -2258,10 +2278,7 @@ static int print_device_sources(const AVInputFormat *fmt, AVDictionary *opts)
goto fail;
}
- for (i = 0; i < device_list->nb_devices; i++) {
- printf("%c %s [%s]\n", device_list->default_device == i ? '*' : ' ',
- device_list->devices[i]->device_name, device_list->devices[i]->device_description);
- }
+ print_device_list(device_list);
fail:
avdevice_free_list_devices(&device_list);
@@ -2270,7 +2287,7 @@ static int print_device_sources(const AVInputFormat *fmt, AVDictionary *opts)
static int print_device_sinks(const AVOutputFormat *fmt, AVDictionary *opts)
{
- int ret, i;
+ int ret;
AVDeviceInfoList *device_list = NULL;
if (!fmt || !fmt->priv_class || !AV_IS_OUTPUT_DEVICE(fmt->priv_class->category))
@@ -2282,10 +2299,7 @@ static int print_device_sinks(const AVOutputFormat *fmt, AVDictionary *opts)
goto fail;
}
- for (i = 0; i < device_list->nb_devices; i++) {
- printf("%c %s [%s]\n", device_list->default_device == i ? '*' : ' ',
- device_list->devices[i]->device_name, device_list->devices[i]->device_description);
- }
+ print_device_list(device_list);
fail:
avdevice_free_list_devices(&device_list);
More information about the ffmpeg-cvslog
mailing list