Skip to content

Commit

Permalink
lavd/fbdev_enc: move list device code to fbdev_common
Browse files Browse the repository at this point in the history
Signed-off-by: Lukasz Marek <[email protected]>
  • Loading branch information
Lukasz Marek committed Apr 29, 2014
1 parent 3050e53 commit 279ff8d
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 55 deletions.
62 changes: 62 additions & 0 deletions libavdevice/fbdev_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <stdlib.h>
#include "fbdev_common.h"
#include "libavutil/common.h"
#include "avdevice.h"

struct rgb_pixfmt_map_entry {
int bits_per_pixel;
Expand Down Expand Up @@ -65,3 +69,61 @@ const char* ff_fbdev_default_device()
return dev;
}

int ff_fbdev_get_device_list(AVDeviceInfoList *device_list)
{
struct fb_var_screeninfo varinfo;
struct fb_fix_screeninfo fixinfo;
char device_file[12];
AVDeviceInfo *device = NULL;
int i, fd, 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;
}
close(fd);
continue;

fail_device:
if (device) {
av_free(device->device_name);
av_free(device->device_description);
av_freep(&device);
}
if (fd >= 0)
close(fd);
if (ret < 0)
return ret;
}
return 0;
}
4 changes: 4 additions & 0 deletions libavdevice/fbdev_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,12 @@
#include <linux/fb.h>
#include "libavutil/pixfmt.h"

struct AVDeviceInfoList;

enum AVPixelFormat ff_get_pixfmt_from_fb_varinfo(struct fb_var_screeninfo *varinfo);

const char* ff_fbdev_default_device(void);

int ff_fbdev_get_device_list(struct AVDeviceInfoList *device_list);

#endif /* AVDEVICE_FBDEV_COMMON_H */
56 changes: 1 addition & 55 deletions libavdevice/fbdev_enc.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,61 +186,7 @@ static av_cold int fbdev_write_trailer(AVFormatContext *h)

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, 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;
}
close(fd);
continue;

fail_device:
if (device) {
av_free(device->device_name);
av_free(device->device_description);
av_freep(&device);
}
if (fd >= 0)
close(fd);
if (ret < 0)
return ret;
}
return 0;
return ff_fbdev_get_device_list(device_list);
}

#define OFFSET(x) offsetof(FBDevContext, x)
Expand Down

0 comments on commit 279ff8d

Please sign in to comment.