v4l2-ruby 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be244fd6bc1590054d5f177e8eea4e446f1f526b1d0d3bee2a9ff91bb0eb9fb9
-  data.tar.gz: d31e3955aca0938c4e4a131323877c44c55d223ef14e8366c2beba30768f78fb
+  metadata.gz: 9d31f555fce10530df57c6d98af41f9ad8008f666dd997a74d511ae8e41e0fec
+  data.tar.gz: 812507ef8f3c6fa913d2b1e1513111b630850481e21cc93a3a9d8126f6f61f22
 SHA512:
-  metadata.gz: 300875132ad4b5c060a1eb7ddfaff65040d28a902559bb120f4ec271c13d1e9ffc3f225415fbbb6930303e8fcefc0de85780149178ba7569bc4d39f090a5d323
-  data.tar.gz: b84fd83a6cd1f2141009a6032765be37334b9c8fa7edbf591245d7d6223984d70ebd005017262cb7a92bd61da7964e3ddee47d142965ac07c178136896c4d739
+  metadata.gz: 03b24506c311f989e117ef35926f93c5f2c00c593fec3810a44dc7d6c72619ae395aaf2a5dbce3ac9458526877807b40ce46194c39eeca192d4067e522bc18ad
+  data.tar.gz: 9a1f9fe2899bf1e1ee40cd3305b4ff54f36c6341387fc342f435cf4b570ecc82d137f31c5ae45ae59f31ec8d1930bb86c7f5de5e03f68dc7ae70857ea276b40e

data/ext/v4l2/v4l2.c

@@ -297,27 +297,49 @@ rb_camera_get_controls(VALUE self)
 }
 
 static VALUE
-get_framerate_list(camera_t* cam, struct v4l2_frmsize_discrete* size)
+get_framerate_list(camera_t* cam,
+                   uint32_t fmt, struct v4l2_frmsize_discrete* size)
 {
   VALUE ret;
   int i;
-
   int err;
   struct v4l2_frmivalenum intval;
   VALUE rate;
+  int num;
+  int deno;
 
   ret = rb_ary_new();
 
   for (i = 0; ; i++) {
-    err = camera_get_frame_rate(cam, V4L2_PIX_FMT_MJPEG,
+    err = camera_get_frame_rate(cam, fmt,
                                 size->width, size->height, i, &intval);
     if (err) break;
 
-    if (intval.type == V4L2_FRMIVAL_TYPE_DISCRETE) {
+    switch (intval.type) {
+    case V4L2_FRMIVAL_TYPE_DISCRETE:
       rate = rb_rational_new(INT2FIX(intval.discrete.denominator),
                              INT2FIX(intval.discrete.numerator));
 
       rb_ary_push(ret, rate);
+      break;
+
+    case V4L2_FRMIVAL_TYPE_CONTINUOUS:
+    case V4L2_FRMIVAL_TYPE_STEPWISE:
+      num  = intval.stepwise.max.numerator;
+      deno = intval.stepwise.max.denominator;
+
+      while (num <= intval.stepwise.min.numerator) {
+        while (deno <= intval.stepwise.min.denominator) {
+          rate = rb_rational_new(INT2FIX(deno), INT2FIX(num));
+          rb_ary_push(ret, rate);
+
+          deno += intval.stepwise.step.denominator;
+        }
+
+        num += intval.stepwise.step.numerator;
+        deno = intval.stepwise.max.denominator;
+      }
+      break;
     }
   }
 
@@ -403,7 +425,8 @@ rb_camera_get_support_formats(VALUE self)
 }
 
 static void
-make_dummy_capabilities(camera_t* ptr, VALUE ary, int max_width, int max_height)
+make_dummy_capabilities(camera_t* ptr, VALUE ary,
+                        uint32_t fmt, int max_width, int max_height)
 {
   struct v4l2_frmsize_discrete dsize;
   VALUE capa;
@@ -419,7 +442,7 @@ make_dummy_capabilities(camera_t* ptr, VALUE ary, int max_width, int max_height)
       capa = rb_obj_alloc(frame_cap_klass);
       rb_ivar_set(capa, id_iv_width, INT2NUM(dsize.width));
       rb_ivar_set(capa, id_iv_height, INT2NUM(dsize.height));
-      rb_ivar_set(capa, id_iv_rate, get_framerate_list(ptr, &dsize));
+      rb_ivar_set(capa, id_iv_rate, get_framerate_list(ptr, fmt, &dsize));
 
       rb_ary_push(ary, capa);
 
@@ -428,7 +451,7 @@ make_dummy_capabilities(camera_t* ptr, VALUE ary, int max_width, int max_height)
       capa = rb_obj_alloc(frame_cap_klass);
       rb_ivar_set(capa, id_iv_width, INT2NUM(dsize.width));
       rb_ivar_set(capa, id_iv_height, INT2NUM(dsize.height));
-      rb_ivar_set(capa, id_iv_rate, get_framerate_list(ptr, &dsize));
+      rb_ivar_set(capa, id_iv_rate, get_framerate_list(ptr, fmt, &dsize));
 
       rb_ary_push(ary, capa);
     }
@@ -446,7 +469,7 @@ make_dummy_capabilities(camera_t* ptr, VALUE ary, int max_width, int max_height)
       capa = rb_obj_alloc(frame_cap_klass);
       rb_ivar_set(capa, id_iv_width, INT2NUM(dsize.width));
       rb_ivar_set(capa, id_iv_height, INT2NUM(dsize.height));
-      rb_ivar_set(capa, id_iv_rate, get_framerate_list(ptr, &dsize));
+      rb_ivar_set(capa, id_iv_rate, get_framerate_list(ptr, fmt, &dsize));
 
       rb_ary_push(ary, capa);
 
@@ -455,7 +478,7 @@ make_dummy_capabilities(camera_t* ptr, VALUE ary, int max_width, int max_height)
       capa = rb_obj_alloc(frame_cap_klass);
       rb_ivar_set(capa, id_iv_width, INT2NUM(dsize.width));
       rb_ivar_set(capa, id_iv_height, INT2NUM(dsize.height));
-      rb_ivar_set(capa, id_iv_rate, get_framerate_list(ptr, &dsize));
+      rb_ivar_set(capa, id_iv_rate, get_framerate_list(ptr, fmt, &dsize));
 
       rb_ary_push(ary, capa);
     }
@@ -463,12 +486,13 @@ make_dummy_capabilities(camera_t* ptr, VALUE ary, int max_width, int max_height)
 }
 
 static VALUE
