[FFmpeg-cvslog] lavd/fbdev_enc: move list device code to fbdev_common

[Lukasz Marek]

ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki2 at gmail.com> | Mon Apr 28 01:34:18 2014 +0200| [279ff8d2f6dc9b769dc31d6490ef4244c416cafa] | committer: Lukasz Marek

lavd/fbdev_enc: move list device code to fbdev_common

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=279ff8d2f6dc9b769dc31d6490ef4244c416cafa
---

 libavdevice/fbdev_common.c |   62 ++++++++++++++++++++++++++++++++++++++++++++
 libavdevice/fbdev_common.h |    4 +++
 libavdevice/fbdev_enc.c    |   56 +--------------------------------------
 3 files changed, 67 insertions(+), 55 deletions(-)

diff --git a/libavdevice/fbdev_common.c b/libavdevice/fbdev_common.c
index 45ae08b..634780d 100644
--- a/libavdevice/fbdev_common.c
+++ b/libavdevice/fbdev_common.c
@@ -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;
@@ -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;
+}
diff --git a/libavdevice/fbdev_common.h b/libavdevice/fbdev_common.h
index 40a1ded..7b81a8d 100644
--- a/libavdevice/fbdev_common.h
+++ b/libavdevice/fbdev_common.h
@@ -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 */
diff --git a/libavdevice/fbdev_enc.c b/libavdevice/fbdev_enc.c
index c776d0e..28efc71 100644
--- a/libavdevice/fbdev_enc.c
+++ b/libavdevice/fbdev_enc.c
@@ -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)