hornetseye-v4l2 0.3.2 → 0.3.3
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +3 -3
- data/ext/v4l2input.cc +4 -1
- data/lib/hornetseye-v4l2/v4l2input.rb +3 -2
- metadata +5 -5
data/Rakefile
CHANGED
|
@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
|
|
|
7
7
|
require 'rbconfig'
|
|
8
8
|
|
|
9
9
|
PKG_NAME = 'hornetseye-v4l2'
|
|
10
|
-
PKG_VERSION = '0.3.
|
|
10
|
+
PKG_VERSION = '0.3.3'
|
|
11
11
|
CFG = RbConfig::CONFIG
|
|
12
12
|
CXX = ENV[ 'CXX' ] || 'g++'
|
|
13
13
|
RB_FILES = FileList[ 'lib/**/*.rb' ]
|
|
@@ -115,7 +115,7 @@ begin
|
|
|
115
115
|
s.rdoc_options = %w{--no-private}
|
|
116
116
|
s.add_dependency %<malloc>, [ '~> 1.1' ]
|
|
117
117
|
s.add_dependency %<multiarray>, [ '~> 0.20' ]
|
|
118
|
-
s.add_dependency %<hornetseye-frame>, [ '~> 0.
|
|
118
|
+
s.add_dependency %<hornetseye-frame>, [ '~> 0.10' ]
|
|
119
119
|
s.add_development_dependency %q{rake}
|
|
120
120
|
end
|
|
121
121
|
GEM_SOURCE = "#{PKG_NAME}-#{PKG_VERSION}.gem"
|
|
@@ -138,7 +138,7 @@ begin
|
|
|
138
138
|
s.rdoc_options = %w{--no-private}
|
|
139
139
|
s.add_dependency %<malloc>, [ '~> 1.1' ]
|
|
140
140
|
s.add_dependency %<multiarray>, [ '~> 0.20' ]
|
|
141
|
-
s.add_dependency %<hornetseye-frame>, [ '~> 0.
|
|
141
|
+
s.add_dependency %<hornetseye-frame>, [ '~> 0.10' ]
|
|
142
142
|
end
|
|
143
143
|
GEM_BINARY = "#{PKG_NAME}-#{PKG_VERSION}-#{$BINSPEC.platform}.gem"
|
|
144
144
|
desc "Build the gem file #{GEM_SOURCE}"
|
data/ext/v4l2input.cc
CHANGED
|
@@ -122,11 +122,14 @@ V4L2Input::V4L2Input( const std::string &device, V4L2SelectPtr select ) throw (E
|
|
|
122
122
|
case V4L2_PIX_FMT_RGB24:
|
|
123
123
|
m_typecode = "UBYTERGB";
|
|
124
124
|
break;
|
|
125
|
+
case V4L2_PIX_FMT_BGR24:
|
|
126
|
+
m_typecode = "BGR";
|
|
127
|
+
break;
|
|
125
128
|
case V4L2_PIX_FMT_MJPEG:
|
|
126
129
|
m_typecode = "MJPG";
|
|
127
130
|
break;
|
|
128
131
|
default:
|
|
129
|
-
ERRORMACRO( false, Error, , "Conversion for
|
|
132
|
+
ERRORMACRO( false, Error, , "Conversion for V4L2 colorspace " << coding
|
|
130
133
|
<< " not implemented yet" );
|
|
131
134
|
};
|
|
132
135
|
if ( capability.capabilities & V4L2_CAP_STREAMING ) {
|
|
@@ -47,7 +47,8 @@ module Hornetseye
|
|
|
47
47
|
MODE_YUYV => YUY2,
|
|
48
48
|
MODE_YUV420 => I420,
|
|
49
49
|
MODE_GREY => UBYTE,
|
|
50
|
-
MODE_RGB24 => UBYTERGB
|
|
50
|
+
MODE_RGB24 => UBYTERGB,
|
|
51
|
+
MODE_BGR24 => BGR }
|
|
51
52
|
frame_types, index = [], []
|
|
52
53
|
modes.each_with_index do |mode,i|
|
|
53
54
|
target = map[ mode.first ]
|
|
@@ -59,7 +60,7 @@ module Hornetseye
|
|
|
59
60
|
if action
|
|
60
61
|
desired = action.call frame_types
|
|
61
62
|
else
|
|
62
|
-
preference = [ I420, UYVY, YUY2, UBYTERGB, UBYTE ]
|
|
63
|
+
preference = [ I420, UYVY, YUY2, UBYTERGB, BGR, UBYTE ]
|
|
63
64
|
desired = frame_types.sort_by do |mode|
|
|
64
65
|
[ -preference.index( mode.typecode ), mode.width * mode.height ]
|
|
65
66
|
end.last
|
metadata
CHANGED
|
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
|
5
5
|
segments:
|
|
6
6
|
- 0
|
|
7
7
|
- 3
|
|
8
|
-
-
|
|
9
|
-
version: 0.3.
|
|
8
|
+
- 3
|
|
9
|
+
version: 0.3.3
|
|
10
10
|
platform: ruby
|
|
11
11
|
authors:
|
|
12
12
|
- Jan Wedekind
|
|
@@ -14,7 +14,7 @@ autorequire:
|
|
|
14
14
|
bindir: bin
|
|
15
15
|
cert_chain: []
|
|
16
16
|
|
|
17
|
-
date: 2011-06-
|
|
17
|
+
date: 2011-06-06 00:00:00 +01:00
|
|
18
18
|
default_executable:
|
|
19
19
|
dependencies:
|
|
20
20
|
- !ruby/object:Gem::Dependency
|
|
@@ -55,8 +55,8 @@ dependencies:
|
|
|
55
55
|
- !ruby/object:Gem::Version
|
|
56
56
|
segments:
|
|
57
57
|
- 0
|
|
58
|
-
-
|
|
59
|
-
version: "0.
|
|
58
|
+
- 10
|
|
59
|
+
version: "0.10"
|
|
60
60
|
type: :runtime
|
|
61
61
|
version_requirements: *id003
|
|
62
62
|
- !ruby/object:Gem::Dependency
|