v4l2-ruby 0.9.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be244fd6bc1590054d5f177e8eea4e446f1f526b1d0d3bee2a9ff91bb0eb9fb9
-  data.tar.gz: d31e3955aca0938c4e4a131323877c44c55d223ef14e8366c2beba30768f78fb
+  metadata.gz: 8cd2fedcc6514a3b25e69d923538b2c044ccca1a6883ce5320fe7b2e22f4819b
+  data.tar.gz: 0b90ab5883e8c9835477e91e411e75a9b657b32e91a66ea52768271313af6634
 SHA512:
-  metadata.gz: 300875132ad4b5c060a1eb7ddfaff65040d28a902559bb120f4ec271c13d1e9ffc3f225415fbbb6930303e8fcefc0de85780149178ba7569bc4d39f090a5d323
-  data.tar.gz: b84fd83a6cd1f2141009a6032765be37334b9c8fa7edbf591245d7d6223984d70ebd005017262cb7a92bd61da7964e3ddee47d142965ac07c178136896c4d739
+  metadata.gz: a7f1da3bad3e6f4d1b45b5d8cf6c47765880ad557936de1a5fca4a829ea18930f208deb9382fbff57bab13bb33d6a74281df82226d08d00058a904ceb8d48173
+  data.tar.gz: e2631f2c448cd16b2ca1cb8de0ebe83e686b17397d0f56301b3b06824f6decfa120d2800d59729f3f44ab5b62b691bc0e8d52eec4c3d141fea38a99074c11ea0

data/.gitignore

@@ -0,0 +1,5 @@
+.rbenv-gemsets
+.ruby-version
+Gemfile.lock
+pkg/*
+tags

data/README.md

@@ -19,7 +19,7 @@ Or install it yourself as:
 
 ## Usage
 
-```
+```ruby
 #! /usr/bin/env ruby
 # coding: utf-8
 

data/Rakefile

@@ -3,6 +3,15 @@ require "rake/extensiontask"
 
 task :default => :spec
 
-Rake::ExtensionTask.new("v4l2") do |ext|
-  ext.lib_dir = "lib/v4l2"
-end
+spec = Gem::Specification.load("v4l2-ruby.gemspec")
+
+# add your default gem packing task
+Gem::PackageTask.new(spec) {|pkg|}
+
+# feed the ExtensionTask with your spec
+Rake::ExtensionTask.new('v4l2-ruby', spec) { |ext|
+  ext.name          = "v4l2"
+  ext.ext_dir       = "ext/v4l2"
+  ext.cross_compile = true
+  ext.lib_dir       = File.join(*["lib", "v4l2", ENV["FAT_DIR"]].compact)
+}

data/ext/v4l2/camera.c

@@ -61,7 +61,7 @@
 #define ST_STOPPING               (6)
 #define ST_FINALIZED              (7)
 
-static int xioctl(int fh, int request, void *arg)
+static int xioctl(int fh, unsigned long request, void *arg)
 {
   int r;
 
@@ -154,7 +154,7 @@ set_format(int fd, uint32_t fcc, int wd, int ht)
   fmt.fmt.pix.width       = wd;
   fmt.fmt.pix.height      = ht;
   fmt.fmt.pix.pixelformat = fcc;
-  fmt.fmt.pix.field       = V4L2_FIELD_INTERLACED;
+  fmt.fmt.pix.field       = V4L2_FIELD_ANY;
 
   err = xioctl(fd, VIDIOC_S_FMT, &fmt);
   if (err < 0) {
@@ -1262,8 +1262,15 @@ camera_stop(camera_t* cam)
       for (i = 0; i < NUM_PLANE; i++) mb_discard(cam->mb + i);
 
       cam->fd = open(cam->device, O_RDWR);
-      cam->state  = ST_INITIALIZED;
-      cam->latest = -1;
+      if (cam->fd >= 0) {
+        cam->state  = ST_INITIALIZED;
+        cam->latest = -1;
+
+      } else {
+        cam->state  = ST_ERROR;
+        cam->latest = -1;
+        break;
+      }
 
     } else {
       /*
@@ -1378,7 +1385,7 @@ camera_check_busy(camera_t* cam, int* busy)
     fmt.fmt.pix.width       = cam->width;
     fmt.fmt.pix.height      = cam->height;
     fmt.fmt.pix.pixelformat = cam->format;
-    fmt.fmt.pix.field       = V4L2_FIELD_INTERLACED;
+    fmt.fmt.pix.field       = V4L2_FIELD_ANY;
 
     err = xioctl(cam->fd, VIDIOC_S_FMT, &fmt);
     if (err >= 0) {
@@ -1397,6 +1404,36 @@ camera_check_busy(camera_t* cam, int* busy)
   return ret;
 }
 
+int
+camera_check_ready(camera_t* cam, int* ready)
+{
+  int ret;
+  int err;
+  struct v4l2_format fmt;
+
+  do {
+    /*
+     * entry process
+     */
+    ret = !0;
+
+    /*
+     * check arguments
+     */
+    if (cam == NULL) break;
+    if (ready == NULL) break;
+
+    /*
+     * do check (check state)
+     */
+    *ready = (cam->state == ST_READY);
+
+    ret = 0;
+  } while(0);
+
+  return ret;
+}
+
 int
 camera_check_error(camera_t* cam, int* error)
 {

data/ext/v4l2/camera.h

@@ -23,7 +23,11 @@
 #include <pthread.h>
 #endif /* !defined(RUBY_EXTLIB) */
 
+#ifdef __OpenBSD__
+#include <sys/videoio.h>
+#else
 #include <linux/videodev2.h>
+#endif
 
 #define MAX_PLANE           3
 
@@ -68,13 +72,13 @@ typedef struct __camera__ {
 #ifndef V4L2_CTRL_TYPE_INTEGER_MENU
 #define V4L2_CTRL_TYPE_INTEGER_MENU     9
 struct __v4l2_querymenu_substitute_ {
-  __u32   id;
-  __u32   index;
+  uint32_t  id;
+  uint32_t  index;
   union {
-    __u8    name[32];
-    __s64   value;
+    uint8_t name[32];
+    int64_t value;
   };
-  __u32   reserved;
+  uint32_t  reserved;
 }  __attribute__ ((packed));
 
 #define v4l2_querymenu  __v4l2_querymenu_substitute_
@@ -109,6 +113,7 @@ extern int camera_set_framerate(camera_t* cam, int num, int denom);
 extern int camera_get_image_size(camera_t* cam, size_t* sz);
 extern int camera_get_image(camera_t* cam, void* ptr, size_t* used);
 extern int camera_check_busy(camera_t* cam, int *busy);
+extern int camera_check_ready(camera_t* cam, int *ready);
 extern int camera_check_error(camera_t* cam, int *error);
 
 extern int camera_get_format_desc(camera_t* cam, int i,