From c1c3c3611ef13af824f507d1ec4d4ace5ac78c9a Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Sat, 12 Apr 2014 19:05:54 +0200 Subject: [PATCH 1/3] lavd: no default device unless explicitly set AVDeviceInfoList was allocated with first device set as default even though there is no device after allocation. Signed-off-by: Lukasz Marek --- libavdevice/avdevice.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index bc79ca7030..6a75bd79d7 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -194,6 +194,8 @@ int avdevice_list_devices(AVFormatContext *s, AVDeviceInfoList **device_list) *device_list = av_mallocz(sizeof(AVDeviceInfoList)); if (!(*device_list)) return AVERROR(ENOMEM); + /* no default device by default */ + (*device_list)->default_device = -1; if (s->oformat) ret = s->oformat->get_device_list(s, *device_list); else From afc898e7ce00c184827f507f72ea59f6abac2403 Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Sat, 12 Apr 2014 19:25:33 +0200 Subject: [PATCH 2/3] lavd/fbdev_enc: implement get_device_list Signed-off-by: Lukasz Marek --- libavdevice/fbdev_enc.c | 63 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/libavdevice/fbdev_enc.c b/libavdevice/fbdev_enc.c index 0fd1c666b9..2042c9631f 100644 --- a/libavdevice/fbdev_enc.c +++ b/libavdevice/fbdev_enc.c @@ -29,6 +29,7 @@ #include "libavutil/opt.h" #include "libavformat/avformat.h" #include "fbdev_common.h" +#include "avdevice.h" typedef struct { AVClass *class; ///< class for private options @@ -183,6 +184,67 @@ static av_cold int fbdev_write_trailer(AVFormatContext *h) return 0; } +static int fbdev_get_device_list(AVFormatContext *s, AVDeviceInfoList *device_list) +{ + struct fb_var_screeninfo varinfo; + struct fb_fix_screeninfo fixinfo; + char device_file[12]; + AVDeviceInfo *device = NULL; + int i, fd = -1, ret = 0; + const char *default_device = ff_fbdev_default_device(); + + if (!device_list) + return AVERROR(EINVAL); + + for (i = 0; i <= 31; i++) { + snprintf(device_file, sizeof(device_file), "/dev/fb%d", i); + + if ((fd = avpriv_open(device_file, O_RDWR)) < 0) + continue; + if (ioctl(fd, FBIOGET_VSCREENINFO, &varinfo) == -1) + goto fail_device; + if (ioctl(fd, FBIOGET_FSCREENINFO, &fixinfo) == -1) + goto fail_device; + + device = av_mallocz(sizeof(AVDeviceInfo)); + if (!device) { + ret = AVERROR(ENOMEM); + goto fail_device; + } + device->device_name = av_strdup(device_file); + device->device_description = av_strdup(fixinfo.id); + if (!device->device_name || !device->device_description) { + ret = AVERROR(ENOMEM); + goto fail_device; + } + + if ((ret = av_dynarray_add_nofree(&device_list->devices, + &device_list->nb_devices, device)) < 0) + goto fail_device; + + if (default_device && !strcmp(device->device_name, default_device)) { + device_list->default_device = device_list->nb_devices - 1; + default_device = NULL; + } + + continue; + + fail_device: + if (device) { + av_free(device->device_name); + av_free(device->device_description); + av_freep(&device); + } + if (fd >= 0) { + close(fd); + fd = -1; + } + if (ret < 0) + return ret; + } + return 0; +} + #define OFFSET(x) offsetof(FBDevContext, x) #define ENC AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { @@ -208,6 +270,7 @@ AVOutputFormat ff_fbdev_muxer = { .write_header = fbdev_write_header, .write_packet = fbdev_write_packet, .write_trailer = fbdev_write_trailer, + .get_device_list = fbdev_get_device_list, .flags = AVFMT_NOFILE | AVFMT_VARIABLE_FPS | AVFMT_NOTIMESTAMPS, .priv_class = &fbdev_class, }; From defb87eef4ddcfcabfbc3884ff8490dcb4e206c5 Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Fri, 11 Apr 2014 16:29:37 +0200 Subject: [PATCH 3/3] lavd/qtkit: add device category Signed-off-by: Lukasz Marek --- libavdevice/qtkit.m | 1 + 1 file changed, 1 insertion(+) diff --git a/libavdevice/qtkit.m b/libavdevice/qtkit.m index 3c21f57c85..3f1d3e1f71 100644 --- a/libavdevice/qtkit.m +++ b/libavdevice/qtkit.m @@ -343,6 +343,7 @@ static const AVClass qtkit_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT, }; AVInputFormat ff_qtkit_demuxer = {