Commit Graph

207 Commits

Author SHA1 Message Date
Peter Johnson
ef25bbde75 Fix SetExposureAuto. (#57)
This is an enum value; setting 3 seems to be correct for USB cameras.

Fixes #56.
2017-02-15 16:25:43 -08:00
Dustin Spicuzza
8c3efa5926 Increment reference count when creating VideoSource object (#53) 2017-02-09 00:55:40 -08:00
Thad House
cf8cab850b Fixes missing VideoProperty constructor. (#49) 2017-01-20 00:49:58 -07:00
Thad House
db5dfa1746 Adds sliders for all settable properties to the default webpage (#48)
When the page is loaded, if properties can be found they will
automatically be created on screen. They are currently not auto
updating. Raw values are currently disabled because of this.
2017-01-19 01:02:37 -07:00
Peter Johnson
8f8c4d3d95 HttpUtil: Allow "http" scheme to be mixed case. 2017-01-10 00:15:39 -08:00
Thad House
d47bd1ecbc Fixes embedded library name used for extraction in Java (#45) 2017-01-09 20:49:02 -08:00
Thad House
e9fcb5381a Fixes Java artifact clasifiers when using custom suffix (#44) 2017-01-05 14:14:42 -08:00
Peter Johnson
3c3236c5d5 Fix video mode notifications. 2017-01-05 01:42:19 -08:00
Thad House
23462ec7df Adds way to force publishing version from command line (#43)
In case we need to do a recreation of an artifact for some reason, this
makes it possible.
2017-01-04 22:16:17 -08:00
Thad House
b55c604c0a Updates Gradle to 3.3, and removes the Visual Studio 2015 workaround (#41) 2017-01-04 19:40:44 -08:00
Thad House
a72f8f3bcd Add new ARM Toolchain, add toolchainpath to README (#42)
Matches ntcore #165
2017-01-04 19:40:28 -08:00
Thad House
a3adb38bef Adds support for specifying output suffix of arm packages. (#34)
Currently if using a separate compiler prefix, it would get published to
the arm classifier. This modifies so the output suffix can now be
specified (e.g. "hf" for armhf).
2017-01-04 01:38:37 -08:00
Peter Johnson
593ba37c43 Java VideoEvent: Make propertyHandle public. 2017-01-04 01:16:10 -08:00
Peter Johnson
4ed78a84ef Java VideoMode: Provide PixelFormat-taking constructor. 2017-01-04 01:16:10 -08:00
Thad House
e893662c0a Adds new functions to def file (#40) 2017-01-03 19:52:26 -08:00
Thad House
f13f886886 Fixes arm example builds on windows (#39) 2017-01-03 19:10:21 -08:00
Thad House
5dd8e4dc7f Adds defs for the C windows functions, and shims the 5 missing ones (#38) 2017-01-03 19:09:11 -08:00
Peter Johnson
883fd5b062 For property events, provide property name rather than source name.
This is much more useful.
2017-01-02 23:17:00 -08:00
Peter Johnson
7ddbf20108 Create VideoCamera base class and move camera settings functions to it.
This makes them available for both UsbCamera and HttpCamera / AxisCamera.

To avoid virtual functions in the public-facing interface, move the
implementation of the camera settings functions to the core library.
2017-01-02 23:17:00 -08:00
Peter Johnson
23135d7a5a Allow Sink.SetSource() to be given an empty source.
In Java, allow source to be null (pointers are not used in C++, so
this isn't necessary).
2017-01-02 23:17:00 -08:00
Thad House
b91ab0b44f Gets builds working on Windows (VS 2015) (#37)
Def files will be updated after the latest PR with new definitions gets
added.
2017-01-02 23:16:35 -08:00
Thad House
f225c4773a Fixes gradle publish with no flags. (#35) 2017-01-02 17:23:11 -08:00
Fred Silberberg
7ec223d445 Update WPILib Version Plugin (#33) 2016-12-25 22:13:00 -08:00
Peter Johnson
58931e1d30 Be even more permissive on valid JPEG formats. 2016-12-25 01:45:35 -08:00
Peter Johnson
318d23ba1c Add AxisCamera wrapper class.
This takes hosts (IP or DNS name) rather than URLs, making it easier
to use.

Also add more overloads to resolve ambiguities encountered when using
std::string and const char*, and also add overloads for
std::initializer_list<T> so braced initializer lists can be used.
2016-12-23 22:26:27 -08:00
Peter Johnson
9c4c7c08bf Java HttpCamera: Make accessor functions public. 2016-12-23 22:26:27 -08:00
Peter Johnson
9016a9e8b8 Start implementing HttpCamera.
This is a work in progress that does not yet support camera settings.
2016-12-23 22:26:27 -08:00
Peter Johnson
4c8c41fdc0 CvSink: Support grayscale images.
Also support 4-channel BGRx images and provide better error reporting
on bad images passed to PutFrame.
2016-12-23 22:25:11 -08:00
Peter Johnson
205d3b1d04 Some cameras don't provide the JFIF header, so don't require it.
This fixes DHT not being inserted on some images.
2016-12-23 22:21:11 -08:00
Peter Johnson
1575fff07a MjpegServer: Limit the number of simultaneous clients to 10.
This prevents client issues from swamping the network.
2016-12-23 22:01:35 -08:00
Peter Johnson
3d28275675 UsbCamera: Simplify the message passing implementation. 2016-12-23 10:58:11 -08:00
Peter Johnson
6f41b3cde7 UsbCamera: Implement LifeCam HD-3000 exposure quirk.
On Linux, the V4L exposure setting is logarithmic and only accepts
certain exact values.
2016-12-22 23:44:40 -08:00
Peter Johnson
9ffc09a11b Fix settings example if there's no "--" in arg list. 2016-12-22 22:50:07 -08:00
Peter Johnson
ced2608afd Move ExtCtrlIoctl to UsbCameraProperty::DeviceQuery. 2016-12-22 22:44:46 -08:00
Peter Johnson
adbca532c0 Break up UsbCameraImpl::DeviceProcessCommands(). 2016-12-22 22:36:07 -08:00
Peter Johnson
5e38d8f28a Refactor UsbCameraProperty. 2016-12-22 22:11:54 -08:00
Peter Johnson
d6ef2c04a5 Start refactoring source property implementations. 2016-12-22 21:19:50 -08:00
Peter Johnson
ce69783871 UsbCamera: Scale some properties to make them constently percentages.
The "raw" version of these properties are still available, just prefixed
with "raw_".
2016-12-22 20:51:04 -08:00
Peter Johnson
10b13da3da Refactor USB vendor/product to product string to UsbUtil.h.
Also implement reading of /var/lib/usbutils/usb.ids for systems that
have it (e.g. desktop Linux).
2016-12-21 10:56:40 -08:00
Peter Johnson
88afefe464 Avoid crash in SourceImpl constructor.
The Frame constructor calls back into SourceImpl (the passed this reference),
and when in-place constructed in the SourceImpl constructor, SourceImpl
is only partially constructed.
2016-12-21 10:56:40 -08:00
Peter Johnson
80abf6bf24 Support per-stream resolution settings.
The code now automatically resizes as required.

This change also disconnects camera resolution settings from MJPEG
stream connections; setting the camera resolution can now only be done
via code.
2016-12-20 20:48:31 -08:00
Peter Johnson
8501b7c9e2 CvSourceImpl::CreateProperty(): Use lock_guard instead of unique_lock. 2016-12-18 09:13:52 -08:00
Peter Johnson
0ce0855a6f Java: check for null and use new jni_util features. 2016-12-18 09:13:51 -08:00
Peter Johnson
e1dabbc2d5 cscore_cpp.cpp: Fix include order. 2016-12-18 09:13:01 -08:00
Peter Johnson
c08a489e27 Improve error message for VIDIOC_STREAMON "no space left on device". 2016-12-18 09:13:01 -08:00
Peter Johnson
28a2ba4bf8 Add external logger interface. 2016-12-18 09:13:01 -08:00
Peter Johnson
2b8b8e7403 Improve logging consistency by using source/sink name throughout. 2016-12-18 09:12:59 -08:00
Peter Johnson
bdaf60b2d6 Replace tabs with spaces in gradle files. 2016-12-18 09:05:03 -08:00
Peter Johnson
7c2f994a66 Refactor source IsConnected() and connected notification. 2016-12-18 09:05:03 -08:00
Peter Johnson
81fd0eefac usbcvstream example: Print error from GrabFrame. 2016-12-04 21:45:37 -08:00