-rb_camera_get_frame_capabilities(VALUE self, VALUE fmt)
+rb_camera_get_frame_capabilities(VALUE self, VALUE _fmt)
 {
   VALUE ret;
   camera_t* ptr;
   int i;
   int j;
+  uint32_t fmt;
 
   int err;
   struct v4l2_frmsizeenum size;
@@ -477,26 +501,31 @@ rb_camera_get_frame_capabilities(VALUE self, VALUE fmt)
   VALUE list;
   VALUE rate;
 
-  Check_Type(fmt, T_SYMBOL);
+  Check_Type(_fmt, T_SYMBOL);
 
   Data_Get_Struct(self, camera_t, ptr);
 
   ret = rb_ary_new();
+  fmt = to_pixfmt(_fmt);
 
   for (i = 0; ;i++){
-    err = camera_get_frame_size(ptr, to_pixfmt(fmt), i, &size);
+    err = camera_get_frame_size(ptr, fmt, i, &size);
     if (err) break;
 
     if (size.type == V4L2_FRMSIZE_TYPE_DISCRETE) {
       capa = rb_obj_alloc(frame_cap_klass);
+      list = get_framerate_list(ptr, fmt, &size.discrete);
+
       rb_ivar_set(capa, id_iv_width, INT2NUM(size.discrete.width));
       rb_ivar_set(capa, id_iv_height, INT2NUM(size.discrete.height));
-      rb_ivar_set(capa, id_iv_rate, get_framerate_list(ptr, &size.discrete));
+      rb_ivar_set(capa, id_iv_rate, list);
 
       rb_ary_push(ret, capa);
 
     } else if (size.type == V4L2_FRMSIZE_TYPE_STEPWISE) {
-      make_dummy_capabilities(ptr, ret,
+      make_dummy_capabilities(ptr,
+                              ret,
+                              fmt,
                               size.stepwise.max_width,
                               size.stepwise.max_height);
       break;

data/lib/v4l2/version.rb

@@ -1,3 +1,3 @@
 module Video4Linux2
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
 end

data/v4l2-ruby.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.4.0"
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2.0.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rake-compiler", "~> 1.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: v4l2-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Hiroshi Kuwagata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement